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

Accepting request 181726 from GNOME:Factory

Browse Source 
rebase gnome-control-center-allow-yast-in-shell.patch, prevent it from crash (forwarded request 181721 from dliang)

OBS-URL: https://build.opensuse.org/request/show/181726
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=99
This commit is contained in:
Stephan Kulow 2013-07-03 08:23:46 +00:00 committed by Git OBS Bridge
commit 066479b826
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
Index: gnome-control-center-3.9.2/shell/cc-panel-loader.c
===================================================================
--- gnome-control-center-3.9.2.orig/shell/cc-panel-loader.c
+++ gnome-control-center-3.9.2/shell/cc-panel-loader.c
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
@@ -102,6 +102,7 @@ static struct {
#ifdef BUILD_WACOM
PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
@ -24,10 +23,18 @@ Index: gnome-control-center-3.9.2/shell/cc-panel-loader.c
app = g_desktop_app_info_new (desktop_name);
g_free (desktop_name);
Index: gnome-control-center-3.9.2/shell/cc-window.c
===================================================================
--- gnome-control-center-3.9.2.orig/shell/cc-window.c
+++ gnome-control-center-3.9.2/shell/cc-window.c
@@ -226,6 +230,8 @@ cc_panel_loader_add_option_groups (GOpti
{
GType (*get_type) (void);
get_type = all_panels[i].get_type;
+ if (get_type == NULL)
+ continue;
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)
return NULL;
}

6
gnome-control-center.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 2 03:48:05 UTC 2013 - dliang@suse.com
- Rebase gnome-control-center-allow-yast-in-shell.patch.
to prevent it from crash.
-------------------------------------------------------------------
Fri Jun 21 18:00:16 UTC 2013 - dimstar@opensuse.org