From 41ce0d08ee9f56506682cd894a231c3104b706c9cf9bb6912e5aa92c29c643a3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 15 Oct 2012 08:30:33 +0000 Subject: [PATCH] Accepting request 138043 from home:dimstar:branches:GNOME:Factory Resubmit post review OBS-URL: https://build.opensuse.org/request/show/138043 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=163 --- gcc-private-connection.patch | 99 ++++++++++++++++--------------- gnome-control-center-3.6.0.tar.xz | 3 - gnome-control-center-3.6.1.tar.xz | 3 + gnome-control-center.changes | 38 ++++++++++++ gnome-control-center.spec | 4 +- 5 files changed, 93 insertions(+), 54 deletions(-) delete mode 100644 gnome-control-center-3.6.0.tar.xz create mode 100644 gnome-control-center-3.6.1.tar.xz diff --git a/gcc-private-connection.patch b/gcc-private-connection.patch index 5bc70be..36e1c54 100644 --- a/gcc-private-connection.patch +++ b/gcc-private-connection.patch @@ -16,10 +16,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187 panels/network/network-dialogs.c | 16 ++++++++ 4 files changed, 91 insertions(+), 2 deletions(-) -Index: gnome-control-center-3.5.91/configure.ac +Index: gnome-control-center-3.6.1/configure.ac =================================================================== ---- gnome-control-center-3.5.91.orig/configure.ac -+++ gnome-control-center-3.5.91/configure.ac +--- gnome-control-center-3.6.1.orig/configure.ac ++++ gnome-control-center-3.6.1/configure.ac @@ -136,7 +136,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 @@ -30,10 +30,10 @@ Index: gnome-control-center-3.5.91/configure.ac 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.5.91/panels/network/cc-network-panel.c +Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.c =================================================================== ---- gnome-control-center-3.5.91.orig/panels/network/cc-network-panel.c -+++ gnome-control-center-3.5.91/panels/network/cc-network-panel.c +--- gnome-control-center-3.6.1.orig/panels/network/cc-network-panel.c ++++ gnome-control-center-3.6.1/panels/network/cc-network-panel.c @@ -23,6 +23,8 @@ #include #include @@ -43,7 +43,7 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c #include "cc-network-panel.h" #include "nm-remote-settings.h" -@@ -73,6 +75,9 @@ struct _CcNetworkPanelPrivate +@@ -74,6 +76,9 @@ struct _CcNetworkPanelPrivate gchar *arg_device; gchar *arg_access_point; gboolean operation_done; @@ -53,7 +53,7 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c }; enum { -@@ -1027,6 +1032,9 @@ cc_network_panel_init (CcNetworkPanel *p +@@ -1099,6 +1104,9 @@ cc_network_panel_init (CcNetworkPanel *p GtkTreeSelection *selection; GtkWidget *widget; GtkWidget *toplevel; @@ -63,7 +63,7 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c panel->priv = NETWORK_PANEL_PRIVATE (panel); -@@ -1112,6 +1120,28 @@ cc_network_panel_init (CcNetworkPanel *p +@@ -1185,6 +1193,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); @@ -92,7 +92,7 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c } void -@@ -1122,3 +1152,9 @@ cc_network_panel_register (GIOModule *mo +@@ -1195,3 +1225,9 @@ cc_network_panel_register (GIOModule *mo CC_TYPE_NETWORK_PANEL, "network", 0); } @@ -102,10 +102,10 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c +{ + return panel->priv->default_private; +} -Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.h +Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.h =================================================================== ---- gnome-control-center-3.5.91.orig/panels/network/cc-network-panel.h -+++ gnome-control-center-3.5.91/panels/network/cc-network-panel.h +--- gnome-control-center-3.6.1.orig/panels/network/cc-network-panel.h ++++ gnome-control-center-3.6.1/panels/network/cc-network-panel.h @@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G void cc_network_panel_register (GIOModule *module); @@ -115,11 +115,11 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.h G_END_DECLS #endif /* _CC_NETWORK_PANEL_H */ -Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c +Index: gnome-control-center-3.6.1/panels/network/network-dialogs.c =================================================================== ---- gnome-control-center-3.5.91.orig/panels/network/network-dialogs.c -+++ gnome-control-center-3.5.91/panels/network/network-dialogs.c -@@ -41,6 +41,7 @@ typedef struct { +--- gnome-control-center-3.6.1.orig/panels/network/network-dialogs.c ++++ gnome-control-center-3.6.1/panels/network/network-dialogs.c +@@ -42,6 +42,7 @@ typedef struct { NMClient *client; NMRemoteSettings *settings; NMDevice *device; @@ -127,7 +127,7 @@ Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c } MobileDialogClosure; static void -@@ -288,6 +289,8 @@ cc_network_panel_connect_to_8021x_networ +@@ -302,6 +303,8 @@ cc_network_panel_connect_to_8021x_networ uuid = nm_utils_uuid_generate (); g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL); g_free (uuid); @@ -136,7 +136,7 @@ Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c nm_connection_add_setting (connection, NM_SETTING (s_con)); s_wifi = (NMSettingWireless *) nm_setting_wireless_new (); -@@ -345,6 +348,7 @@ cdma_mobile_wizard_done (NMAMobileWizard +@@ -359,6 +362,7 @@ cdma_mobile_wizard_done (NMAMobileWizard if (!canceled && method) { NMSetting *setting; char *uuid, *id; @@ -144,7 +144,7 @@ Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) { g_warning ("Unexpected device type (not CDMA)."); -@@ -388,6 +392,11 @@ cdma_mobile_wizard_done (NMAMobileWizard +@@ -402,6 +406,11 @@ cdma_mobile_wizard_done (NMAMobileWizard NULL); g_free (uuid); g_free (id); @@ -156,7 +156,7 @@ Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c nm_connection_add_setting (connection, setting); } -@@ -407,6 +416,7 @@ gsm_mobile_wizard_done (NMAMobileWizard +@@ -421,6 +430,7 @@ gsm_mobile_wizard_done (NMAMobileWizard if (!canceled && method) { NMSetting *setting; char *uuid, *id; @@ -164,7 +164,7 @@ Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) { g_warning ("Unexpected device type (not GSM)."); -@@ -451,6 +461,11 @@ gsm_mobile_wizard_done (NMAMobileWizard +@@ -465,6 +475,11 @@ gsm_mobile_wizard_done (NMAMobileWizard NULL); g_free (uuid); g_free (id); @@ -176,7 +176,7 @@ Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c nm_connection_add_setting (connection, setting); } -@@ -480,6 +495,7 @@ cc_network_panel_connect_to_3g_network ( +@@ -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); @@ -184,11 +184,11 @@ Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device)); if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) { -Index: gnome-control-center-3.5.91/panels/network/net-device-wifi.c +Index: gnome-control-center-3.6.1/panels/network/net-device-wifi.c =================================================================== ---- gnome-control-center-3.5.91.orig/panels/network/net-device-wifi.c -+++ gnome-control-center-3.5.91/panels/network/net-device-wifi.c -@@ -977,6 +977,9 @@ wireless_try_to_connect (NetDeviceWifi * +--- gnome-control-center-3.6.1.orig/panels/network/net-device-wifi.c ++++ gnome-control-center-3.6.1/panels/network/net-device-wifi.c +@@ -1082,6 +1082,9 @@ wireless_try_to_connect (NetDeviceWifi * NMSettingWireless *setting_wireless; NMRemoteSettings *remote_settings; NMClient *client; @@ -198,29 +198,30 @@ Index: gnome-control-center-3.5.91/panels/network/net-device-wifi.c if (device_wifi->priv->updating_device) goto out; -@@ -1153,8 +1153,20 @@ +@@ -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); + 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); ++ } + -+ 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); -+ } -+ - nm_client_add_and_activate_connection (client, -- NULL, -+ partial, - device, ap_object_path, - connection_add_activate_cb, device_wifi); - out: -@@ -1296,6 +1311,7 @@ start_shared_connection (NetDeviceWifi * + 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; @@ -228,7 +229,7 @@ Index: gnome-control-center-3.5.91/panels/network/net-device-wifi.c device = net_device_get_nm_device (NET_DEVICE (device_wifi)); g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI); -@@ -1335,6 +1351,14 @@ start_shared_connection (NetDeviceWifi * +@@ -1452,6 +1467,14 @@ start_shared_connection (NetDeviceWifi * "id", "Hotspot", "autoconnect", FALSE, NULL); diff --git a/gnome-control-center-3.6.0.tar.xz b/gnome-control-center-3.6.0.tar.xz deleted file mode 100644 index e067676..0000000 --- a/gnome-control-center-3.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d58d0ccc3defe622f66f4ce8e1229e443f4f57c58f85eecde12b642b8a8e893 -size 4803664 diff --git a/gnome-control-center-3.6.1.tar.xz b/gnome-control-center-3.6.1.tar.xz new file mode 100644 index 0000000..01e14db --- /dev/null +++ b/gnome-control-center-3.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6e9530deac15408fee43c9c7a21200456bebf947e677856cd7345a79e2923d5 +size 4868948 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index db0340b..9d8a24f 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Thu Oct 11 11:59:29 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.6.1: + + Background: + - Fix multi-monitor handling + - Use a lighter texture for solid colours + + Date & Time: + - Update the current time when we change the timezone + + Mouse: + - Fix mouse test area not being in the correct position in some + cases + + Network: + - Fix arrow direction in RTL languages + - Don't resize the panel or the Wi-Fi list + - Top align the back button in the Wi-Fi panel + - Fix parenting problems when spawing a network dialogue + - Don't try to activate out-of-range connections + - Fix WPA Enterprise connections not working + - Use a regular button for "Connect to Hidden Network" + + Online Accounts: + - Fix a warning on exit + + Printers: + - Fix wrong icon being used in the search entry + + Region & Language: + - Remove the unused "Remove" button + - Reduce the number of required m17n desktop files + - Repopulate the input sources when IBus becomes available + again + - Add support for inscript2 and Marathi phonetic input sources + + Shell: + - Fix entering the same panel twice + + Sound: + - Fix input level bar direction in RTL languages + + User Accounts: + - Fix the autologin icon not being recoloured. +- Rebase gcc-private-connection.patch. + ------------------------------------------------------------------- Tue Oct 2 16:29:27 UTC 2012 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 6a836fa..8e6bb5f 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -24,7 +24,7 @@ %define with_ibus 0 Name: gnome-control-center -Version: 3.6.0 +Version: 3.6.1 Release: 0 # FIXME: stop owning %%{_datadir}/polkit-1/rules.d once polkit >= 0.106 is in (should be soon-ish, end of 09/2012) # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) @@ -63,7 +63,7 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.5.5 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.5.91 -BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.5.2 +BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.6.0 BuildRequires: pkgconfig(goa-1.0) >= 3.5.90 BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91