From 2ad1302fd62969ca3b967b2aaafd99e01dfda87c561e3143d43bc4371a47ae6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sun, 13 Oct 2013 21:18:35 +0000 Subject: [PATCH] Accepting request 203101 from home:dimstar:branches:GNOME:Factory - 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). OBS-URL: https://build.opensuse.org/request/show/203101 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=222 --- ...e-control-center-allow-yast-in-shell.patch | 20 ++++++++++--------- gnome-control-center.changes | 7 +++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gnome-control-center-allow-yast-in-shell.patch b/gnome-control-center-allow-yast-in-shell.patch index a660628..0f1b240 100644 --- a/gnome-control-center-allow-yast-in-shell.patch +++ b/gnome-control-center-allow-yast-in-shell.patch @@ -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 ---- 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 +Index: gnome-control-center-3.10.0/shell/cc-panel-loader.c +=================================================================== +--- 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 { #ifdef BUILD_WACOM 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); if (group == NULL) 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 ---- 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 -@@ -133,6 +133,38 @@ get_icon_name_from_g_icon (GIcon *gicon) +Index: gnome-control-center-3.10.0/shell/cc-window.c +=================================================================== +--- gnome-control-center-3.10.0.orig/shell/cc-window.c ++++ gnome-control-center-3.10.0/shell/cc-window.c +@@ -137,6 +137,38 @@ get_icon_name_from_g_icon (GIcon *gicon) return NULL; } @@ -74,14 +76,14 @@ diff -Npur gnome-control-center-3.9.3-old/shell/cc-window.c gnome-control-center static gboolean activate_panel (CcWindow *self, const gchar *id, -@@ -147,6 +179,12 @@ activate_panel (CcWindow *self +@@ -151,6 +183,12 @@ activate_panel (CcWindow *self if (!id) return FALSE; + if (g_strcmp0 (id, "YaST") == 0) + { + suse_activate_desktop (name); -+ return TRUE; ++ return FALSE; + } + priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); diff --git a/gnome-control-center.changes b/gnome-control-center.changes index bcb2253..12df9e6 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -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