pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 202467 from home:gary_lin:branches:GNOME:Factory

Browse Source 
- Rebase gcc-private-connection.patch (bnc#751211)
- Add gnome-control-center-probe-radius-server-cert.patch to probe
  the certificate of the RADIUS server (bnc#574266)
- Add gnome-control-center-network-8021x-entry.patch to fix the
  8021x settings dialog (bgo#709545)

OBS-URL: https://build.opensuse.org/request/show/202467
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=220
This commit is contained in:
Dominique Leuenberger 2013-10-07 08:47:00 +00:00 committed by Git OBS Bridge
parent 4a50547207
commit 1224cd2cca
5 changed files with 294 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

313
gcc-private-connection.patch
View File

@ -1,4 +1,4 @@
From 92c236ea488f8d774a876f1e6ece410b5c920173 Mon Sep 17 00:00:00 2001 From e805287d5e6749dd5b02f30b339f9c1523020fce Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <chingpang@gmail.com> From: Gary Ching-Pang Lin <chingpang@gmail.com>
Date: Tue, 14 Feb 2012 18:41:51 +0800 Date: Tue, 14 Feb 2012 18:41:51 +0800
Subject: [PATCH] network: create private connections if the user if not Subject: [PATCH] network: create private connections if the user if not
@ -10,40 +10,43 @@ private connections.
https://bugzilla.gnome.org/show_bug.cgi?id=646187 https://bugzilla.gnome.org/show_bug.cgi?id=646187
--- ---
configure.ac | 3 +- configure.ac | 3 ++-
panels/network/cc-network-panel.c | 72 ++++++++++++++++++++++++++++++++++++- panels/network/cc-network-panel.c | 40 ++++++++++++++++++++++++++++++++++++--
panels/network/cc-network-panel.h | 2 + panels/network/cc-network-panel.h | 2 ++
panels/network/network-dialogs.c | 16 ++++++++ panels/network/net-device-mobile.c | 5 ++++-
4 files changed, 91 insertions(+), 2 deletions(-) panels/network/net-device-wifi.c | 25 +++++++++++++++++++++++-
panels/network/network-dialogs.c | 22 +++++++++++++++++++--
panels/network/network-dialogs.h | 6 ++++--
7 files changed, 94 insertions(+), 9 deletions(-)
Index: gnome-control-center-3.7.1/configure.ac diff --git a/configure.ac b/configure.ac
=================================================================== index a7542e6..2245fc3 100644
--- gnome-control-center-3.7.1.orig/configure.ac --- a/configure.ac
+++ gnome-control-center-3.7.1/configure.ac +++ b/configure.ac
@@ -125,7 +125,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO @@ -132,7 +132,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES
PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
-PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES) -PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES +PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
gnome-settings-daemon >= $GSD_REQUIRED_VERSION) diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.c index cab9f4c..b03cf1a 100644
=================================================================== --- a/panels/network/cc-network-panel.c
--- gnome-control-center-3.7.1.orig/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c
+++ gnome-control-center-3.7.1/panels/network/cc-network-panel.c @@ -24,6 +24,8 @@
@@ -23,6 +23,8 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <stdlib.h> #include <stdlib.h>
+#include <polkit/polkit.h> +#include <polkit/polkit.h>
+ +
#include "cc-network-panel.h" #include "cc-network-panel.h"
#include "cc-network-resources.h"
#include "nm-remote-settings.h" @@ -87,6 +89,9 @@ struct _CcNetworkPanelPrivate
@@ -76,6 +78,9 @@ struct _CcNetworkPanelPrivate
gchar *arg_device; gchar *arg_device;
gchar *arg_access_point; gchar *arg_access_point;
gboolean operation_done; gboolean operation_done;
@ -53,25 +56,41 @@ Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.c
}; };
enum { enum {
@@ -1182,6 +1187,9 @@ cc_network_panel_init (CcNetworkPanel *p @@ -574,13 +579,13 @@ handle_argv_for_device (CcNetworkPanel *panel,
GtkTreeSelection *selection; return TRUE;
} else if (g_strcmp0 (nm_object_get_path (NM_OBJECT (device)), priv->arg_device) == 0) {
if (priv->arg_operation == OPERATION_CONNECT_MOBILE) {
- cc_network_panel_connect_to_3g_network (toplevel, priv->client, priv->remote_settings, device);
+ cc_network_panel_connect_to_3g_network (toplevel, priv->client, priv->remote_settings, device, priv->default_private);
reset_command_line_args (panel); /* done */
select_tree_iter (panel, iter);
return TRUE;
} else if (priv->arg_operation == OPERATION_CONNECT_8021X) {
- cc_network_panel_connect_to_8021x_network (toplevel, priv->client, priv->remote_settings, device, priv->arg_access_point);
+ cc_network_panel_connect_to_8021x_network (toplevel, priv->client, priv->remote_settings, device, priv->arg_access_point, priv->default_private);
reset_command_line_args (panel); /* done */
select_tree_iter (panel, iter);
return TRUE;
@@ -1352,6 +1357,9 @@ cc_network_panel_init (CcNetworkPanel *panel)
GtkWidget *widget; GtkWidget *widget;
GtkWidget *toplevel; GtkWidget *toplevel;
GDBusConnection *system_bus;
+ PolkitSubject *subject; + PolkitSubject *subject;
+ PolkitAuthority *authority; + PolkitAuthority *authority;
+ PolkitAuthorizationResult *result; + PolkitAuthorizationResult *result;
panel->priv = NETWORK_PANEL_PRIVATE (panel); panel->priv = NETWORK_PANEL_PRIVATE (panel);
g_resources_register (cc_network_get_resource ());
@@ -1268,6 +1276,28 @@ cc_network_panel_init (CcNetworkPanel *p @@ -1455,4 +1463,32 @@ cc_network_panel_init (CcNetworkPanel *panel)
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
/* add kill switch widgets when dialog activated */ "vbox1"));
panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel); gtk_widget_reparent (widget, (GtkWidget *) panel);
+ +
+ /* check the polkit authentication */ + /* check the polkit authentication */
+ panel->priv->default_private = TRUE; + panel->priv->default_private = TRUE;
+ authority = polkit_authority_get_sync (NULL, NULL); + authority = polkit_authority_get_sync (NULL, NULL);
+ subject = polkit_unix_process_new (getpid ()); + subject = polkit_unix_process_new_for_owner (getpid (), 0, -1);
+ result = polkit_authority_check_authorization_sync (authority, + result = polkit_authority_check_authorization_sync (authority,
+ subject, + subject,
+ "org.freedesktop.NetworkManager.settings.modify.system", + "org.freedesktop.NetworkManager.settings.modify.system",
@ -89,24 +108,18 @@ Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.c
+ g_object_unref (result); + g_object_unref (result);
+ g_object_unref (authority); + g_object_unref (authority);
+ g_object_unref (subject); + g_object_unref (subject);
} +}
void
@@ -1278,3 +1308,9 @@ cc_network_panel_register (GIOModule *mo
CC_TYPE_NETWORK_PANEL,
"network", 0);
}
+ +
+gboolean +gboolean
+cc_network_panel_get_default_private (CcNetworkPanel *panel) +cc_network_panel_get_default_private (CcNetworkPanel *panel)
+{ +{
+ return panel->priv->default_private; + return panel->priv->default_private;
+} }
Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.h diff --git a/panels/network/cc-network-panel.h b/panels/network/cc-network-panel.h
=================================================================== index f869c3f..d3773b2 100644
--- gnome-control-center-3.7.1.orig/panels/network/cc-network-panel.h --- a/panels/network/cc-network-panel.h
+++ gnome-control-center-3.7.1/panels/network/cc-network-panel.h +++ b/panels/network/cc-network-panel.h
@@ -69,6 +69,8 @@ void cc_network_panel_register (GIOModu @@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G_GNUC_CONST;
GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel); GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel);
@ -115,82 +128,34 @@ Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.h
G_END_DECLS G_END_DECLS
#endif /* _CC_NETWORK_PANEL_H */ #endif /* _CC_NETWORK_PANEL_H */
Index: gnome-control-center-3.7.1/panels/network/network-dialogs.c diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
=================================================================== index 6c35524..e3abcd6 100644
--- gnome-control-center-3.7.1.orig/panels/network/network-dialogs.c --- a/panels/network/net-device-mobile.c
+++ gnome-control-center-3.7.1/panels/network/network-dialogs.c +++ b/panels/network/net-device-mobile.c
@@ -42,6 +42,7 @@ typedef struct { @@ -148,12 +148,15 @@ mobile_connection_changed_cb (GtkComboBox *combo_box, NetDeviceMobile *device_mo
NMClient *client; COLUMN_ID, &object_path,
NMRemoteSettings *settings; -1);
NMDevice *device; if (g_strcmp0 (object_path, NULL) == 0) {
+ gboolean default_private; + gboolean default_private;
} MobileDialogClosure; panel = net_object_get_panel (NET_OBJECT (device_mobile));
toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel)));
static void + default_private = cc_network_panel_get_default_private (panel);
@@ -302,6 +303,8 @@ cc_network_panel_connect_to_8021x_networ cc_network_panel_connect_to_3g_network (toplevel,
uuid = nm_utils_uuid_generate (); client,
g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL); remote_settings,
g_free (uuid); - device);
+ if (cc_network_panel_get_default_private (panel)) + device,
+ nm_setting_connection_add_permission (s_con, "user", g_get_user_name(), NULL); + default_private);
nm_connection_add_setting (connection, NM_SETTING (s_con)); goto out;
s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
@@ -359,6 +362,7 @@ cdma_mobile_wizard_done (NMAMobileWizard
if (!canceled && method) {
NMSetting *setting;
char *uuid, *id;
+ MobileDialogClosure *closure = user_data;
if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) {
g_warning ("Unexpected device type (not CDMA).");
@@ -402,6 +406,11 @@ cdma_mobile_wizard_done (NMAMobileWizard
NULL);
g_free (uuid);
g_free (id);
+ if (closure->default_private)
+ nm_setting_connection_add_permission ((NMSettingConnection *)setting,
+ "user",
+ g_get_user_name(),
+ NULL);
nm_connection_add_setting (connection, setting);
} }
@@ -421,6 +430,7 @@ gsm_mobile_wizard_done (NMAMobileWizard diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
if (!canceled && method) { index 397d556..6851bf8 100644
NMSetting *setting; --- a/panels/network/net-device-wifi.c
char *uuid, *id; +++ b/panels/network/net-device-wifi.c
+ MobileDialogClosure *closure = user_data; @@ -704,6 +704,9 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi,
NMDevice *device;
if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
g_warning ("Unexpected device type (not GSM).");
@@ -465,6 +475,11 @@ gsm_mobile_wizard_done (NMAMobileWizard
NULL);
g_free (uuid);
g_free (id);
+ if (closure->default_private)
+ nm_setting_connection_add_permission ((NMSettingConnection *)setting,
+ "user",
+ g_get_user_name(),
+ NULL);
nm_connection_add_setting (connection, setting);
}
@@ -515,6 +530,7 @@ cc_network_panel_connect_to_3g_network (
closure->client = g_object_ref (client);
closure->settings = g_object_ref (settings);
closure->device = g_object_ref (device);
+ closure->default_private = cc_network_panel_get_default_private (panel);
caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
Index: gnome-control-center-3.7.1/panels/network/net-device-wifi.c
===================================================================
--- gnome-control-center-3.7.1.orig/panels/network/net-device-wifi.c
+++ gnome-control-center-3.7.1/panels/network/net-device-wifi.c
@@ -1082,6 +1082,9 @@ wireless_try_to_connect (NetDeviceWifi *
NMSettingWireless *setting_wireless; NMSettingWireless *setting_wireless;
NMRemoteSettings *remote_settings;
NMClient *client; NMClient *client;
+ CcNetworkPanel *panel; + CcNetworkPanel *panel;
+ NMConnection *partial = NULL; + NMConnection *partial = NULL;
@ -198,7 +163,7 @@ Index: gnome-control-center-3.7.1/panels/network/net-device-wifi.c
if (device_wifi->priv->updating_device) if (device_wifi->priv->updating_device)
goto out; goto out;
@@ -1137,10 +1140,21 @@ wireless_try_to_connect (NetDeviceWifi * @@ -755,10 +758,21 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi,
/* create one, as it's missing */ /* create one, as it's missing */
g_debug ("no existing connection found for %s, creating", ssid_target); g_debug ("no existing connection found for %s, creating", ssid_target);
@ -221,15 +186,15 @@ Index: gnome-control-center-3.7.1/panels/network/net-device-wifi.c
device, ap_object_path, device, ap_object_path,
connection_add_activate_cb, device_wifi); connection_add_activate_cb, device_wifi);
} else { } else {
@@ -1413,6 +1427,7 @@ start_shared_connection (NetDeviceWifi * @@ -972,6 +986,7 @@ start_shared_connection (NetDeviceWifi *device_wifi)
GSList *l; GSList *l;
NMClient *client; NMClient *client;
NMRemoteSettings *remote_settings; const char *mode;
+ CcNetworkPanel *panel; + CcNetworkPanel *panel;
device = net_device_get_nm_device (NET_DEVICE (device_wifi)); device = net_device_get_nm_device (NET_DEVICE (device_wifi));
g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI); g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI);
@@ -1452,6 +1467,14 @@ start_shared_connection (NetDeviceWifi * @@ -1008,6 +1023,14 @@ start_shared_connection (NetDeviceWifi *device_wifi)
"id", "Hotspot", "id", "Hotspot",
"autoconnect", FALSE, "autoconnect", FALSE,
NULL); NULL);
@ -244,3 +209,115 @@ Index: gnome-control-center-3.7.1/panels/network/net-device-wifi.c
nm_connection_add_setting (c, (NMSetting *)sc); nm_connection_add_setting (c, (NMSetting *)sc);
sw = (NMSettingWireless *)nm_setting_wireless_new (); sw = (NMSettingWireless *)nm_setting_wireless_new ();
diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c
index b2f8376..24053cb 100644
--- a/panels/network/network-dialogs.c
+++ b/panels/network/network-dialogs.c
@@ -41,6 +41,7 @@ typedef struct {
NMClient *client;
NMRemoteSettings *settings;
NMDevice *device;
+ gboolean default_private;
} MobileDialogClosure;
static void
@@ -262,7 +263,8 @@ cc_network_panel_connect_to_8021x_network (GtkWidget *toplevel,
NMClient *client,
NMRemoteSettings *settings,
NMDevice *device,
- const gchar *arg_access_point)
+ const gchar *arg_access_point,
+ gboolean default_private)
{
NMConnection *connection;
NMSettingConnection *s_con;
@@ -300,6 +302,8 @@ cc_network_panel_connect_to_8021x_network (GtkWidget *toplevel,
uuid = nm_utils_uuid_generate ();
g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL);
g_free (uuid);
+ if (default_private)
+ nm_setting_connection_add_permission (s_con, "user", g_get_user_name(), NULL);
nm_connection_add_setting (connection, NM_SETTING (s_con));
s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
@@ -357,6 +361,7 @@ cdma_mobile_wizard_done (NMAMobileWizard *wizard,
if (!canceled && method) {
NMSetting *setting;
char *uuid, *id;
+ MobileDialogClosure *closure = user_data;
if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) {
g_warning ("Unexpected device type (not CDMA).");
@@ -400,6 +405,11 @@ cdma_mobile_wizard_done (NMAMobileWizard *wizard,
NULL);
g_free (uuid);
g_free (id);
+ if (closure->default_private)
+ nm_setting_connection_add_permission ((NMSettingConnection *)setting,
+ "user",
+ g_get_user_name(),
+ NULL);
nm_connection_add_setting (connection, setting);
}
@@ -419,6 +429,7 @@ gsm_mobile_wizard_done (NMAMobileWizard *wizard,
if (!canceled && method) {
NMSetting *setting;
char *uuid, *id;
+ MobileDialogClosure *closure = user_data;
if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
g_warning ("Unexpected device type (not GSM).");
@@ -463,6 +474,11 @@ gsm_mobile_wizard_done (NMAMobileWizard *wizard,
NULL);
g_free (uuid);
g_free (id);
+ if (closure->default_private)
+ nm_setting_connection_add_permission ((NMSettingConnection *)setting,
+ "user",
+ g_get_user_name(),
+ NULL);
nm_connection_add_setting (connection, setting);
}
@@ -494,7 +510,8 @@ void
cc_network_panel_connect_to_3g_network (GtkWidget *toplevel,
NMClient *client,
NMRemoteSettings *settings,
- NMDevice *device)
+ NMDevice *device,
+ gboolean default_private)
{
MobileDialogClosure *closure;
NMAMobileWizard *wizard;
@@ -512,6 +529,7 @@ cc_network_panel_connect_to_3g_network (GtkWidget *toplevel,
closure->client = g_object_ref (client);
closure->settings = g_object_ref (settings);
closure->device = g_object_ref (device);
+ closure->default_private = default_private;
caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
diff --git a/panels/network/network-dialogs.h b/panels/network/network-dialogs.h
index ddbf392..953fc2b 100644
--- a/panels/network/network-dialogs.h
+++ b/panels/network/network-dialogs.h
@@ -38,11 +38,13 @@ void cc_network_panel_connect_to_8021x_network (GtkWidget *toplevel,
NMClient *client,
NMRemoteSettings *settings,
NMDevice *device,
- const gchar *arg_access_point);
+ const gchar *arg_access_point,
+ gboolean default_private);
void cc_network_panel_connect_to_3g_network (GtkWidget *toplevel,
NMClient *client,
NMRemoteSettings *settings,
- NMDevice *device);
+ NMDevice *device,
+ gboolean default_private);
#endif /* _NETWORK_DIALOGS_H */
--
1.8.1.4

50
gnome-control-center-network-8021x-entry.patch Normal file
View File

@ -0,0 +1,50 @@
From fff5883cbff3505c9a82d0f5ed96efa0052f7865 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <chingpang@gmail.com>
Date: Mon, 7 Oct 2013 15:34:06 +0800
Subject: [PATCH] network: Use the parameters property for 8021x
The argv property was deprecated. This commit converts the 8021x
settings to the parameters property so that the user is able to
setup the 8021x connections.
https://bugzilla.gnome.org/show_bug.cgi?id=709545
---
panels/network/net-device-wifi.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 3f0d624..005cda6 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -757,19 +757,20 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi,
connection_add_activate_cb, device_wifi);
} else {
CcNetworkPanel *panel;
- GPtrArray *array;
+ GVariantBuilder *builder;
+ GVariant *parameters;
g_debug ("no existing connection found for %s, creating", ssid_target);
- array = g_ptr_array_new ();
- g_ptr_array_add (array, "connect-8021x-wifi");
- g_ptr_array_add (array, (gpointer) nm_object_get_path (NM_OBJECT (device)));
- g_ptr_array_add (array, (gpointer) ap_object_path);
- g_ptr_array_add (array, NULL);
+ builder = g_variant_builder_new (G_VARIANT_TYPE ("av"));
+ g_variant_builder_add (builder, "v", g_variant_new_string ("connect-8021x-wifi"));
+ g_variant_builder_add (builder, "v", g_variant_new_string (nm_object_get_path (NM_OBJECT (device))));
+ g_variant_builder_add (builder, "v", g_variant_new_string (ap_object_path));
+ parameters = g_variant_new ("av", builder);
panel = net_object_get_panel (NET_OBJECT (device_wifi));
- g_object_set (G_OBJECT (panel), "argv", array->pdata, NULL);
+ g_object_set (G_OBJECT (panel), "parameters", parameters, NULL);
- g_ptr_array_free (array, FALSE);
+ g_variant_builder_unref (builder);
}
out:
return;
--
1.8.1.4

