From 461d4e18851c2fe37ef922ee170689c26800adcc9c96b99aa34445e215e279df Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 23 Jun 2014 09:12:20 +0000
Subject: [PATCH] Accepting request 238327 from
 home:fcrozat:branches:GNOME:Factory

- Update gnome-control-center-allow-yast-in-shell.patch: properly
  display online-account panel.

OBS-URL: https://build.opensuse.org/request/show/238327
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=243
---
 ...ol-center-allow-extra-tools-in-shell.patch | 27 +++++++++----------
 gnome-control-center.changes                  |  6 +++++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/gnome-control-center-allow-extra-tools-in-shell.patch b/gnome-control-center-allow-extra-tools-in-shell.patch
index e483a40..75563c7 100644
--- a/gnome-control-center-allow-extra-tools-in-shell.patch
+++ b/gnome-control-center-allow-extra-tools-in-shell.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] allow extra tools in shell
  shell/cc-window.c       | 43 ++++++++++++++++++++++++++++++++++
  2 files changed, 81 insertions(+), 23 deletions(-)
 
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 26576dc..ec6b675 100644
---- a/shell/cc-panel-loader.c
-+++ b/shell/cc-panel-loader.c
+Index: gnome-control-center-3.12.1/shell/cc-panel-loader.c
+===================================================================
+--- gnome-control-center-3.12.1.orig/shell/cc-panel-loader.c
++++ gnome-control-center-3.12.1/shell/cc-panel-loader.c
 @@ -73,35 +73,40 @@ static struct {
    GType (*get_type)(void);
  #endif
@@ -42,7 +42,7 @@ index 26576dc..ec6b675 100644
 -  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-a   ccounts",  cc_goa_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     ),
@@ -74,7 +74,7 @@ index 26576dc..ec6b675 100644
  };
  
  GList *
-@@ -160,8 +165,16 @@ cc_panel_loader_fill_model (CcShellModel *model)
+@@ -160,8 +165,16 @@ cc_panel_loader_fill_model (CcShellModel
        char *desktop_name;
        int category;
  
@@ -93,7 +93,7 @@ index 26576dc..ec6b675 100644
        app = g_desktop_app_info_new (desktop_name);
        g_free (desktop_name);
  
-@@ -226,6 +239,8 @@ cc_panel_loader_add_option_groups (GOptionContext  *context,
+@@ -226,6 +239,8 @@ cc_panel_loader_add_option_groups (GOpti
      {
        GType (*get_type) (void);
        get_type = all_panels[i].get_type;
@@ -102,10 +102,10 @@ index 26576dc..ec6b675 100644
        GOptionGroup *group = cc_panel_get_option_group (get_type(), builder);
        if (group == NULL)
          continue;
-diff --git a/shell/cc-window.c b/shell/cc-window.c
-index 29b28e6..8e8f096 100644
---- a/shell/cc-window.c
-+++ b/shell/cc-window.c
+Index: gnome-control-center-3.12.1/shell/cc-window.c
+===================================================================
+--- gnome-control-center-3.12.1.orig/shell/cc-window.c
++++ gnome-control-center-3.12.1/shell/cc-window.c
 @@ -139,6 +139,39 @@ get_icon_name_from_g_icon (GIcon *gicon)
    return NULL;
  }
@@ -146,7 +146,7 @@ index 29b28e6..8e8f096 100644
  static gboolean
  activate_panel (CcWindow           *self,
                  const gchar        *id,
-@@ -153,6 +186,16 @@ activate_panel (CcWindow           *self,
+@@ -153,6 +186,16 @@ activate_panel (CcWindow           *self
    if (!id)
      return FALSE;
  
@@ -163,6 +163,3 @@ index 29b28e6..8e8f096 100644
    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));
    gtk_widget_show (priv->current_panel);
--- 
-1.7.12.4
-
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index ff86a4c..deb461b 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 23 07:58:24 UTC 2014 - fcrozat@suse.com
+
+- Update gnome-control-center-allow-yast-in-shell.patch: properly
+  display online-account panel.
+
 -------------------------------------------------------------------
 Fri Jun 13 08:03:48 UTC 2014 - fezhang@suse.com