Merge lp:~agateau/gnome-control-center/refresh-icon-view-patch-for-3.5.5 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[Aurélien Gâteau]

Refresh the icon views and category header patch for 3.5.5

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-15 22:17:24 +0000
+++ debian/changelog	2012-02-16 16:41:17 +0000
@@ -1,3 +1,10 @@
+gnome-control-center (1:3.3.5-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/58_ubuntu_icon_views_redesign.patch
+    - Refresh for 3.5.5
+
+ -- Aurélien Gâteau <[e-mail]>  Thu, 16 Feb 2012 17:19:42 +0100
+
 gnome-control-center (1:3.3.5-0ubuntu1) precise; urgency=low
 
   * Upload the new serie, that will bring in quite some fixes, we revert
 
=== modified file 'debian/patches/58_ubuntu_icon_views_redesign.patch'
--- debian/patches/58_ubuntu_icon_views_redesign.patch	2012-02-12 22:04:11 +0000
+++ debian/patches/58_ubuntu_icon_views_redesign.patch	2012-02-16 16:41:17 +0000
@@ -1,8 +1,6 @@
 === modified file 'shell/cc-shell-category-view.c'
-Index: gnome-control-center-3.3.5/shell/cc-shell-category-view.c
-===================================================================
---- gnome-control-center-3.3.5.orig/shell/cc-shell-category-view.c	2012-02-12 11:13:59.269332303 -0500
-+++ gnome-control-center-3.3.5/shell/cc-shell-category-view.c	2012-02-12 11:17:26.626360531 -0500
+--- a/shell/cc-shell-category-view.c	2012-02-16 14:27:27 +0000
++++ b/shell/cc-shell-category-view.c	2012-02-16 15:10:00 +0000
 @@ -31,12 +31,14 @@
  enum
  {
@@ -116,10 +114,10 @@
                         "model", model, NULL);
  }
  
-Index: gnome-control-center-3.3.5/shell/cc-shell-category-view.h
-===================================================================
---- gnome-control-center-3.3.5.orig/shell/cc-shell-category-view.h	2012-02-12 11:13:59.305332481 -0500
-+++ gnome-control-center-3.3.5/shell/cc-shell-category-view.h	2012-02-12 11:14:01.957345631 -0500
+
+=== modified file 'shell/cc-shell-category-view.h'
+--- a/shell/cc-shell-category-view.h	2012-02-16 09:44:01 +0000
++++ b/shell/cc-shell-category-view.h	2012-02-16 12:32:37 +0000
 @@ -68,6 +68,7 @@
  GType cc_shell_category_view_get_type (void) G_GNUC_CONST;
  
@@ -128,10 +126,10 @@
                                         GtkTreeModel *model);
  CcShellItemView* cc_shell_category_view_get_item_view (CcShellCategoryView *self);
  
-Index: gnome-control-center-3.3.5/shell/cc-shell-model.c
-===================================================================
---- gnome-control-center-3.3.5.orig/shell/cc-shell-model.c	2012-02-12 11:13:59.237332146 -0500
-+++ gnome-control-center-3.3.5/shell/cc-shell-model.c	2012-02-12 11:14:01.961345652 -0500
+
+=== modified file 'shell/cc-shell-model.c'
+--- a/shell/cc-shell-model.c	2012-02-16 14:27:27 +0000
++++ b/shell/cc-shell-model.c	2012-02-16 14:49:19 +0000
 @@ -43,7 +43,7 @@
    theme = gtk_icon_theme_get_default ();
  
@@ -141,10 +139,10 @@
    if (icon_info)
      {
        pixbuf = gtk_icon_info_load_icon (icon_info, &err);
-Index: gnome-control-center-3.3.5/shell/gnome-control-center.c
-===================================================================
---- gnome-control-center-3.3.5.orig/shell/gnome-control-center.c	2012-02-12 11:13:59.293332423 -0500
-+++ gnome-control-center-3.3.5/shell/gnome-control-center.c	2012-02-12 11:14:01.961345652 -0500
+
+=== modified file 'shell/gnome-control-center.c'
+--- a/shell/gnome-control-center.c	2012-02-16 15:37:06 +0000
++++ b/shell/gnome-control-center.c	2012-02-16 16:09:58 +0000
 @@ -48,7 +48,8 @@
   * for the user than resizing vertically
   * Both sizes are defined in https://live.gnome.org/Design/SystemSettings/ */
@@ -164,17 +162,7 @@
  };
  
  static const gchar *
