Merge lp:~agateau/gnome-control-center/ubuntu-nav-bar into lp:~ubuntu-desktop/gnome-control-center/ubuntu

Proposed by Aurélien Gâteau on 2012-02-16
Status: Merged
Merged at revision: 355
Proposed branch: lp:~agateau/gnome-control-center/ubuntu-nav-bar
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Prerequisite: lp:~agateau/gnome-control-center/refresh-icon-view-patch-for-3.5.5
Diff against target: 566 lines (+404/-22)
4 files modified
debian/changelog (+3/-0)
debian/patches/60_ubuntu_nav_bar.patch (+378/-0)
debian/patches/revert_git_drop_library.patch (+22/-22)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~agateau/gnome-control-center/ubuntu-nav-bar
Reviewer Review Type Date Requested Status
Sebastien Bacher 2012-02-16 Pending
Review via email: mp+93454@code.launchpad.net

Description of the change

Replace "All Settings" button with bread crumb buttons, as described in bug #933482. This is not complete: the pointy arrow effect is missing. This should be implemented by the theme engine. The patch sets the "linked" and "breadcrumbs" GTK style classes. The "linked" class is implemented by Adwaita: when using this theme the buttons looks like segmented buttons.

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-16 16:45:20 +0000
3+++ debian/changelog 2012-02-16 16:45:20 +0000
4@@ -2,6 +2,9 @@
5
6 * debian/patches/58_ubuntu_icon_views_redesign.patch
7 - Refresh for 3.5.5
8+ * debian/patches/60_ubuntu_nav_bar.patch:
9+ - First implementation of breadcrumb buttons, without pointy arrows for
10+ now (lp: #933482)
11
12 -- Aurélien Gâteau <aurelien.gateau@ubuntu.com> Thu, 16 Feb 2012 17:19:42 +0100
13
14
15=== added file 'debian/patches/60_ubuntu_nav_bar.patch'
16--- debian/patches/60_ubuntu_nav_bar.patch 1970-01-01 00:00:00 +0000
17+++ debian/patches/60_ubuntu_nav_bar.patch 2012-02-16 16:45:20 +0000
18@@ -0,0 +1,378 @@
19+=== modified file 'shell/Makefile.am'
20+--- a/shell/Makefile.am 2012-02-16 14:27:27 +0000
21++++ b/shell/Makefile.am 2012-02-16 15:30:33 +0000
22+@@ -27,6 +27,8 @@
23+ cc-shell-item-view.h \
24+ cc-shell-model.c \
25+ cc-shell-model.h \
26++ cc-shell-nav-bar.c \
27++ cc-shell-nav-bar.h \
28+ cc-editable-entry.c \
29+ cc-editable-entry.h \
30+ cc-panel.c \
31+
32+=== modified file 'shell/cc-shell-marshal.list'
33+--- a/shell/cc-shell-marshal.list 2012-02-16 09:44:01 +0000
34++++ b/shell/cc-shell-marshal.list 2012-02-16 12:51:50 +0000
35+@@ -1,1 +1,2 @@
36+ VOID:STRING,STRING,STRING
37++VOID:VOID
38+
39+=== added file 'shell/cc-shell-nav-bar.c'
40+--- a/shell/cc-shell-nav-bar.c 1970-01-01 00:00:00 +0000
41++++ b/shell/cc-shell-nav-bar.c 2012-02-16 13:44:14 +0000
42+@@ -0,0 +1,150 @@
43++/*
44++ * Copyright 2012 Canonical
45++ *
46++ * The Control Center is free software; you can redistribute it and/or modify
47++ * it under the terms of the GNU General Public License as published by the
48++ * Free Software Foundation; either version 2 of the License, or (at your
49++ * option) any later version.
50++ *
51++ * The Control Center is distributed in the hope that it will be useful, but
52++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
53++ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
54++ * for more details.
55++ *
56++ * You should have received a copy of the GNU General Public License along
57++ * with the Control Center; if not, write to the Free Software Foundation,
58++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
59++ *
60++ * Author: Aurélien Gâteau <aurelien.gateau@canonical.com>
61++ */
62++
63++#include "cc-shell-nav-bar.h"
64++#include "cc-shell-marshal.h"
65++
66++#include <glib/gi18n.h>
67++
68++G_DEFINE_TYPE (CcShellNavBar, cc_shell_nav_bar, GTK_TYPE_BUTTON_BOX)
69++
70++#define SHELL_NAV_BAR_PRIVATE(o) \
71++ (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_SHELL_NAV_BAR, CcShellNavBarPrivate))
72++
73++struct _CcShellNavBarPrivate
74++{
75++ GtkWidget *home_button;
76++ GtkWidget *detail_button;
77++};
78++
79++enum
80++{
81++ HOME_CLICKED,
82++ LAST_SIGNAL
83++};
84++
85++static guint signals[LAST_SIGNAL] = {0,};
86++
87++static void
88++cc_shell_nav_bar_get_property (GObject *object,
89++ guint property_id,
90++ GValue *value,
91++ GParamSpec *pspec)
92++{
93++ switch (property_id)
94++ {
95++ default:
96++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
97++ }
98++}
99++
100++static void
101++cc_shell_nav_bar_set_property (GObject *object,
102++ guint property_id,
103++ const GValue *value,
104++ GParamSpec *pspec)
105++{
106++ switch (property_id)
107++ {
108++ default:
109++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
110++ }
111++}
112++
113++static void
114++cc_shell_nav_bar_dispose (GObject *object)
115++{
116++ G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->dispose (object);
117++}
118++
119++static void
120++cc_shell_nav_bar_finalize (GObject *object)
121++{
122++ G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->finalize (object);
123++}
124++
125++static void
126++home_button_clicked_cb (GtkButton *button,
127++ CcShellNavBar *bar)
128++{
129++ g_signal_emit (bar, signals[HOME_CLICKED], 0);
130++}
131++
132++static void
133++cc_shell_nav_bar_class_init (CcShellNavBarClass *klass)
134++{
135++ GObjectClass *object_class = G_OBJECT_CLASS (klass);
136++
137++ g_type_class_add_private (klass, sizeof (CcShellNavBarPrivate));
138++
139++ object_class->get_property = cc_shell_nav_bar_get_property;
140++ object_class->set_property = cc_shell_nav_bar_set_property;
141++ object_class->dispose = cc_shell_nav_bar_dispose;
142++ object_class->finalize = cc_shell_nav_bar_finalize;
143++
144++ signals[HOME_CLICKED] = g_signal_new ("home-clicked",
145++ CC_TYPE_SHELL_NAV_BAR,
146++ G_SIGNAL_RUN_FIRST,
147++ 0,
148++ NULL,
149++ NULL,
150++ cc_shell_marshal_VOID__VOID,
151++ G_TYPE_NONE,
152++ 0);
153++}
154++
155++static void
156++cc_shell_nav_bar_init (CcShellNavBar *self)
157++{
158++ self->priv = SHELL_NAV_BAR_PRIVATE (self);
159++ self->priv->home_button = gtk_button_new_with_mnemonic (_("_All Settings"));
160++ self->priv->detail_button = gtk_button_new();
161++
162++ gtk_box_pack_start (GTK_BOX(self), self->priv->home_button, FALSE, FALSE, 0);
163++ gtk_box_pack_start (GTK_BOX(self), self->priv->detail_button, FALSE, FALSE, 0);
164++
165++ gtk_widget_show (self->priv->home_button);
166++
167++ g_signal_connect (self->priv->home_button, "clicked",
168++ G_CALLBACK (home_button_clicked_cb), self);
169++
170++ GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET(self));
171++ gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
172++ gtk_style_context_add_class (context, "breadcrumbs");
173++}
174++
175++GtkWidget *
176++cc_shell_nav_bar_new (void)
177++{
178++ return g_object_new (CC_TYPE_SHELL_NAV_BAR, NULL);
179++}
180++
181++void
182++cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label)
183++{
184++ gtk_widget_show (bar->priv->detail_button);
185++ gtk_button_set_label (GTK_BUTTON (bar->priv->detail_button), label);
186++}
187++
188++void
189++cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar)
190++{
191++ gtk_widget_hide (bar->priv->detail_button);
192++}
193+
194+=== added file 'shell/cc-shell-nav-bar.h'
195+--- a/shell/cc-shell-nav-bar.h 1970-01-01 00:00:00 +0000
196++++ b/shell/cc-shell-nav-bar.h 2012-02-16 12:51:54 +0000
197+@@ -0,0 +1,76 @@
198++/*
199++ * Copyright 2012 Canonical
200++ *
201++ * The Control Center is free software; you can redistribute it and/or modify
202++ * it under the terms of the GNU General Public License as published by the
203++ * Free Software Foundation; either version 2 of the License, or (at your
204++ * option) any later version.
205++ *
206++ * The Control Center is distributed in the hope that it will be useful, but
207++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
208++ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
209++ * for more details.
210++ *
211++ * You should have received a copy of the GNU General Public License along
212++ * with the Control Center; if not, write to the Free Software Foundation,
213++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
214++ *
215++ * Author: Aurélien Gâteau <aurelien.gateau@canonical.com>
216++ */
217++
218++#ifndef _CC_SHELL_NAV_BAR_H
219++#define _CC_SHELL_NAV_BAR_H
220++
221++#include <gtk/gtk.h>
222++
223++G_BEGIN_DECLS
224++
225++#define CC_TYPE_SHELL_NAV_BAR cc_shell_nav_bar_get_type()
226++
227++#define CC_SHELL_NAV_BAR(obj) \
228++ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
229++ CC_TYPE_SHELL_NAV_BAR, CcShellNavBar))
230++
231++#define CC_SHELL_NAV_BAR_CLASS(klass) \
232++ (G_TYPE_CHECK_CLASS_CAST ((klass), \
233++ CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass))
234++
235++#define CC_IS_SHELL_NAV_BAR(obj) \
236++ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
237++ CC_TYPE_SHELL_NAV_BAR))
238++
239++#define CC_IS_SHELL_NAV_BAR_CLASS(klass) \
240++ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
241++ CC_TYPE_SHELL_NAV_BAR))
242++
243++#define CC_SHELL_NAV_BAR_GET_CLASS(obj) \
244++ (G_TYPE_INSTANCE_GET_CLASS ((obj), \
245++ CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass))
246++
247++typedef struct _CcShellNavBar CcShellNavBar;
248++typedef struct _CcShellNavBarClass CcShellNavBarClass;
249++typedef struct _CcShellNavBarPrivate CcShellNavBarPrivate;
250++
251++struct _CcShellNavBar
252++{
253++ GtkButtonBox parent;
254++
255++ CcShellNavBarPrivate *priv;
256++};
257++
258++struct _CcShellNavBarClass
259++{
260++ GtkButtonBoxClass parent_class;
261++};
262++
263++GType cc_shell_nav_bar_get_type (void) G_GNUC_CONST;
264++
265++GtkWidget *cc_shell_nav_bar_new (void);
266++
267++void cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label);
268++
269++void cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar);
270++
271++G_END_DECLS
272++
273++#endif /* _CC_SHELL_NAV_BAR_H */
274+
275+=== modified file 'shell/gnome-control-center.c'
276+--- a/shell/gnome-control-center.c 2012-02-16 15:39:10 +0000
277++++ b/shell/gnome-control-center.c 2012-02-16 15:39:20 +0000
278+@@ -36,6 +36,7 @@
279+ #include "shell-search-renderer.h"
280+ #include "cc-shell-category-view.h"
281+ #include "cc-shell-model.h"
282++#include "cc-shell-nav-bar.h"
283+
284+ G_DEFINE_TYPE (GnomeControlCenter, gnome_control_center, CC_TYPE_SHELL)
285+
286+@@ -71,6 +72,7 @@
287+ GtkWidget *search_entry;
288+ GtkWidget *lock_button;
289+ GPtrArray *custom_widgets;
290++ GtkWidget *nav_bar;
291+
292+ GMenuTree *menu_tree;
293+ GtkListStore *store;
294+@@ -246,6 +248,8 @@
295+
296+ /* clear any custom widgets */
297+ _shell_remove_all_custom_widgets (priv);
298++
299++ cc_shell_nav_bar_hide_detail_button (CC_SHELL_NAV_BAR (priv->nav_bar));
300+ }
301+
302+ void
303+@@ -263,6 +267,8 @@
304+ {
305+ GError *err = NULL;
306+
307++ cc_shell_nav_bar_show_detail_button (CC_SHELL_NAV_BAR(shell->priv->nav_bar), name);
308++
309+ if (!cc_shell_set_active_panel_from_id (CC_SHELL (shell), id, NULL, &err))
310+ {
311+ /* TODO: show message to user */
312+@@ -838,11 +844,8 @@
313+ gint page_num,
314+ GnomeControlCenterPrivate *priv)
315+ {
316+- /* make sure the home button is shown on all pages except the overview page */
317+-
318+ if (page_num == OVERVIEW_PAGE || page_num == SEARCH_PAGE)
319+ {
320+- gtk_widget_hide (W (priv->builder, "home-button"));
321+ gtk_widget_show (W (priv->builder, "search-entry"));
322+ gtk_widget_hide (W (priv->builder, "lock-button"));
323+ gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window),
324+@@ -852,7 +855,6 @@
325+ }
326+ else
327+ {
328+- gtk_widget_show (W (priv->builder, "home-button"));
329+ gtk_widget_hide (W (priv->builder, "search-entry"));
330+ gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT);
331+ }
332+@@ -1141,6 +1143,7 @@
333+ {
334+ GError *err = NULL;
335+ GnomeControlCenterPrivate *priv;
336++ GtkWidget *widget;
337+
338+ priv = self->priv = CONTROL_CENTER_PRIVATE (self);
339+
340+@@ -1172,8 +1175,14 @@
341+ g_signal_connect (priv->notebook, "switch-page",
342+ G_CALLBACK (notebook_switch_page_cb), priv);
343+
344+- g_signal_connect (gtk_builder_get_object (priv->builder, "home-button"),
345+- "clicked", G_CALLBACK (home_button_clicked_cb), self);
346++ priv->nav_bar = cc_shell_nav_bar_new ();
347++ widget = W (priv->builder, "hbox1");
348++ gtk_box_pack_start (GTK_BOX (widget), priv->nav_bar, FALSE, FALSE, 0);
349++ gtk_box_reorder_child (GTK_BOX (widget), priv->nav_bar, 0);
350++ gtk_widget_show (priv->nav_bar);
351++
352++ g_signal_connect (priv->nav_bar,
353++ "home-clicked", G_CALLBACK (home_button_clicked_cb), self);
354+
355+ /* keep a list of custom widgets to unload on panel change */
356+ priv->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
357+
358+=== modified file 'shell/shell.ui'
359+--- a/shell/shell.ui 2012-02-16 14:27:27 +0000
360++++ b/shell/shell.ui 2012-02-16 15:47:55 +0000
361+@@ -34,25 +34,6 @@
362+ <object class="GtkHBox" id="hbox1">
363+ <property name="visible">True</property>
364+ <child>
365+- <object class="GtkButton" id="home-button">
366+- <property name="can_focus">True</property>
367+- <property name="receives_default">True</property>
368+- <property name="no_show_all">True</property>
369+- <property name="use_underline">True</property>
370+- <property name="use_action_appearance">False</property>
371+- <property name="image">image1</property>
372+- <child internal-child="accessible">
373+- <object class="AtkObject" id="home-button-atkobject">
374+- <property name="AtkObject::accessible-name" translatable="yes">All Settings</property>
375+- </object>
376+- </child>
377+- </object>
378+- <packing>
379+- <property name="expand">False</property>
380+- <property name="position">0</property>
381+- </packing>
382+- </child>
383+- <child>
384+ <object class="GtkAlignment" id="entry-alignment">
385+ <property name="visible">True</property>
386+ <property name="xalign">1</property>
387+@@ -82,7 +63,7 @@
388+ </child>
389+ </object>
390+ <packing>
391+- <property name="position">1</property>
392++ <property name="position">0</property>
393+ </packing>
394+ </child>
395+ </object>
396+
397
398=== modified file 'debian/patches/revert_git_drop_library.patch'
399--- debian/patches/revert_git_drop_library.patch 2012-02-15 22:17:24 +0000
400+++ debian/patches/revert_git_drop_library.patch 2012-02-16 16:45:20 +0000
401@@ -1,7 +1,7 @@
402 Index: gnome-control-center-3.3.5/configure.ac
403 ===================================================================
404---- gnome-control-center-3.3.5.orig/configure.ac 2012-02-15 23:16:10.407706858 +0100
405-+++ gnome-control-center-3.3.5/configure.ac 2012-02-15 23:16:15.887707123 +0100
406+--- gnome-control-center-3.3.5.orig/configure.ac 2012-02-16 16:50:05.000000000 +0100
407++++ gnome-control-center-3.3.5/configure.ac 2012-02-16 16:57:19.000000000 +0100
408 @@ -19,6 +19,14 @@
409 LT_PREREQ([2.2])
410 LT_INIT
411@@ -38,7 +38,7 @@
412 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c
413 ===================================================================
414 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
415-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c 2012-02-15 23:16:10.491706862 +0100
416++++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c 2012-02-16 16:57:19.000000000 +0100
417 @@ -0,0 +1,546 @@
418 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
419 + *
420@@ -589,7 +589,7 @@
421 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h
422 ===================================================================
423 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
424-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h 2012-02-15 23:16:10.495706863 +0100
425++++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h 2012-02-16 16:57:19.000000000 +0100
426 @@ -0,0 +1,75 @@
427 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
428 + *
429@@ -669,7 +669,7 @@
430 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c
431 ===================================================================
432 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
433-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c 2012-02-15 23:16:10.495706863 +0100
434++++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c 2012-02-16 16:57:19.000000000 +0100
435 @@ -0,0 +1,248 @@
436 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
437 + *
438@@ -922,7 +922,7 @@
439 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h
440 ===================================================================
441 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
442-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h 2012-02-15 23:16:10.495706863 +0100
443++++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h 2012-02-16 16:57:19.000000000 +0100
444 @@ -0,0 +1,81 @@
445 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
446 + *
447@@ -1008,7 +1008,7 @@
448 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c
449 ===================================================================
450 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
451-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c 2012-02-15 23:16:10.499706863 +0100
452++++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c 2012-02-16 16:57:19.000000000 +0100
453 @@ -0,0 +1,259 @@
454 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
455 + *
456@@ -1272,7 +1272,7 @@
457 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h
458 ===================================================================
459 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
460-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h 2012-02-15 23:16:10.499706863 +0100
461++++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h 2012-02-16 16:57:19.000000000 +0100
462 @@ -0,0 +1,112 @@
463 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
464 + *
465@@ -1389,7 +1389,7 @@
466 Index: gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in
467 ===================================================================
468 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
469-+++ gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in 2012-02-15 23:16:10.503706863 +0100
470++++ gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in 2012-02-16 16:57:19.000000000 +0100
471 @@ -0,0 +1,12 @@
472 +prefix=@prefix@
473 +exec_prefix=@exec_prefix@
474@@ -1406,7 +1406,7 @@
475 Index: gnome-control-center-3.3.5/libgnome-control-center/Makefile.am
476 ===================================================================
477 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
478-+++ gnome-control-center-3.3.5/libgnome-control-center/Makefile.am 2012-02-15 23:16:10.503706863 +0100
479++++ gnome-control-center-3.3.5/libgnome-control-center/Makefile.am 2012-02-16 16:57:19.000000000 +0100
480 @@ -0,0 +1,48 @@
481 +NULL =
482 +
483@@ -1459,7 +1459,7 @@
484 Index: gnome-control-center-3.3.5/Makefile.am
485 ===================================================================
486 --- gnome-control-center-3.3.5.orig/Makefile.am 2012-01-30 15:13:19.000000000 +0100
487-+++ gnome-control-center-3.3.5/Makefile.am 2012-02-15 23:16:10.503706863 +0100
488++++ gnome-control-center-3.3.5/Makefile.am 2012-02-16 16:57:19.000000000 +0100
489 @@ -1,7 +1,7 @@
490 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
491
492@@ -1473,7 +1473,7 @@
493 Index: gnome-control-center-3.3.5/panels/common/Makefile.am
494 ===================================================================
495 --- gnome-control-center-3.3.5.orig/panels/common/Makefile.am 2012-01-30 15:13:20.000000000 +0100
496-+++ gnome-control-center-3.3.5/panels/common/Makefile.am 2012-02-15 23:16:10.503706863 +0100
497++++ gnome-control-center-3.3.5/panels/common/Makefile.am 2012-02-16 16:57:19.000000000 +0100
498 @@ -23,9 +23,10 @@
499 cc-language-chooser.h
500
501@@ -1489,7 +1489,7 @@
502 Index: gnome-control-center-3.3.5/shell/gnome-control-center.h
503 ===================================================================
504 --- gnome-control-center-3.3.5.orig/shell/gnome-control-center.h 2012-01-30 15:13:21.000000000 +0100
505-+++ gnome-control-center-3.3.5/shell/gnome-control-center.h 2012-02-15 23:16:10.503706863 +0100
506++++ gnome-control-center-3.3.5/shell/gnome-control-center.h 2012-02-16 16:57:19.000000000 +0100
507 @@ -22,7 +22,7 @@
508 #define _GNOME_CONTROL_CENTER_H
509
510@@ -1501,8 +1501,8 @@
511
512 Index: gnome-control-center-3.3.5/shell/Makefile.am
513 ===================================================================
514---- gnome-control-center-3.3.5.orig/shell/Makefile.am 2012-01-30 15:13:20.000000000 +0100
515-+++ gnome-control-center-3.3.5/shell/Makefile.am 2012-02-15 23:16:10.507706863 +0100
516+--- gnome-control-center-3.3.5.orig/shell/Makefile.am 2012-02-16 16:50:05.000000000 +0100
517++++ gnome-control-center-3.3.5/shell/Makefile.am 2012-02-16 16:58:10.000000000 +0100
518 @@ -1,5 +1,6 @@
519 INCLUDES = \
520 -I$(top_srcdir) \
521@@ -1510,10 +1510,10 @@
522 $(SHELL_CFLAGS)
523
524 bin_PROGRAMS = gnome-control-center
525-@@ -27,15 +28,10 @@
526- cc-shell-item-view.h \
527- cc-shell-model.c \
528+@@ -29,15 +30,10 @@
529 cc-shell-model.h \
530+ cc-shell-nav-bar.c \
531+ cc-shell-nav-bar.h \
532 - cc-editable-entry.c \
533 - cc-editable-entry.h \
534 - cc-panel.c \
535@@ -1523,15 +1523,15 @@
536 $(MARSHAL_FILES)
537
538 gnome_control_center_LDADD = \
539-+ $(top_builddir)/libgnome-control-center/libgnome-control-center.la \
540++ $(top_builddir)/libgnome-control-center/libgnome-control-center.la \
541 $(SHELL_LIBS)
542
543 gnome_control_center_LDFLAGS = -export-dynamic
544 Index: gnome-control-center-3.3.5/shell/gnome-control-center.c
545 ===================================================================
546---- gnome-control-center-3.3.5.orig/shell/gnome-control-center.c 2012-02-15 23:16:09.875706833 +0100
547-+++ gnome-control-center-3.3.5/shell/gnome-control-center.c 2012-02-15 23:16:10.511706863 +0100
548-@@ -200,7 +200,23 @@
549+--- gnome-control-center-3.3.5.orig/shell/gnome-control-center.c 2012-02-16 16:50:05.000000000 +0100
550++++ gnome-control-center-3.3.5/shell/gnome-control-center.c 2012-02-16 16:57:19.000000000 +0100
551+@@ -202,7 +202,23 @@
552 }
553 else
554 {
555
556=== modified file 'debian/patches/series'
557--- debian/patches/series 2012-02-15 17:51:05 +0000
558+++ debian/patches/series 2012-02-16 16:45:20 +0000
559@@ -17,6 +17,7 @@
560 57_use_nonsymbolic_keyboard_icon.patch
561 58_ubuntu_icon_views_redesign.patch
562 59_install_gcm_components_on_demand.patch
563+60_ubuntu_nav_bar.patch
564 90_force_fallback.patch
565 91_configure_cheese.patch
566 96_sound_nua_panel.patch

Subscribers

People subscribed via source and target branches