rpm/gnome-control-center
SHA256
1
0
Fork 0
forked from pool/gnome-control-center
Code Pull Requests Activity

Accepting request 138043 from home:dimstar:branches:GNOME:Factory

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2012-10-15 08:30:33 +00:00 committed by Git OBS Bridge
parent 378728d9f1
commit 41ce0d08ee
5 changed files with 93 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
gcc-private-connection.patch
View File

@ -16,10 +16,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187
panels/network/network-dialogs.c | 16 ++++++++ panels/network/network-dialogs.c | 16 ++++++++
4 files changed, 91 insertions(+), 2 deletions(-) 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.6.1.orig/configure.ac
+++ gnome-control-center-3.5.91/configure.ac +++ gnome-control-center-3.6.1/configure.ac
@@ -136,7 +136,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO @@ -136,7 +136,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO
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
@ -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(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) 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.6.1.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/panels/network/cc-network-panel.c
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <stdlib.h> #include <stdlib.h>
@ -43,7 +43,7 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c
#include "cc-network-panel.h" #include "cc-network-panel.h"
#include "nm-remote-settings.h" #include "nm-remote-settings.h"
@@ -73,6 +75,9 @@ struct _CcNetworkPanelPrivate @@ -74,6 +76,9 @@ struct _CcNetworkPanelPrivate
gchar *arg_device; gchar *arg_device;
gchar *arg_access_point; gchar *arg_access_point;
gboolean operation_done; gboolean operation_done;
@ -53,7 +53,7 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c
}; };
enum { enum {
@@ -1027,6 +1032,9 @@ cc_network_panel_init (CcNetworkPanel *p @@ -1099,6 +1104,9 @@ cc_network_panel_init (CcNetworkPanel *p
GtkTreeSelection *selection; GtkTreeSelection *selection;
GtkWidget *widget; GtkWidget *widget;
GtkWidget *toplevel; 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); 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 */ /* add kill switch widgets when dialog activated */
panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel); 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 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, CC_TYPE_NETWORK_PANEL,
"network", 0); "network", 0);
} }
@ -102,10 +102,10 @@ Index: gnome-control-center-3.5.91/panels/network/cc-network-panel.c
+{ +{
+ return panel->priv->default_private; + 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.6.1.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/panels/network/cc-network-panel.h
@@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G @@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G
void cc_network_panel_register (GIOModule *module); 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 G_END_DECLS
#endif /* _CC_NETWORK_PANEL_H */ #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.6.1.orig/panels/network/network-dialogs.c
+++ gnome-control-center-3.5.91/panels/network/network-dialogs.c +++ gnome-control-center-3.6.1/panels/network/network-dialogs.c
@@ -41,6 +41,7 @@ typedef struct { @@ -42,6 +42,7 @@ typedef struct {
NMClient *client; NMClient *client;
NMRemoteSettings *settings; NMRemoteSettings *settings;
NMDevice *device; NMDevice *device;
@ -127,7 +127,7 @@ Index: gnome-control-center-3.5.91/panels/network/network-dialogs.c
} MobileDialogClosure; } MobileDialogClosure;
static void 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 (); uuid = nm_utils_uuid_generate ();
g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL); g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL);
g_free (uuid); 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)); nm_connection_add_setting (connection, NM_SETTING (s_con));
s_wifi = (NMSettingWireless *) nm_setting_wireless_new (); 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) { if (!canceled && method) {
NMSetting *setting; NMSetting *setting;
char *uuid, *id; 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) { if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) {
g_warning ("Unexpected device type (not CDMA)."); 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); NULL);
g_free (uuid); g_free (uuid);
g_free (id); 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); 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) { if (!canceled && method) {
NMSetting *setting; NMSetting *setting;
char *uuid, *id; 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) { if (method->devtype != NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
g_warning ("Unexpected device type (not GSM)."); 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); NULL);
g_free (uuid); g_free (uuid);
g_free (id); 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); 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->client = g_object_ref (client);
closure->settings = g_object_ref (settings); closure->settings = g_object_ref (settings);
closure->device = g_object_ref (device); 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)); caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) { 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.6.1.orig/panels/network/net-device-wifi.c
+++ gnome-control-center-3.5.91/panels/network/net-device-wifi.c +++ gnome-control-center-3.6.1/panels/network/net-device-wifi.c
@@ -977,6 +977,9 @@ wireless_try_to_connect (NetDeviceWifi * @@ -1082,6 +1082,9 @@ wireless_try_to_connect (NetDeviceWifi *
NMSettingWireless *setting_wireless; NMSettingWireless *setting_wireless;
NMRemoteSettings *remote_settings; NMRemoteSettings *remote_settings;
NMClient *client; 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) if (device_wifi->priv->updating_device)
goto out; goto out;
@@ -1153,8 +1153,20 @@ @@ -1137,10 +1140,21 @@ wireless_try_to_connect (NetDeviceWifi *
/* create one, as it's missing */ /* create one, as it's missing */
g_debug ("no existing connection found for %s, creating", g_debug ("no existing connection found for %s, creating", ssid_target);
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 (!is_8021x (device, ap_object_path)) {
+ if (cc_network_panel_get_default_private (panel)) { g_debug ("no existing connection found for %s, creating and activating one", ssid_target);
+ partial = nm_connection_new (); nm_client_add_and_activate_connection (client,
+ setting_con = (NMSettingConnection *)nm_setting_connection_new (); - NULL,
+ nm_connection_add_setting (partial, NM_SETTING (setting_con)); + partial,
+ nm_setting_connection_add_permission (setting_con, device, ap_object_path,
+ "user", connection_add_activate_cb, device_wifi);
+ g_get_user_name(), } else {
+ NULL); @@ -1413,6 +1427,7 @@ start_shared_connection (NetDeviceWifi *
+ }
+
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 *
GSList *l; GSList *l;
NMClient *client; NMClient *client;
NMRemoteSettings *remote_settings; 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)); 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);
@@ -1335,6 +1351,14 @@ start_shared_connection (NetDeviceWifi * @@ -1452,6 +1467,14 @@ start_shared_connection (NetDeviceWifi *
"id", "Hotspot", "id", "Hotspot",
"autoconnect", FALSE, "autoconnect", FALSE,
NULL); NULL);

3
gnome-control-center-3.6.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d58d0ccc3defe622f66f4ce8e1229e443f4f57c58f85eecde12b642b8a8e893
size 4803664

3
gnome-control-center-3.6.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b6e9530deac15408fee43c9c7a21200456bebf947e677856cd7345a79e2923d5
size 4868948

38
gnome-control-center.changes
View File

@ -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 Tue Oct 2 16:29:27 UTC 2012 - dimstar@opensuse.org

4
gnome-control-center.spec
View File

@ -24,7 +24,7 @@
%define with_ibus 0 %define with_ibus 0
Name: gnome-control-center Name: gnome-control-center
Version: 3.6.0 Version: 3.6.1
Release: 0 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: 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) # 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(glib-2.0) >= 2.31.0
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.5.5 BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.5.5
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.5.91 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-1.0) >= 3.5.90
BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91