-@@ -326,7 +329,8 @@
-   res = NULL;
-   for (l = list; l; l = l->next)
-     {
--      res = g_list_append (res, cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (l->data)));
-+      if (CC_IS_SHELL_CATEGORY_VIEW (l->data))
-+        res = g_list_append (res, cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (l->data)));
-     }
- 
-   g_list_free (list);
-@@ -599,6 +603,8 @@
+@@ -583,6 +586,8 @@
  static void
  setup_search (GnomeControlCenter *shell)
  {
@@ -183,7 +171,7 @@
    GtkWidget *search_scrolled, *search_view, *widget;
    GtkCellRenderer *renderer;
    GnomeControlCenterPrivate *priv = shell->priv;
-@@ -618,7 +624,8 @@
+@@ -602,7 +607,8 @@
    priv->search_view = search_view = cc_shell_item_view_new ();
    gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (search_view),
                                        GTK_ORIENTATION_HORIZONTAL);
@@ -193,7 +181,7 @@
    gtk_icon_view_set_model (GTK_ICON_VIEW (search_view),
                             GTK_TREE_MODEL (priv->search_filter));
  
-@@ -675,7 +682,8 @@
+@@ -659,7 +665,8 @@
  
  static void
  maybe_add_category_view (GnomeControlCenter *shell,
@@ -203,7 +191,7 @@
  {
    GtkTreeModel *filter;
    GtkWidget *categoryview;
-@@ -683,6 +691,16 @@
+@@ -667,6 +674,16 @@
    if (g_hash_table_lookup (shell->priv->category_views, name) != NULL)
      return;
  
@@ -220,7 +208,7 @@
    /* create new category view for this category */
    filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (shell->priv->store),
                                        NULL);
-@@ -690,7 +708,7 @@
+@@ -674,7 +691,7 @@
                                            (GtkTreeModelFilterVisibleFunc) category_filter_func,
                                            g_strdup (name), g_free);
  
@@ -229,7 +217,7 @@
    gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), categoryview, FALSE, TRUE, 0);
  
    g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
-@@ -738,13 +756,15 @@
+@@ -722,13 +739,15 @@
          {
            GMenuTreeDirectory *subdir;
            const gchar *dir_name;
@@ -246,7 +234,7 @@
  
            /* add the items from this category to the model */
            sub_iter = gmenu_tree_directory_iter (subdir);
-@@ -781,7 +801,10 @@
+@@ -765,7 +784,10 @@
  {
    GnomeControlCenterPrivate *priv = shell->priv;
  
@@ -258,7 +246,7 @@
    gtk_container_set_focus_vadjustment (GTK_CONTAINER (shell->priv->main_vbox),
                                         gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (shell->priv->scrolled_window)));
  
-@@ -838,7 +861,10 @@
+@@ -822,7 +844,10 @@
        gtk_widget_hide (W (priv->builder, "home-button"));
        gtk_widget_show (W (priv->builder, "search-entry"));
        gtk_widget_hide (W (priv->builder, "lock-button"));
@@ -270,7 +258,7 @@
      }
    else
      {
-@@ -1109,6 +1135,23 @@
+@@ -1093,6 +1118,23 @@
    return retval;
  }
  
@@ -294,7 +282,7 @@
  static void
  gnome_control_center_init (GnomeControlCenter *self)
  {
-@@ -1117,6 +1160,8 @@
+@@ -1101,6 +1143,8 @@
  
    priv = self->priv = CONTROL_CENTER_PRIVATE (self);
  
@@ -303,7 +291,7 @@
    /* load the user interface */
    priv->builder = gtk_builder_new ();
  
-@@ -1130,6 +1175,8 @@
+@@ -1114,6 +1158,8 @@
  
    /* connect various signals */
    priv->window = W (priv->builder, "main-window");
@@ -312,7 +300,7 @@
    g_signal_connect_swapped (priv->window, "delete-event", G_CALLBACK (g_object_unref), self);
    g_signal_connect (priv->window, "key_press_event",
                      G_CALLBACK (window_key_press_event), self);
-@@ -1174,6 +1221,9 @@
+@@ -1158,6 +1204,9 @@
  void
  gnome_control_center_present (GnomeControlCenter *center)
  {
@@ -322,10 +310,10 @@
    gtk_window_present (GTK_WINDOW (center->priv->window));
  }
  
-Index: gnome-control-center-3.3.5/shell/shell-search-renderer.c
-===================================================================
---- gnome-control-center-3.3.5.orig/shell/shell-search-renderer.c	2012-02-12 11:13:59.221332066 -0500
-+++ gnome-control-center-3.3.5/shell/shell-search-renderer.c	2012-02-12 11:14:01.961345652 -0500
+
+=== modified file 'shell/shell-search-renderer.c'
+--- a/shell/shell-search-renderer.c	2012-02-16 14:27:27 +0000
++++ b/shell/shell-search-renderer.c	2012-02-16 14:49:19 +0000
 @@ -215,7 +215,7 @@
  
    shell_search_renderer_set_layout (SHELL_SEARCH_RENDERER (cell), widget);
@@ -360,3 +348,4 @@
                       priv->layout);
  
    cairo_restore (cr);
+