diff --git a/gnome-control-center-allow-yast-in-shell.patch b/gnome-control-center-allow-yast-in-shell.patch index 4778de3..a660628 100644 --- a/gnome-control-center-allow-yast-in-shell.patch +++ b/gnome-control-center-allow-yast-in-shell.patch @@ -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; } diff --git a/gnome-control-center.changes b/gnome-control-center.changes index a34d9f5..f921f82 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -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