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

Proposed by Aurélien Gâteau on 2012-02-16
Status: Merged
Merged at revision: 354
Proposed branch: lp:~agateau/gnome-control-center/refresh-icon-view-patch-for-3.5.5
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 212 lines (+38/-42)
2 files modified
debian/changelog (+7/-0)
debian/patches/58_ubuntu_icon_views_redesign.patch (+31/-42)
To merge this branch: bzr merge lp:~agateau/gnome-control-center/refresh-icon-view-patch-for-3.5.5
Reviewer Review Type Date Requested Status
Sebastien Bacher 2012-02-16 Pending
Review via email: mp+93450@code.launchpad.net

Description of the change

Refresh the icon views and category header patch for 3.5.5

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-02-15 22:17:24 +0000
3+++ debian/changelog 2012-02-16 16:41:17 +0000
4@@ -1,3 +1,10 @@
5+gnome-control-center (1:3.3.5-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/patches/58_ubuntu_icon_views_redesign.patch
8+ - Refresh for 3.5.5
9+
10+ -- Aurélien Gâteau <aurelien.gateau@ubuntu.com> Thu, 16 Feb 2012 17:19:42 +0100
11+
12 gnome-control-center (1:3.3.5-0ubuntu1) precise; urgency=low
13
14 * Upload the new serie, that will bring in quite some fixes, we revert
15
16=== modified file 'debian/patches/58_ubuntu_icon_views_redesign.patch'
17--- debian/patches/58_ubuntu_icon_views_redesign.patch 2012-02-12 22:04:11 +0000
18+++ debian/patches/58_ubuntu_icon_views_redesign.patch 2012-02-16 16:41:17 +0000
19@@ -1,8 +1,6 @@
20 === modified file 'shell/cc-shell-category-view.c'
21-Index: gnome-control-center-3.3.5/shell/cc-shell-category-view.c
22-===================================================================
23---- gnome-control-center-3.3.5.orig/shell/cc-shell-category-view.c 2012-02-12 11:13:59.269332303 -0500
24-+++ gnome-control-center-3.3.5/shell/cc-shell-category-view.c 2012-02-12 11:17:26.626360531 -0500
25+--- a/shell/cc-shell-category-view.c 2012-02-16 14:27:27 +0000
26++++ b/shell/cc-shell-category-view.c 2012-02-16 15:10:00 +0000
27 @@ -31,12 +31,14 @@
28 enum
29 {
30@@ -116,10 +114,10 @@
31 "model", model, NULL);
32 }
33
34-Index: gnome-control-center-3.3.5/shell/cc-shell-category-view.h
35-===================================================================
36---- gnome-control-center-3.3.5.orig/shell/cc-shell-category-view.h 2012-02-12 11:13:59.305332481 -0500
37-+++ gnome-control-center-3.3.5/shell/cc-shell-category-view.h 2012-02-12 11:14:01.957345631 -0500
38+
39+=== modified file 'shell/cc-shell-category-view.h'
40+--- a/shell/cc-shell-category-view.h 2012-02-16 09:44:01 +0000
41++++ b/shell/cc-shell-category-view.h 2012-02-16 12:32:37 +0000
42 @@ -68,6 +68,7 @@
43 GType cc_shell_category_view_get_type (void) G_GNUC_CONST;
44
45@@ -128,10 +126,10 @@
46 GtkTreeModel *model);
47 CcShellItemView* cc_shell_category_view_get_item_view (CcShellCategoryView *self);
48
49-Index: gnome-control-center-3.3.5/shell/cc-shell-model.c
50-===================================================================
51---- gnome-control-center-3.3.5.orig/shell/cc-shell-model.c 2012-02-12 11:13:59.237332146 -0500
52-+++ gnome-control-center-3.3.5/shell/cc-shell-model.c 2012-02-12 11:14:01.961345652 -0500
53+
54+=== modified file 'shell/cc-shell-model.c'
55+--- a/shell/cc-shell-model.c 2012-02-16 14:27:27 +0000
56++++ b/shell/cc-shell-model.c 2012-02-16 14:49:19 +0000
57 @@ -43,7 +43,7 @@
58 theme = gtk_icon_theme_get_default ();
59
60@@ -141,10 +139,10 @@
61 if (icon_info)
62 {
63 pixbuf = gtk_icon_info_load_icon (icon_info, &err);
64-Index: gnome-control-center-3.3.5/shell/gnome-control-center.c
65-===================================================================
66---- gnome-control-center-3.3.5.orig/shell/gnome-control-center.c 2012-02-12 11:13:59.293332423 -0500
67-+++ gnome-control-center-3.3.5/shell/gnome-control-center.c 2012-02-12 11:14:01.961345652 -0500
68+
69+=== modified file 'shell/gnome-control-center.c'
70+--- a/shell/gnome-control-center.c 2012-02-16 15:37:06 +0000
71++++ b/shell/gnome-control-center.c 2012-02-16 16:09:58 +0000
72 @@ -48,7 +48,8 @@
73 * for the user than resizing vertically
74 * Both sizes are defined in https://live.gnome.org/Design/SystemSettings/ */
75@@ -164,17 +162,7 @@
76 };
77
78 static const gchar *
79-@@ -326,7 +329,8 @@
80- res = NULL;
81- for (l = list; l; l = l->next)
82- {
83-- res = g_list_append (res, cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (l->data)));
84-+ if (CC_IS_SHELL_CATEGORY_VIEW (l->data))
85-+ res = g_list_append (res, cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (l->data)));
86- }
87-
88- g_list_free (list);
89-@@ -599,6 +603,8 @@
90+@@ -583,6 +586,8 @@
91 static void
92 setup_search (GnomeControlCenter *shell)
93 {
94@@ -183,7 +171,7 @@
95 GtkWidget *search_scrolled, *search_view, *widget;
96 GtkCellRenderer *renderer;
97 GnomeControlCenterPrivate *priv = shell->priv;
98-@@ -618,7 +624,8 @@
99+@@ -602,7 +607,8 @@
100 priv->search_view = search_view = cc_shell_item_view_new ();
101 gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (search_view),
102 GTK_ORIENTATION_HORIZONTAL);
103@@ -193,7 +181,7 @@
104 gtk_icon_view_set_model (GTK_ICON_VIEW (search_view),
105 GTK_TREE_MODEL (priv->search_filter));
106
107-@@ -675,7 +682,8 @@
108+@@ -659,7 +665,8 @@
109
110 static void
111 maybe_add_category_view (GnomeControlCenter *shell,
112@@ -203,7 +191,7 @@
113 {
114 GtkTreeModel *filter;
115 GtkWidget *categoryview;
116-@@ -683,6 +691,16 @@
117+@@ -667,6 +674,16 @@
118 if (g_hash_table_lookup (shell->priv->category_views, name) != NULL)
119 return;
120
121@@ -220,7 +208,7 @@
122 /* create new category view for this category */
123 filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (shell->priv->store),
124 NULL);
125-@@ -690,7 +708,7 @@
126+@@ -674,7 +691,7 @@
127 (GtkTreeModelFilterVisibleFunc) category_filter_func,
128 g_strdup (name), g_free);
129
130@@ -229,7 +217,7 @@
131 gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), categoryview, FALSE, TRUE, 0);
132
133 g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
134-@@ -738,13 +756,15 @@
135+@@ -722,13 +739,15 @@
136 {
137 GMenuTreeDirectory *subdir;
138 const gchar *dir_name;
139@@ -246,7 +234,7 @@
140
141 /* add the items from this category to the model */
142 sub_iter = gmenu_tree_directory_iter (subdir);
143-@@ -781,7 +801,10 @@
144+@@ -765,7 +784,10 @@
145 {
146 GnomeControlCenterPrivate *priv = shell->priv;
147
148@@ -258,7 +246,7 @@
149 gtk_container_set_focus_vadjustment (GTK_CONTAINER (shell->priv->main_vbox),
150 gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (shell->priv->scrolled_window)));
151
152-@@ -838,7 +861,10 @@
153+@@ -822,7 +844,10 @@
154 gtk_widget_hide (W (priv->builder, "home-button"));
155 gtk_widget_show (W (priv->builder, "search-entry"));
156 gtk_widget_hide (W (priv->builder, "lock-button"));
157@@ -270,7 +258,7 @@
158 }
159 else
160 {
161-@@ -1109,6 +1135,23 @@
162+@@ -1093,6 +1118,23 @@
163 return retval;
164 }
165
166@@ -294,7 +282,7 @@
167 static void
168 gnome_control_center_init (GnomeControlCenter *self)
169 {
170-@@ -1117,6 +1160,8 @@
171+@@ -1101,6 +1143,8 @@
172
173 priv = self->priv = CONTROL_CENTER_PRIVATE (self);
174
175@@ -303,7 +291,7 @@
176 /* load the user interface */
177 priv->builder = gtk_builder_new ();
178
179-@@ -1130,6 +1175,8 @@
180+@@ -1114,6 +1158,8 @@
181
182 /* connect various signals */
183 priv->window = W (priv->builder, "main-window");
184@@ -312,7 +300,7 @@
185 g_signal_connect_swapped (priv->window, "delete-event", G_CALLBACK (g_object_unref), self);
186 g_signal_connect (priv->window, "key_press_event",
187 G_CALLBACK (window_key_press_event), self);
188-@@ -1174,6 +1221,9 @@
189+@@ -1158,6 +1204,9 @@
190 void
191 gnome_control_center_present (GnomeControlCenter *center)
192 {
193@@ -322,10 +310,10 @@
194 gtk_window_present (GTK_WINDOW (center->priv->window));
195 }
196
197-Index: gnome-control-center-3.3.5/shell/shell-search-renderer.c
198-===================================================================
199---- gnome-control-center-3.3.5.orig/shell/shell-search-renderer.c 2012-02-12 11:13:59.221332066 -0500
200-+++ gnome-control-center-3.3.5/shell/shell-search-renderer.c 2012-02-12 11:14:01.961345652 -0500
201+
202+=== modified file 'shell/shell-search-renderer.c'
203+--- a/shell/shell-search-renderer.c 2012-02-16 14:27:27 +0000
204++++ b/shell/shell-search-renderer.c 2012-02-16 14:49:19 +0000
205 @@ -215,7 +215,7 @@
206
207 shell_search_renderer_set_layout (SHELL_SEARCH_RENDERER (cell), widget);
208@@ -360,3 +348,4 @@
209 priv->layout);
210
211 cairo_restore (cr);
212+

Subscribers

People subscribed via source and target branches