gnome-control-center

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

  1. ubuntu-nav-bar
  2. Merge into ubuntu
Proposed by Aurélien Gâteau
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 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
=== modified file 'debian/changelog'
--- debian/changelog 2012-02-16 16:45:20 +0000
+++ debian/changelog 2012-02-16 16:45:20 +0000
@@ -2,6 +2,9 @@
22
3 * debian/patches/58_ubuntu_icon_views_redesign.patch3 * debian/patches/58_ubuntu_icon_views_redesign.patch
4 - Refresh for 3.5.54 - Refresh for 3.5.5
5 * debian/patches/60_ubuntu_nav_bar.patch:
6 - First implementation of breadcrumb buttons, without pointy arrows for
7 now (lp: #933482)
58
6 -- Aurélien Gâteau <aurelien.gateau@ubuntu.com> Thu, 16 Feb 2012 17:19:42 +01009 -- Aurélien Gâteau <aurelien.gateau@ubuntu.com> Thu, 16 Feb 2012 17:19:42 +0100
710
811
=== added file 'debian/patches/60_ubuntu_nav_bar.patch'
--- debian/patches/60_ubuntu_nav_bar.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/60_ubuntu_nav_bar.patch 2012-02-16 16:45:20 +0000
@@ -0,0 +1,378 @@
1=== modified file 'shell/Makefile.am'
2--- a/shell/Makefile.am 2012-02-16 14:27:27 +0000
3+++ b/shell/Makefile.am 2012-02-16 15:30:33 +0000
4@@ -27,6 +27,8 @@
5 cc-shell-item-view.h \
6 cc-shell-model.c \
7 cc-shell-model.h \
8+ cc-shell-nav-bar.c \
9+ cc-shell-nav-bar.h \
10 cc-editable-entry.c \
11 cc-editable-entry.h \
12 cc-panel.c \
13
14=== modified file 'shell/cc-shell-marshal.list'
15--- a/shell/cc-shell-marshal.list 2012-02-16 09:44:01 +0000
16+++ b/shell/cc-shell-marshal.list 2012-02-16 12:51:50 +0000
17@@ -1,1 +1,2 @@
18 VOID:STRING,STRING,STRING
19+VOID:VOID
20
21=== added file 'shell/cc-shell-nav-bar.c'
22--- a/shell/cc-shell-nav-bar.c 1970-01-01 00:00:00 +0000
23+++ b/shell/cc-shell-nav-bar.c 2012-02-16 13:44:14 +0000
24@@ -0,0 +1,150 @@
25+/*
26+ * Copyright 2012 Canonical
27+ *
28+ * The Control Center is free software; you can redistribute it and/or modify
29+ * it under the terms of the GNU General Public License as published by the
30+ * Free Software Foundation; either version 2 of the License, or (at your
31+ * option) any later version.
32+ *
33+ * The Control Center is distributed in the hope that it will be useful, but
34+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
35+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
36+ * for more details.
37+ *
38+ * You should have received a copy of the GNU General Public License along
39+ * with the Control Center; if not, write to the Free Software Foundation,
40+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
41+ *
42+ * Author: Aurélien Gâteau <aurelien.gateau@canonical.com>
43+ */
44+
45+#include "cc-shell-nav-bar.h"
46+#include "cc-shell-marshal.h"
47+
48+#include <glib/gi18n.h>
49+
50+G_DEFINE_TYPE (CcShellNavBar, cc_shell_nav_bar, GTK_TYPE_BUTTON_BOX)
51+
52+#define SHELL_NAV_BAR_PRIVATE(o) \
53+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_SHELL_NAV_BAR, CcShellNavBarPrivate))
54+
55+struct _CcShellNavBarPrivate
56+{
57+ GtkWidget *home_button;
58+ GtkWidget *detail_button;
59+};
60+
61+enum
62+{
63+ HOME_CLICKED,
64+ LAST_SIGNAL
65+};
66+
67+static guint signals[LAST_SIGNAL] = {0,};
68+
69+static void
70+cc_shell_nav_bar_get_property (GObject *object,
71+ guint property_id,
72+ GValue *value,
73+ GParamSpec *pspec)
74+{
75+ switch (property_id)
76+ {
77+ default:
78+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
79+ }
80+}
81+
82+static void
83+cc_shell_nav_bar_set_property (GObject *object,
84+ guint property_id,
85+ const GValue *value,
86+ GParamSpec *pspec)
87+{
88+ switch (property_id)
89+ {
90+ default:
91+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
92+ }
93+}
94+
95+static void
96+cc_shell_nav_bar_dispose (GObject *object)
97+{
98+ G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->dispose (object);
99+}
100+
101+static void
102+cc_shell_nav_bar_finalize (GObject *object)
103+{
104+ G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->finalize (object);
105+}
106+
107+static void
108+home_button_clicked_cb (GtkButton *button,
109+ CcShellNavBar *bar)
110+{
111+ g_signal_emit (bar, signals[HOME_CLICKED], 0);
112+}
113+
114+static void
115+cc_shell_nav_bar_class_init (CcShellNavBarClass *klass)
116+{
117+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
118+
119+ g_type_class_add_private (klass, sizeof (CcShellNavBarPrivate));
120+
121+ object_class->get_property = cc_shell_nav_bar_get_property;
122+ object_class->set_property = cc_shell_nav_bar_set_property;
123+ object_class->dispose = cc_shell_nav_bar_dispose;
124+ object_class->finalize = cc_shell_nav_bar_finalize;
125+
126+ signals[HOME_CLICKED] = g_signal_new ("home-clicked",
127+ CC_TYPE_SHELL_NAV_BAR,
128+ G_SIGNAL_RUN_FIRST,
129+ 0,
130+ NULL,
131+ NULL,
132+ cc_shell_marshal_VOID__VOID,
133+ G_TYPE_NONE,
134+ 0);
135+}
136+
137+static void
138+cc_shell_nav_bar_init (CcShellNavBar *self)
139+{
140+ self->priv = SHELL_NAV_BAR_PRIVATE (self);
141+ self->priv->home_button = gtk_button_new_with_mnemonic (_("_All Settings"));
142+ self->priv->detail_button = gtk_button_new();
143+
144+ gtk_box_pack_start (GTK_BOX(self), self->priv->home_button, FALSE, FALSE, 0);
145+ gtk_box_pack_start (GTK_BOX(self), self->priv->detail_button, FALSE, FALSE, 0);
146+
147+ gtk_widget_show (self->priv->home_button);
148+
149+ g_signal_connect (self->priv->home_button, "clicked",
150+ G_CALLBACK (home_button_clicked_cb), self);
151+
152+ GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET(self));
153+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
154+ gtk_style_context_add_class (context, "breadcrumbs");
155+}
156+
157+GtkWidget *
158+cc_shell_nav_bar_new (void)
159+{
160+ return g_object_new (CC_TYPE_SHELL_NAV_BAR, NULL);
161+}
162+
163+void
164+cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label)
165+{
166+ gtk_widget_show (bar->priv->detail_button);
167+ gtk_button_set_label (GTK_BUTTON (bar->priv->detail_button), label);
168+}
169+
170+void
171+cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar)
172+{
173+ gtk_widget_hide (bar->priv->detail_button);
174+}
175
176=== added file 'shell/cc-shell-nav-bar.h'
177--- a/shell/cc-shell-nav-bar.h 1970-01-01 00:00:00 +0000
178+++ b/shell/cc-shell-nav-bar.h 2012-02-16 12:51:54 +0000
179@@ -0,0 +1,76 @@
180+/*
181+ * Copyright 2012 Canonical
182+ *
183+ * The Control Center is free software; you can redistribute it and/or modify
184+ * it under the terms of the GNU General Public License as published by the
185+ * Free Software Foundation; either version 2 of the License, or (at your
186+ * option) any later version.
187+ *
188+ * The Control Center is distributed in the hope that it will be useful, but
189+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
190+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
191+ * for more details.
192+ *
193+ * You should have received a copy of the GNU General Public License along
194+ * with the Control Center; if not, write to the Free Software Foundation,
195+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
196+ *
197+ * Author: Aurélien Gâteau <aurelien.gateau@canonical.com>
198+ */
199+
200+#ifndef _CC_SHELL_NAV_BAR_H
201+#define _CC_SHELL_NAV_BAR_H
202+
203+#include <gtk/gtk.h>
204+
205+G_BEGIN_DECLS
206+
207+#define CC_TYPE_SHELL_NAV_BAR cc_shell_nav_bar_get_type()
208+
209+#define CC_SHELL_NAV_BAR(obj) \
210+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
211+ CC_TYPE_SHELL_NAV_BAR, CcShellNavBar))
212+
213+#define CC_SHELL_NAV_BAR_CLASS(klass) \
214+ (G_TYPE_CHECK_CLASS_CAST ((klass), \
215+ CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass))
216+
217+#define CC_IS_SHELL_NAV_BAR(obj) \
218+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
219+ CC_TYPE_SHELL_NAV_BAR))
220+
221+#define CC_IS_SHELL_NAV_BAR_CLASS(klass) \
222+ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
223+ CC_TYPE_SHELL_NAV_BAR))
224+
225+#define CC_SHELL_NAV_BAR_GET_CLASS(obj) \
226+ (G_TYPE_INSTANCE_GET_CLASS ((obj), \
227+ CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass))
228+
229+typedef struct _CcShellNavBar CcShellNavBar;
230+typedef struct _CcShellNavBarClass CcShellNavBarClass;
231+typedef struct _CcShellNavBarPrivate CcShellNavBarPrivate;
232+
233+struct _CcShellNavBar
234+{
235+ GtkButtonBox parent;
236+
237+ CcShellNavBarPrivate *priv;
238+};
239+
240+struct _CcShellNavBarClass
241+{
242+ GtkButtonBoxClass parent_class;
243+};
244+
245+GType cc_shell_nav_bar_get_type (void) G_GNUC_CONST;
246+
247+GtkWidget *cc_shell_nav_bar_new (void);
248+
249+void cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label);
250+
251+void cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar);
252+
253+G_END_DECLS
254+
255+#endif /* _CC_SHELL_NAV_BAR_H */
256
257=== modified file 'shell/gnome-control-center.c'
258--- a/shell/gnome-control-center.c 2012-02-16 15:39:10 +0000
259+++ b/shell/gnome-control-center.c 2012-02-16 15:39:20 +0000
260@@ -36,6 +36,7 @@
261 #include "shell-search-renderer.h"
262 #include "cc-shell-category-view.h"
263 #include "cc-shell-model.h"
264+#include "cc-shell-nav-bar.h"
265
266 G_DEFINE_TYPE (GnomeControlCenter, gnome_control_center, CC_TYPE_SHELL)
267
268@@ -71,6 +72,7 @@
269 GtkWidget *search_entry;
270 GtkWidget *lock_button;
271 GPtrArray *custom_widgets;
272+ GtkWidget *nav_bar;
273
274 GMenuTree *menu_tree;
275 GtkListStore *store;
276@@ -246,6 +248,8 @@
277
278 /* clear any custom widgets */
279 _shell_remove_all_custom_widgets (priv);
280+
281+ cc_shell_nav_bar_hide_detail_button (CC_SHELL_NAV_BAR (priv->nav_bar));
282 }
283
284 void
285@@ -263,6 +267,8 @@
286 {
287 GError *err = NULL;
288
289+ cc_shell_nav_bar_show_detail_button (CC_SHELL_NAV_BAR(shell->priv->nav_bar), name);
290+
291 if (!cc_shell_set_active_panel_from_id (CC_SHELL (shell), id, NULL, &err))
292 {
293 /* TODO: show message to user */
294@@ -838,11 +844,8 @@
295 gint page_num,
296 GnomeControlCenterPrivate *priv)
297 {
298- /* make sure the home button is shown on all pages except the overview page */
299-
300 if (page_num == OVERVIEW_PAGE || page_num == SEARCH_PAGE)
301 {
302- gtk_widget_hide (W (priv->builder, "home-button"));
303 gtk_widget_show (W (priv->builder, "search-entry"));
304 gtk_widget_hide (W (priv->builder, "lock-button"));
305 gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window),
306@@ -852,7 +855,6 @@
307 }
308 else
309 {
310- gtk_widget_show (W (priv->builder, "home-button"));
311 gtk_widget_hide (W (priv->builder, "search-entry"));
312 gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT);
313 }
314@@ -1141,6 +1143,7 @@
315 {
316 GError *err = NULL;
317 GnomeControlCenterPrivate *priv;
318+ GtkWidget *widget;
319
320 priv = self->priv = CONTROL_CENTER_PRIVATE (self);
321
322@@ -1172,8 +1175,14 @@
323 g_signal_connect (priv->notebook, "switch-page",
324 G_CALLBACK (notebook_switch_page_cb), priv);
325
326- g_signal_connect (gtk_builder_get_object (priv->builder, "home-button"),
327- "clicked", G_CALLBACK (home_button_clicked_cb), self);
328+ priv->nav_bar = cc_shell_nav_bar_new ();
329+ widget = W (priv->builder, "hbox1");
330+ gtk_box_pack_start (GTK_BOX (widget), priv->nav_bar, FALSE, FALSE, 0);
331+ gtk_box_reorder_child (GTK_BOX (widget), priv->nav_bar, 0);
332+ gtk_widget_show (priv->nav_bar);
333+
334+ g_signal_connect (priv->nav_bar,
335+ "home-clicked", G_CALLBACK (home_button_clicked_cb), self);
336
337 /* keep a list of custom widgets to unload on panel change */
338 priv->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
339
340=== modified file 'shell/shell.ui'
341--- a/shell/shell.ui 2012-02-16 14:27:27 +0000
342+++ b/shell/shell.ui 2012-02-16 15:47:55 +0000
343@@ -34,25 +34,6 @@
344 <object class="GtkHBox" id="hbox1">
345 <property name="visible">True</property>
346 <child>
347- <object class="GtkButton" id="home-button">
348- <property name="can_focus">True</property>
349- <property name="receives_default">True</property>
350- <property name="no_show_all">True</property>
351- <property name="use_underline">True</property>
352- <property name="use_action_appearance">False</property>
353- <property name="image">image1</property>
354- <child internal-child="accessible">
355- <object class="AtkObject" id="home-button-atkobject">
356- <property name="AtkObject::accessible-name" translatable="yes">All Settings</property>
357- </object>
358- </child>
359- </object>
360- <packing>
361- <property name="expand">False</property>
362- <property name="position">0</property>
363- </packing>
364- </child>
365- <child>
366 <object class="GtkAlignment" id="entry-alignment">
367 <property name="visible">True</property>
368 <property name="xalign">1</property>
369@@ -82,7 +63,7 @@
370 </child>
371 </object>
372 <packing>
373- <property name="position">1</property>
374+ <property name="position">0</property>
375 </packing>
376 </child>
377 </object>
378
0379
=== modified file 'debian/patches/revert_git_drop_library.patch'
--- debian/patches/revert_git_drop_library.patch 2012-02-15 22:17:24 +0000
+++ debian/patches/revert_git_drop_library.patch 2012-02-16 16:45:20 +0000
@@ -1,7 +1,7 @@
1Index: gnome-control-center-3.3.5/configure.ac1Index: gnome-control-center-3.3.5/configure.ac
2===================================================================2===================================================================
3--- gnome-control-center-3.3.5.orig/configure.ac 2012-02-15 23:16:10.407706858 +01003--- gnome-control-center-3.3.5.orig/configure.ac 2012-02-16 16:50:05.000000000 +0100
4+++ gnome-control-center-3.3.5/configure.ac 2012-02-15 23:16:15.887707123 +01004+++ gnome-control-center-3.3.5/configure.ac 2012-02-16 16:57:19.000000000 +0100
5@@ -19,6 +19,14 @@5@@ -19,6 +19,14 @@
6 LT_PREREQ([2.2])6 LT_PREREQ([2.2])
7 LT_INIT7 LT_INIT
@@ -38,7 +38,7 @@
38Index: gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c38Index: gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c
39===================================================================39===================================================================
40--- /dev/null 1970-01-01 00:00:00.000000000 +000040--- /dev/null 1970-01-01 00:00:00.000000000 +0000
41+++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c 2012-02-15 23:16:10.491706862 +010041+++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c 2012-02-16 16:57:19.000000000 +0100
42@@ -0,0 +1,546 @@42@@ -0,0 +1,546 @@
43+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-43+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
44+ *44+ *
@@ -589,7 +589,7 @@
589Index: gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h589Index: gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h
590===================================================================590===================================================================
591--- /dev/null 1970-01-01 00:00:00.000000000 +0000591--- /dev/null 1970-01-01 00:00:00.000000000 +0000
592+++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h 2012-02-15 23:16:10.495706863 +0100592+++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h 2012-02-16 16:57:19.000000000 +0100
593@@ -0,0 +1,75 @@593@@ -0,0 +1,75 @@
594+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-594+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
595+ *595+ *
@@ -669,7 +669,7 @@
669Index: gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c669Index: gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c
670===================================================================670===================================================================
671--- /dev/null 1970-01-01 00:00:00.000000000 +0000671--- /dev/null 1970-01-01 00:00:00.000000000 +0000
672+++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c 2012-02-15 23:16:10.495706863 +0100672+++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c 2012-02-16 16:57:19.000000000 +0100
673@@ -0,0 +1,248 @@673@@ -0,0 +1,248 @@
674+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-674+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
675+ *675+ *
@@ -922,7 +922,7 @@
922Index: gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h922Index: gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h
923===================================================================923===================================================================
924--- /dev/null 1970-01-01 00:00:00.000000000 +0000924--- /dev/null 1970-01-01 00:00:00.000000000 +0000
925+++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h 2012-02-15 23:16:10.495706863 +0100925+++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h 2012-02-16 16:57:19.000000000 +0100
926@@ -0,0 +1,81 @@926@@ -0,0 +1,81 @@
927+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-927+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
928+ *928+ *
@@ -1008,7 +1008,7 @@
1008Index: gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c1008Index: gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c
1009===================================================================1009===================================================================
1010--- /dev/null 1970-01-01 00:00:00.000000000 +00001010--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1011+++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c 2012-02-15 23:16:10.499706863 +01001011+++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c 2012-02-16 16:57:19.000000000 +0100
1012@@ -0,0 +1,259 @@1012@@ -0,0 +1,259 @@
1013+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-1013+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
1014+ *1014+ *
@@ -1272,7 +1272,7 @@
1272Index: gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h1272Index: gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h
1273===================================================================1273===================================================================
1274--- /dev/null 1970-01-01 00:00:00.000000000 +00001274--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1275+++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h 2012-02-15 23:16:10.499706863 +01001275+++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h 2012-02-16 16:57:19.000000000 +0100
1276@@ -0,0 +1,112 @@1276@@ -0,0 +1,112 @@
1277+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-1277+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
1278+ *1278+ *
@@ -1389,7 +1389,7 @@
1389Index: gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in1389Index: gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in
1390===================================================================1390===================================================================
1391--- /dev/null 1970-01-01 00:00:00.000000000 +00001391--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1392+++ gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in 2012-02-15 23:16:10.503706863 +01001392+++ gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in 2012-02-16 16:57:19.000000000 +0100
1393@@ -0,0 +1,12 @@1393@@ -0,0 +1,12 @@
1394+prefix=@prefix@1394+prefix=@prefix@
1395+exec_prefix=@exec_prefix@1395+exec_prefix=@exec_prefix@
@@ -1406,7 +1406,7 @@
1406Index: gnome-control-center-3.3.5/libgnome-control-center/Makefile.am1406Index: gnome-control-center-3.3.5/libgnome-control-center/Makefile.am
1407===================================================================1407===================================================================
1408--- /dev/null 1970-01-01 00:00:00.000000000 +00001408--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1409+++ gnome-control-center-3.3.5/libgnome-control-center/Makefile.am 2012-02-15 23:16:10.503706863 +01001409+++ gnome-control-center-3.3.5/libgnome-control-center/Makefile.am 2012-02-16 16:57:19.000000000 +0100
1410@@ -0,0 +1,48 @@1410@@ -0,0 +1,48 @@
1411+NULL =1411+NULL =
1412+1412+
@@ -1459,7 +1459,7 @@
1459Index: gnome-control-center-3.3.5/Makefile.am1459Index: gnome-control-center-3.3.5/Makefile.am
1460===================================================================1460===================================================================
1461--- gnome-control-center-3.3.5.orig/Makefile.am 2012-01-30 15:13:19.000000000 +01001461--- gnome-control-center-3.3.5.orig/Makefile.am 2012-01-30 15:13:19.000000000 +0100
1462+++ gnome-control-center-3.3.5/Makefile.am 2012-02-15 23:16:10.503706863 +01001462+++ gnome-control-center-3.3.5/Makefile.am 2012-02-16 16:57:19.000000000 +0100
1463@@ -1,7 +1,7 @@1463@@ -1,7 +1,7 @@
1464 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}1464 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
1465 1465
@@ -1473,7 +1473,7 @@
1473Index: gnome-control-center-3.3.5/panels/common/Makefile.am1473Index: gnome-control-center-3.3.5/panels/common/Makefile.am
1474===================================================================1474===================================================================
1475--- gnome-control-center-3.3.5.orig/panels/common/Makefile.am 2012-01-30 15:13:20.000000000 +01001475--- gnome-control-center-3.3.5.orig/panels/common/Makefile.am 2012-01-30 15:13:20.000000000 +0100
1476+++ gnome-control-center-3.3.5/panels/common/Makefile.am 2012-02-15 23:16:10.503706863 +01001476+++ gnome-control-center-3.3.5/panels/common/Makefile.am 2012-02-16 16:57:19.000000000 +0100
1477@@ -23,9 +23,10 @@1477@@ -23,9 +23,10 @@
1478 cc-language-chooser.h1478 cc-language-chooser.h
1479 1479
@@ -1489,7 +1489,7 @@
1489Index: gnome-control-center-3.3.5/shell/gnome-control-center.h1489Index: gnome-control-center-3.3.5/shell/gnome-control-center.h
1490===================================================================1490===================================================================
1491--- gnome-control-center-3.3.5.orig/shell/gnome-control-center.h 2012-01-30 15:13:21.000000000 +01001491--- gnome-control-center-3.3.5.orig/shell/gnome-control-center.h 2012-01-30 15:13:21.000000000 +0100
1492+++ gnome-control-center-3.3.5/shell/gnome-control-center.h 2012-02-15 23:16:10.503706863 +01001492+++ gnome-control-center-3.3.5/shell/gnome-control-center.h 2012-02-16 16:57:19.000000000 +0100
1493@@ -22,7 +22,7 @@1493@@ -22,7 +22,7 @@
1494 #define _GNOME_CONTROL_CENTER_H1494 #define _GNOME_CONTROL_CENTER_H
1495 1495
@@ -1501,8 +1501,8 @@
1501 1501
1502Index: gnome-control-center-3.3.5/shell/Makefile.am1502Index: gnome-control-center-3.3.5/shell/Makefile.am
1503===================================================================1503===================================================================
1504--- gnome-control-center-3.3.5.orig/shell/Makefile.am 2012-01-30 15:13:20.000000000 +01001504--- gnome-control-center-3.3.5.orig/shell/Makefile.am 2012-02-16 16:50:05.000000000 +0100
1505+++ gnome-control-center-3.3.5/shell/Makefile.am 2012-02-15 23:16:10.507706863 +01001505+++ gnome-control-center-3.3.5/shell/Makefile.am 2012-02-16 16:58:10.000000000 +0100
1506@@ -1,5 +1,6 @@1506@@ -1,5 +1,6 @@
1507 INCLUDES = \1507 INCLUDES = \
1508 -I$(top_srcdir) \1508 -I$(top_srcdir) \
@@ -1510,10 +1510,10 @@
1510 $(SHELL_CFLAGS)1510 $(SHELL_CFLAGS)
1511 1511
1512 bin_PROGRAMS = gnome-control-center1512 bin_PROGRAMS = gnome-control-center
1513@@ -27,15 +28,10 @@1513@@ -29,15 +30,10 @@
1514 cc-shell-item-view.h \
1515 cc-shell-model.c \
1516 cc-shell-model.h \1514 cc-shell-model.h \
1515 cc-shell-nav-bar.c \
1516 cc-shell-nav-bar.h \
1517- cc-editable-entry.c \1517- cc-editable-entry.c \
1518- cc-editable-entry.h \1518- cc-editable-entry.h \
1519- cc-panel.c \1519- cc-panel.c \
@@ -1523,15 +1523,15 @@
1523 $(MARSHAL_FILES)1523 $(MARSHAL_FILES)
1524 1524
1525 gnome_control_center_LDADD = \1525 gnome_control_center_LDADD = \
1526+ $(top_builddir)/libgnome-control-center/libgnome-control-center.la \1526+ $(top_builddir)/libgnome-control-center/libgnome-control-center.la \
1527 $(SHELL_LIBS)1527 $(SHELL_LIBS)
1528 1528
1529 gnome_control_center_LDFLAGS = -export-dynamic1529 gnome_control_center_LDFLAGS = -export-dynamic
1530Index: gnome-control-center-3.3.5/shell/gnome-control-center.c1530Index: gnome-control-center-3.3.5/shell/gnome-control-center.c
1531===================================================================1531===================================================================
1532--- gnome-control-center-3.3.5.orig/shell/gnome-control-center.c 2012-02-15 23:16:09.875706833 +01001532--- gnome-control-center-3.3.5.orig/shell/gnome-control-center.c 2012-02-16 16:50:05.000000000 +0100
1533+++ gnome-control-center-3.3.5/shell/gnome-control-center.c 2012-02-15 23:16:10.511706863 +01001533+++ gnome-control-center-3.3.5/shell/gnome-control-center.c 2012-02-16 16:57:19.000000000 +0100
1534@@ -200,7 +200,23 @@1534@@ -202,7 +202,23 @@
1535 }1535 }
1536 else1536 else
1537 {1537 {
15381538
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-02-15 17:51:05 +0000
+++ debian/patches/series 2012-02-16 16:45:20 +0000
@@ -17,6 +17,7 @@
1757_use_nonsymbolic_keyboard_icon.patch1757_use_nonsymbolic_keyboard_icon.patch
1858_ubuntu_icon_views_redesign.patch1858_ubuntu_icon_views_redesign.patch
1959_install_gcm_components_on_demand.patch1959_install_gcm_components_on_demand.patch
2060_ubuntu_nav_bar.patch
2090_force_fallback.patch2190_force_fallback.patch
2191_configure_cheese.patch2291_configure_cheese.patch
2296_sound_nua_panel.patch2396_sound_nua_panel.patch

Subscribers

People subscribed via source and target branches