28
gnome-control-center-probe-radius-server-cert.patch Normal file
View File

@ -0,0 +1,28 @@
From 3c69e431953944a62ae3be6f075263cdafa70e47 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <chingpang@gmail.com>
Date: Tue, 1 Oct 2013 18:41:03 +0800
Subject: [PATCH] Probe the certificate of the RADIUS server
---
panels/network/network-dialogs.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c
index b2f8376..7e7035c 100644
--- a/panels/network/network-dialogs.c
+++ b/panels/network/network-dialogs.c
@@ -153,6 +153,11 @@ wireless_dialog_response_cb (GtkDialog *foo,
g_assert (connection);
g_assert (device);
+ if (nma_wifi_dialog_need_cert_probe (dialog)) {
+ nma_wifi_dialog_probe_cert (dialog);
+ return;
+ }
+
/* Find a similar connection and use that instead */
all = nm_remote_settings_list_connections (closure->settings);
for (iter = all; iter; iter = g_slist_next (iter)) {
--
1.8.1.4

9
gnome-control-center.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Oct 7 07:43:10 UTC 2013 - glin@suse.com
- Rebase gcc-private-connection.patch (bnc#751211)
- Add gnome-control-center-probe-radius-server-cert.patch to probe
the certificate of the RADIUS server (bnc#574266)
- Add gnome-control-center-network-8021x-entry.patch to fix the
8021x settings dialog (bgo#709545)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 27 15:02:06 UTC 2013 - idonmez@suse.com Fri Sep 27 15:02:06 UTC 2013 - idonmez@suse.com

10
gnome-control-center.spec
View File

@ -39,8 +39,12 @@ Source: http://download.gnome.org/sources/gnome-control-center/3.10/%{na
Patch0: gnome-control-center-allow-yast-in-shell.patch Patch0: gnome-control-center-allow-yast-in-shell.patch
# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE)
Patch14: gnome-control-center-system-proxy-configuration.patch Patch14: gnome-control-center-system-proxy-configuration.patch
# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized # PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized
Patch15: gcc-private-connection.patch Patch15: gcc-private-connection.patch
# PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate
Patch16: gnome-control-center-probe-radius-server-cert.patch
# PATCH-FIX-UPSTREAM gnome-control-center-network-8021x-entry.patch bgo#709545 glin@suse.com -- network: fix 8021x connection settings
Patch17: gnome-control-center-network-8021x-entry.patch
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -158,9 +162,11 @@ various aspects of your desktop.
%setup -q %setup -q
translation-update-upstream translation-update-upstream
%patch0 -p1 %patch0 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
#NEEDS-REBASE #NEEDS-REBASE
#patch14 -p1 #patch14 -p1
#patch15 -p1
%build %build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh