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

Accepting request 424514 from home:zhangxiaofei:branches:GNOME:Factory

Browse Source 
- Update gnome-control-center-allow-extra-tools-in-shell.patch:

  + Fix leak of strings.

  + Add tools with category X-GNOME-DesktopSettings into the
    personal g-c-c category to enable itweb-settings.

  + Disable logspam in absence of optional components (bnc#866235
    bsc#952008).

- Specfile cleanup:

  + fix one mismatched patch tag;
 
  + abbreviate lengthy summary of one patch tag

- Changelog format: + remove trailing spaces

OBS-URL: https://build.opensuse.org/request/show/424514
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=327
This commit is contained in:
Bjørn Lie 2016-09-02 17:12:16 +00:00 committed by Git OBS Bridge
parent 98ff12fb74
commit 3c01e29ae8
3 changed files with 129 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
gnome-control-center-allow-extra-tools-in-shell.patch
View File

@ -1,81 +1,41 @@
From fbdfce5abb17cae9a1b9b8df8f3c5f87af345789 Mon Sep 17 00:00:00 2001 From 8469e4ac57f3b5d3efbf533ba23512612997ffff Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com> From: Felix Zhang <fezhang@suse.com>
Date: Thu, 12 Jun 2014 20:17:05 +0800 Date: Fri, 2 Sep 2016 14:55:12 +0800
Subject: [PATCH] allow extra tools in shell Subject: [PATCH] allow extra tools in shell
--- ---
shell/cc-panel-loader.c | 61 ++++++++++++++++++++++++++++++------------------- shell/cc-panel-loader.c | 28 ++++++++++++++++++++++++++--
shell/cc-window.c | 43 ++++++++++++++++++++++++++++++++++ shell/cc-window.c | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 23 deletions(-) 2 files changed, 67 insertions(+), 2 deletions(-)
Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
=================================================================== index de9c5df..e24fc6e 100644
--- gnome-control-center-3.17.90.orig/shell/cc-panel-loader.c --- a/shell/cc-panel-loader.c
+++ gnome-control-center-3.17.90/shell/cc-panel-loader.c +++ b/shell/cc-panel-loader.c
@@ -73,35 +73,41 @@ static struct { @@ -102,6 +102,12 @@ static struct {
GType (*get_type)(void);
#endif
} all_panels[] = {
- PANEL_TYPE("background", cc_background_panel_get_type ),
+ PANEL_TYPE("background", cc_background_panel_get_type ),
#ifdef BUILD_BLUETOOTH
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
#endif
- PANEL_TYPE("color", cc_color_panel_get_type ),
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
- PANEL_TYPE("display", cc_display_panel_get_type ),
- PANEL_TYPE("info", cc_info_panel_get_type ),
- PANEL_TYPE("keyboard", cc_keyboard_panel_get_type ),
- PANEL_TYPE("mouse", cc_mouse_panel_get_type ),
+ PANEL_TYPE("color", cc_color_panel_get_type ),
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
+ PANEL_TYPE("keyboard", cc_keyboard_panel_get_type ),
+ PANEL_TYPE("mouse", cc_mouse_panel_get_type ),
#ifdef BUILD_NETWORK
- PANEL_TYPE("network", cc_network_panel_get_type ),
+ PANEL_TYPE("network", cc_network_panel_get_type ),
#endif
- PANEL_TYPE("notifications", cc_notifications_panel_get_type),
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
- PANEL_TYPE("power", cc_power_panel_get_type ),
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type),
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
+ PANEL_TYPE("power", cc_power_panel_get_type ),
#ifdef BUILD_PRINTERS
- PANEL_TYPE("printers", cc_printers_panel_get_type ),
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
#endif
- PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
- PANEL_TYPE("region", cc_region_panel_get_type ),
- PANEL_TYPE("search", cc_search_panel_get_type ),
- PANEL_TYPE("sharing", cc_sharing_panel_get_type ),
- PANEL_TYPE("sound", cc_sound_panel_get_type ),
- PANEL_TYPE("universal-access", cc_ua_panel_get_type ),
- PANEL_TYPE("user-accounts", cc_user_panel_get_type ),
+ PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
+ PANEL_TYPE("region", cc_region_panel_get_type ),
+ PANEL_TYPE("search", cc_search_panel_get_type ),
+ PANEL_TYPE("sharing", cc_sharing_panel_get_type ),
+ PANEL_TYPE("sound", cc_sound_panel_get_type ),
+ PANEL_TYPE("universal-access", cc_ua_panel_get_type ),
+ PANEL_TYPE("user-accounts", cc_user_panel_get_type ),
#ifdef BUILD_WACOM #ifdef BUILD_WACOM
- PANEL_TYPE("wacom", cc_wacom_panel_get_type ), PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
+ PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
#endif #endif
+ PANEL_TYPE("ca.desrt.dconf-editor", NULL ), + PANEL_TYPE("ca.desrt.dconf-editor", NULL ),
+ PANEL_TYPE("gpk-prefs", NULL ),
+ PANEL_TYPE("tracker-preferences", NULL ),
+ PANEL_TYPE("itweb-settings", NULL ),
+ PANEL_TYPE("gnome-tweak-tool", NULL ), + PANEL_TYPE("gnome-tweak-tool", NULL ),
+ PANEL_TYPE("gpk-prefs", NULL ),
+ PANEL_TYPE("itweb-settings", NULL ),
+ PANEL_TYPE("tracker-preferences", NULL ),
+ PANEL_TYPE("YaST", NULL ), + PANEL_TYPE("YaST", NULL ),
}; };
GList * GList *
@@ -158,10 +165,22 @@ cc_panel_loader_fill_model (CcShellModel @@ -133,7 +139,8 @@ parse_categories (GDesktopAppInfo *app)
{
if (strcmp (split[i], "HardwareSettings") == 0)
retval = CC_CATEGORY_HARDWARE;
- else if (strcmp (split[i], "X-GNOME-PersonalSettings") == 0)
+ else if ((strcmp (split[i], "X-GNOME-PersonalSettings") == 0)
+ || (strcmp (split[i], "X-GNOME-DesktopSettings") == 0))
retval = CC_CATEGORY_PERSONAL;
else if (strcmp (split[i], "X-GNOME-SystemSettings") == 0)
retval = CC_CATEGORY_SYSTEM;
@@ -158,17 +165,33 @@ cc_panel_loader_fill_model (CcShellModel *model)
{ {
GDesktopAppInfo *app; GDesktopAppInfo *app;
char *desktop_name; char *desktop_name;
@ -83,7 +43,8 @@ Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c
int category; int category;
+#ifndef CC_PANEL_LOADER_NO_GTYPES +#ifndef CC_PANEL_LOADER_NO_GTYPES
+ if (all_panels[i].get_type == NULL) { + if (all_panels[i].get_type == NULL)
+ {
+ desktop_name = g_strconcat (all_panels[i].name, + desktop_name = g_strconcat (all_panels[i].name,
+ ".desktop", NULL); + ".desktop", NULL);
+ name = g_strconcat ("suse-",all_panels[i].name, NULL); + name = g_strconcat ("suse-",all_panels[i].name, NULL);
@ -98,19 +59,30 @@ Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c
app = g_desktop_app_info_new (desktop_name); app = g_desktop_app_info_new (desktop_name);
g_free (desktop_name); g_free (desktop_name);
@@ -176,7 +195,7 @@ cc_panel_loader_fill_model (CcShellModel if (app == NULL)
{
+ if (!g_str_has_prefix(name, "suse-"))
+ {
g_warning ("Ignoring broken panel %s (missing desktop file)",
all_panels[i].name);
+ }
continue;
}
@@ -176,7 +199,8 @@ cc_panel_loader_fill_model (CcShellModel *model)
if (G_UNLIKELY (category < 0)) if (G_UNLIKELY (category < 0))
continue; continue;
- cc_shell_model_add_item (model, category, G_APP_INFO (app), all_panels[i].name); - cc_shell_model_add_item (model, category, G_APP_INFO (app), all_panels[i].name);
+ cc_shell_model_add_item (model, category, G_APP_INFO (app), name); + cc_shell_model_add_item (model, category, G_APP_INFO (app), name);
+ g_free (name);
g_object_unref (app); g_object_unref (app);
} }
} }
Index: gnome-control-center-3.17.90/shell/cc-window.c diff --git a/shell/cc-window.c b/shell/cc-window.c
=================================================================== index 7c85f5c..d10ba9e 100644
--- gnome-control-center-3.17.90.orig/shell/cc-window.c --- a/shell/cc-window.c
+++ gnome-control-center-3.17.90/shell/cc-window.c +++ b/shell/cc-window.c
@@ -140,6 +140,41 @@ get_icon_name_from_g_icon (GIcon *gicon) @@ -140,6 +140,41 @@ get_icon_name_from_g_icon (GIcon *gicon)
return NULL; return NULL;
} }
@ -153,7 +125,7 @@ Index: gnome-control-center-3.17.90/shell/cc-window.c
static gboolean static gboolean
activate_panel (CcWindow *self, activate_panel (CcWindow *self,
const gchar *id, const gchar *id,
@@ -153,6 +188,12 @@ activate_panel (CcWindow *self @@ -153,6 +188,12 @@ activate_panel (CcWindow *self,
if (!id) if (!id)
return FALSE; return FALSE;
@ -166,12 +138,6 @@ Index: gnome-control-center-3.17.90/shell/cc-window.c
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));
cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel)); cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel));
@@ -1502,7 +1543,7 @@ create_header (CcWindow *self) --
gtk_button_set_image (GTK_BUTTON (priv->search_button), image); 2.6.6
gtk_widget_set_valign (priv->search_button, GTK_ALIGN_CENTER);
gtk_style_context_add_class (gtk_widget_get_style_context (priv->search_button),
- "image-button");
+ "image-button");
gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->header), priv->search_button);
priv->top_right_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

