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

Accepting request 203184 from GNOME:Factory

Browse Source 
- Fix gnome-control-center-allow-yast-in-shell.patch: launching
  YaST should not give the feedback to the shell that we managed
  to switch panel (bnc#845643). (forwarded request 203101 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/203184
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=108
This commit is contained in:
Tomáš Chvátal 2013-10-14 12:27:09 +00:00 committed by Git OBS Bridge
commit fc9c9e3732
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnome-control-center-allow-yast-in-shell.patch
View File

@ -1,6 +1,7 @@
diff -Npur gnome-control-center-3.9.3-old/shell/cc-panel-loader.c gnome-control-center-3.9.3-new/shell/cc-panel-loader.c Index: gnome-control-center-3.10.0/shell/cc-panel-loader.c
--- gnome-control-center-3.9.3-old/shell/cc-panel-loader.c 2013-06-18 19:52:26.000000000 +0800 ===================================================================
+++ gnome-control-center-3.9.3-new/shell/cc-panel-loader.c 2013-07-02 11:41:10.542975020 +0800 --- gnome-control-center-3.10.0.orig/shell/cc-panel-loader.c
+++ gnome-control-center-3.10.0/shell/cc-panel-loader.c
@@ -102,6 +102,7 @@ static struct { @@ -102,6 +102,7 @@ static struct {
#ifdef BUILD_WACOM #ifdef BUILD_WACOM
PANEL_TYPE("wacom", cc_wacom_panel_get_type ), PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
@ -32,10 +33,11 @@ diff -Npur gnome-control-center-3.9.3-old/shell/cc-panel-loader.c gnome-control-
GOptionGroup *group = cc_panel_get_option_group (get_type(), builder); GOptionGroup *group = cc_panel_get_option_group (get_type(), builder);
if (group == NULL) if (group == NULL)
continue; continue;
diff -Npur gnome-control-center-3.9.3-old/shell/cc-window.c gnome-control-center-3.9.3-new/shell/cc-window.c Index: gnome-control-center-3.10.0/shell/cc-window.c
--- gnome-control-center-3.9.3-old/shell/cc-window.c 2013-06-18 19:52:26.000000000 +0800 ===================================================================
+++ gnome-control-center-3.9.3-new/shell/cc-window.c 2013-07-02 11:39:44.750963822 +0800 --- gnome-control-center-3.10.0.orig/shell/cc-window.c
@@ -133,6 +133,38 @@ get_icon_name_from_g_icon (GIcon *gicon) +++ gnome-control-center-3.10.0/shell/cc-window.c
@@ -137,6 +137,38 @@ get_icon_name_from_g_icon (GIcon *gicon)
return NULL; return NULL;
} }
@ -74,14 +76,14 @@ diff -Npur gnome-control-center-3.9.3-old/shell/cc-window.c gnome-control-center
static gboolean static gboolean
activate_panel (CcWindow *self, activate_panel (CcWindow *self,
const gchar *id, const gchar *id,
@@ -147,6 +179,12 @@ activate_panel (CcWindow *self @@ -151,6 +183,12 @@ activate_panel (CcWindow *self
if (!id) if (!id)
return FALSE; return FALSE;
+ if (g_strcmp0 (id, "YaST") == 0) + if (g_strcmp0 (id, "YaST") == 0)
+ { + {
+ suse_activate_desktop (name); + suse_activate_desktop (name);
+ return TRUE; + return FALSE;
+ } + }
+ +
priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters));

7
gnome-control-center.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Oct 13 12:04:18 UTC 2013 - dimstar@opensuse.org
- Fix gnome-control-center-allow-yast-in-shell.patch: launching
YaST should not give the feedback to the shell that we managed
to switch panel (bnc#845643).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 7 07:43:10 UTC 2013 - glin@suse.com Mon Oct 7 07:43:10 UTC 2013 - glin@suse.com