Hello community,
here is the log from the commit of package gnome-control-center for
openSUSE:13.1 checked in at 2013-10-08 10:48:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/gnome-control-center (Old)
and /work/SRC/openSUSE:13.1/.gnome-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center"
Changes:
--------
--- /work/SRC/openSUSE:13.1/gnome-control-center/gnome-control-center.changes
2013-09-27 17:19:40.000000000 +0200
+++
/work/SRC/openSUSE:13.1/.gnome-control-center.new/gnome-control-center.changes
2013-10-08 10:48:12.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Oct 7 07:43:10 UTC 2013 - g...@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 - idon...@suse.com
+
+- Introduce with_wacom defines, set to 0 on s390{x}, otherwise 1:
+ + Disable wacom support on s390{x}, those machines have no
+ viable input ports.
+ + Have pkgconfig(libwacom) BuildRequries depend on with_wacom.
+
+-------------------------------------------------------------------
New:
----
gnome-control-center-network-8021x-entry.patch
gnome-control-center-probe-radius-server-cert.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.O0beza/_old 2013-10-08 10:48:12.000000000 +0200
+++ /var/tmp/diff_new_pack.O0beza/_new 2013-10-08 10:48:12.000000000 +0200
@@ -19,6 +19,13 @@
# Allow to enable/disable ibus, as GNOME is rather strict on new versions.
%define with_ibus 1
+# Wacom input support
+%ifarch s390 s390x
+%define with_wacom 0
+%else
+%define with_wacom 1
+%endif
+
Name: gnome-control-center
Version: 3.10.0
Release: 0
@@ -32,8 +39,12 @@
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)
Patch14: gnome-control-center-system-proxy-configuration.patch
-# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gcc-private-connection.patch
bnc#751211 bgo#646187 dims...@opensuse.org -- network: create private
connections if the user if not authorized
+# PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187
dims...@opensuse.org -- network: create private connections if the user if not
authorized
Patch15: gcc-private-connection.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch
bnc#574266 g...@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
g...@suse.com -- network: fix 8021x connection settings
+Patch17: gnome-control-center-network-8021x-entry.patch
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -77,7 +88,9 @@
BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libsystemd-login)
+%if %{with_wacom}
BuildRequires: pkgconfig(libwacom) >= 0.7
+%endif
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mm-glib) >= 0.7
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
@@ -149,9 +162,11 @@
%setup -q
translation-update-upstream
%patch0 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
#NEEDS-REBASE
#patch14 -p1
-#patch15 -p1
%build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
@@ -190,7 +205,9 @@
%suse_update_desktop_file gnome-sound-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-universal-access-panel
X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-user-accounts-panel
X-SuSE-ControlCenter-Personal
+%if %{with_wacom}
%suse_update_desktop_file gnome-wacom-panel X-SuSE-ControlCenter-Hardware
+%endif
%fdupes %{buildroot}
%clean
++++++ gcc-private-connection.patch ++++++
--- /var/tmp/diff_new_pack.O0beza/_old 2013-10-08 10:48:12.000000000 +0200
+++ /var/tmp/diff_new_pack.O0beza/_new 2013-10-08 10:48:12.000000000 +0200
@@ -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 <chingp...@gmail.com>
Date: Tue, 14 Feb 2012 18:41:51 +0800
Subject: [PATCH] network: create private connections if the user if not
@@ -10,40 +10,43 @@
https://bugzilla.gnome.org/show_bug.cgi?id=646187
---
- configure.ac | 3 +-
- panels/network/cc-network-panel.c | 72 ++++++++++++++++++++++++++++++++++++-
- panels/network/cc-network-panel.h | 2 +
- panels/network/network-dialogs.c | 16 ++++++++
- 4 files changed, 91 insertions(+), 2 deletions(-)
+ configure.ac | 3 ++-
+ panels/network/cc-network-panel.c | 40 ++++++++++++++++++++++++++++++++++++--
+ panels/network/cc-network-panel.h | 2 ++
+ panels/network/net-device-mobile.c | 5 ++++-
+ 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
-===================================================================
---- gnome-control-center-3.7.1.orig/configure.ac
-+++ gnome-control-center-3.7.1/configure.ac
-@@ -125,7 +125,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO
+diff --git a/configure.ac b/configure.ac
+index a7542e6..2245fc3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -132,7 +132,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES
PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
--PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
-+PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES
-+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
++PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
++ 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(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
-Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.c
-===================================================================
---- gnome-control-center-3.7.1.orig/panels/network/cc-network-panel.c
-+++ gnome-control-center-3.7.1/panels/network/cc-network-panel.c
-@@ -23,6 +23,8 @@
+diff --git a/panels/network/cc-network-panel.c
b/panels/network/cc-network-panel.c
+index cab9f4c..b03cf1a 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -24,6 +24,8 @@
#include <glib/gi18n.h>
#include <stdlib.h>
+#include <polkit/polkit.h>
+
#include "cc-network-panel.h"
+ #include "cc-network-resources.h"
- #include "nm-remote-settings.h"
-@@ -76,6 +78,9 @@ struct _CcNetworkPanelPrivate
+@@ -87,6 +89,9 @@ struct _CcNetworkPanelPrivate
gchar *arg_device;
gchar *arg_access_point;
gboolean operation_done;
@@ -53,25 +56,41 @@
};
enum {
-@@ -1182,6 +1187,9 @@ cc_network_panel_init (CcNetworkPanel *p
- GtkTreeSelection *selection;
+@@ -574,13 +579,13 @@ handle_argv_for_device (CcNetworkPanel *panel,
+ 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 *toplevel;
+ GDBusConnection *system_bus;
+ PolkitSubject *subject;
+ PolkitAuthority *authority;
+ PolkitAuthorizationResult *result;
panel->priv = NETWORK_PANEL_PRIVATE (panel);
-
-@@ -1268,6 +1276,28 @@ cc_network_panel_init (CcNetworkPanel *p
-
- /* add kill switch widgets when dialog activated */
- panel->priv->add_header_widgets_idle = g_idle_add
(network_add_shell_header_widgets_cb, panel);
+ g_resources_register (cc_network_get_resource ());
+@@ -1455,4 +1463,32 @@ cc_network_panel_init (CcNetworkPanel *panel)
+ widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+ "vbox1"));
+ gtk_widget_reparent (widget, (GtkWidget *) panel);
+
+ /* check the polkit authentication */
+ panel->priv->default_private = TRUE;
+ 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,
+ subject,
+
"org.freedesktop.NetworkManager.settings.modify.system",
@@ -89,24 +108,18 @@
+ g_object_unref (result);
+ g_object_unref (authority);
+ g_object_unref (subject);
- }
-
- void
-@@ -1278,3 +1308,9 @@ cc_network_panel_register (GIOModule *mo
- CC_TYPE_NETWORK_PANEL,
- "network", 0);
- }
++}
+
+gboolean
+cc_network_panel_get_default_private (CcNetworkPanel *panel)
+{
+ return panel->priv->default_private;
-+}
-Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.h
-===================================================================
---- gnome-control-center-3.7.1.orig/panels/network/cc-network-panel.h
-+++ gnome-control-center-3.7.1/panels/network/cc-network-panel.h
-@@ -69,6 +69,8 @@ void cc_network_panel_register (GIOModu
+ }
+diff --git a/panels/network/cc-network-panel.h
b/panels/network/cc-network-panel.h
+index f869c3f..d3773b2 100644
+--- a/panels/network/cc-network-panel.h
++++ b/panels/network/cc-network-panel.h
+@@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G_GNUC_CONST;
GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel);
@@ -115,11 +128,92 @@
G_END_DECLS
#endif /* _CC_NETWORK_PANEL_H */
-Index: gnome-control-center-3.7.1/panels/network/network-dialogs.c
-===================================================================
---- gnome-control-center-3.7.1.orig/panels/network/network-dialogs.c
-+++ gnome-control-center-3.7.1/panels/network/network-dialogs.c
-@@ -42,6 +42,7 @@ typedef struct {
+diff --git a/panels/network/net-device-mobile.c
b/panels/network/net-device-mobile.c
+index 6c35524..e3abcd6 100644
+--- a/panels/network/net-device-mobile.c
++++ b/panels/network/net-device-mobile.c
+@@ -148,12 +148,15 @@ mobile_connection_changed_cb (GtkComboBox *combo_box,
NetDeviceMobile *device_mo
+ COLUMN_ID, &object_path,
+ -1);
+ if (g_strcmp0 (object_path, NULL) == 0) {
++ gboolean default_private;
+ panel = net_object_get_panel (NET_OBJECT (device_mobile));
+ toplevel = cc_shell_get_toplevel (cc_panel_get_shell
(CC_PANEL (panel)));
++ default_private = cc_network_panel_get_default_private
(panel);
+ cc_network_panel_connect_to_3g_network (toplevel,
+ client,
+ remote_settings,
+- device);
++ device,
++ default_private);
+ goto out;
+ }
+
+diff --git a/panels/network/net-device-wifi.c
b/panels/network/net-device-wifi.c
+index 397d556..6851bf8 100644
+--- a/panels/network/net-device-wifi.c
++++ b/panels/network/net-device-wifi.c
+@@ -704,6 +704,9 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi,
+ NMDevice *device;
+ NMSettingWireless *setting_wireless;
+ NMClient *client;
++ CcNetworkPanel *panel;
++ NMConnection *partial = NULL;
++ NMSettingConnection *setting_con;
+
+ if (device_wifi->priv->updating_device)
+ goto out;
+@@ -755,10 +758,21 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi,
+ /* create one, as it's missing */
+ g_debug ("no existing connection found for %s, creating",
ssid_target);
+
++ panel = net_object_get_panel (NET_OBJECT (device_wifi));
++ if (cc_network_panel_get_default_private (panel)) {
++ partial = nm_connection_new ();
++ setting_con = (NMSettingConnection *)nm_setting_connection_new
();
++ nm_connection_add_setting (partial, NM_SETTING (setting_con));
++ nm_setting_connection_add_permission (setting_con,
++ "user",
++ g_get_user_name(),
++ NULL);
++ }
++
+ if (!is_8021x (device, ap_object_path)) {
+ g_debug ("no existing connection found for %s, creating and
activating one", ssid_target);
+ nm_client_add_and_activate_connection (client,
+- NULL,
++ partial,
+ device, ap_object_path,
+
connection_add_activate_cb, device_wifi);
+ } else {
+@@ -972,6 +986,7 @@ start_shared_connection (NetDeviceWifi *device_wifi)
+ GSList *l;
+ NMClient *client;
+ const char *mode;
++ CcNetworkPanel *panel;
+
+ device = net_device_get_nm_device (NET_DEVICE (device_wifi));
+ g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI);
+@@ -1008,6 +1023,14 @@ start_shared_connection (NetDeviceWifi *device_wifi)
+ "id", "Hotspot",
+ "autoconnect", FALSE,
+ NULL);
++
++ panel = net_object_get_panel (NET_OBJECT (device_wifi));
++ if (cc_network_panel_get_default_private (panel))
++ nm_setting_connection_add_permission (sc,
++ "user",
++ g_get_user_name(),
++ NULL);
++
+ nm_connection_add_setting (c, (NMSetting *)sc);
+
+ 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;
@@ -127,16 +221,26 @@
} MobileDialogClosure;
static void
-@@ -302,6 +303,8 @@ cc_network_panel_connect_to_8021x_networ
+@@ -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 (cc_network_panel_get_default_private (panel))
++ 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 ();
-@@ -359,6 +362,7 @@ cdma_mobile_wizard_done (NMAMobileWizard
+@@ -357,6 +361,7 @@ cdma_mobile_wizard_done (NMAMobileWizard *wizard,
if (!canceled && method) {
NMSetting *setting;
char *uuid, *id;
@@ -144,7 +248,7 @@
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
+@@ -400,6 +405,11 @@ cdma_mobile_wizard_done (NMAMobileWizard *wizard,
NULL);
g_free (uuid);
g_free (id);
@@ -156,7 +260,7 @@
nm_connection_add_setting (connection, setting);
}
-@@ -421,6 +430,7 @@ gsm_mobile_wizard_done (NMAMobileWizard
+@@ -419,6 +429,7 @@ gsm_mobile_wizard_done (NMAMobileWizard *wizard,
if (!canceled && method) {
NMSetting *setting;
char *uuid, *id;
@@ -164,7 +268,7 @@
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
+@@ -463,6 +474,11 @@ gsm_mobile_wizard_done (NMAMobileWizard *wizard,
NULL);
g_free (uuid);
g_free (id);
@@ -176,71 +280,44 @@
nm_connection_add_setting (connection, setting);
}
-@@ -515,6 +530,7 @@ cc_network_panel_connect_to_3g_network (
+@@ -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 = cc_network_panel_get_default_private
(panel);
++ closure->default_private = default_private;
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;
- NMRemoteSettings *remote_settings;
- NMClient *client;
-+ CcNetworkPanel *panel;
-+ NMConnection *partial = NULL;
-+ NMSettingConnection *setting_con;
-
- if (device_wifi->priv->updating_device)
- goto out;
-@@ -1137,10 +1140,21 @@ wireless_try_to_connect (NetDeviceWifi *
- /* create one, as it's missing */
- g_debug ("no existing connection found for %s, creating",
ssid_target);
-
-+ panel = net_object_get_panel (NET_OBJECT (device_wifi));
-+ if (cc_network_panel_get_default_private (panel)) {
-+ partial = nm_connection_new ();
-+ setting_con = (NMSettingConnection *)nm_setting_connection_new
();
-+ nm_connection_add_setting (partial, NM_SETTING (setting_con));
-+ nm_setting_connection_add_permission (setting_con,
-+ "user",
-+ g_get_user_name(),
-+ NULL);
-+ }
-+
- if (!is_8021x (device, ap_object_path)) {
- g_debug ("no existing connection found for %s, creating and
activating one", ssid_target);
- nm_client_add_and_activate_connection (client,
-- NULL,
-+ partial,
- device, ap_object_path,
-
connection_add_activate_cb, device_wifi);
- } else {
-@@ -1413,6 +1427,7 @@ start_shared_connection (NetDeviceWifi *
- GSList *l;
- NMClient *client;
- NMRemoteSettings *remote_settings;
-+ CcNetworkPanel *panel;
-
- device = net_device_get_nm_device (NET_DEVICE (device_wifi));
- g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI);
-@@ -1452,6 +1467,14 @@ start_shared_connection (NetDeviceWifi *
- "id", "Hotspot",
- "autoconnect", FALSE,
- NULL);
-+
-+ panel = net_object_get_panel (NET_OBJECT (device_wifi));
-+ if (cc_network_panel_get_default_private (panel))
-+ nm_setting_connection_add_permission (sc,
-+ "user",
-+ g_get_user_name(),
-+ NULL);
-+
- nm_connection_add_setting (c, (NMSetting *)sc);
-
- sw = (NMSettingWireless *)nm_setting_wireless_new ();
+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
+
++++++ gnome-control-center-network-8021x-entry.patch ++++++
>From fff5883cbff3505c9a82d0f5ed96efa0052f7865 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <chingp...@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
++++++ gnome-control-center-probe-radius-server-cert.patch ++++++
>From 3c69e431953944a62ae3be6f075263cdafa70e47 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <chingp...@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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