10
gnome-control-center.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Sep 2 13:03:45 UTC 2016 - fezhang@suse.com
- Update gnome-control-center-allow-extra-tools-in-shell.patch:
+ Fix leak of strings.
+ Add tools with category X-GNOME-DesktopSettings into the
personal g-c-c category to enable itweb-settings.
+ Disable logspam in absence of optional components (bnc#866235
bsc#952008).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 31 19:40:38 UTC 2016 - zaitor@opensuse.org Wed Aug 31 19:40:38 UTC 2016 - zaitor@opensuse.org

4
gnome-control-center.spec
View File

@ -36,13 +36,13 @@ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://www.gnome.org Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-control-center/3.20/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-control-center/3.20/%{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, pkg-prefs, gnome-tweak-tool and tracker-preferences to gnome-control-center-allow-yast-in-shell.patch so that they can launch from g-c-c shell like YaST does. Also change the patch with a more generic name. # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, itweb-settings, tracker-preferences and Yast to g-c-c.
Patch0: gnome-control-center-allow-extra-tools-in-shell.patch Patch0: gnome-control-center-allow-extra-tools-in-shell.patch
# PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch # PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch
Patch100: gnome-control-center-add-alacarte-for-sle.patch Patch100: gnome-control-center-add-alacarte-for-sle.patch
# PATCH-FEATURE-OPENSUSE gnome-control-center-hide-firewall-zone-entry.patch bnc#894394 fezhang@suse.com -- network: hide the firewall zone entry for firewalld, which is not used in opensuse # PATCH-FEATURE-OPENSUSE gnome-control-center-hide-firewall-zone-entry.patch bnc#894394 fezhang@suse.com -- network: hide the firewall zone entry for firewalld, which is not used in opensuse
Patch1: gnome-control-center-hide-firewall-zone-entry.patch Patch1: gnome-control-center-hide-firewall-zone-entry.patch
# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... # PATCH-FEATURE-OPENSUSE gnome-control-center-system-proxy-configuration.patch federico@gnome.org -- Integrate openSUSE's network proxy configuration with GNOME's.
Patch14: gnome-control-center-system-proxy-configuration.patch Patch14: gnome-control-center-system-proxy-configuration.patch
# PATCH-NEEDS-REBASE gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized (WAS: PATCH-FIX-UPSTREAM) # PATCH-NEEDS-REBASE gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized (WAS: PATCH-FIX-UPSTREAM)
Patch15: gcc-private-connection.patch Patch15: gcc-private-connection.patch