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

[Aurélien Gâteau]

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.

=== 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 @@
 
   * debian/patches/58_ubuntu_icon_views_redesign.patch
     - Refresh for 3.5.5
+  * debian/patches/60_ubuntu_nav_bar.patch:
+    - First implementation of breadcrumb buttons, without pointy arrows for
+  	  now (lp: #933482)
 
  -- Aurélien Gâteau <[e-mail]>  Thu, 16 Feb 2012 17:19:42 +0100
 

=== 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 @@
+=== modified file 'shell/Makefile.am'
+--- a/shell/Makefile.am	2012-02-16 14:27:27 +0000
++++ b/shell/Makefile.am	2012-02-16 15:30:33 +0000
+@@ -27,6 +27,8 @@
+ 	cc-shell-item-view.h			\
+ 	cc-shell-model.c			\
+ 	cc-shell-model.h			\
++	cc-shell-nav-bar.c			\
++	cc-shell-nav-bar.h			\
+ 	cc-editable-entry.c			\
+ 	cc-editable-entry.h			\
+ 	cc-panel.c				\
+
+=== modified file 'shell/cc-shell-marshal.list'
+--- a/shell/cc-shell-marshal.list	2012-02-16 09:44:01 +0000
++++ b/shell/cc-shell-marshal.list	2012-02-16 12:51:50 +0000
+@@ -1,1 +1,2 @@
+ VOID:STRING,STRING,STRING
++VOID:VOID
+
+=== added file 'shell/cc-shell-nav-bar.c'
+--- a/shell/cc-shell-nav-bar.c	1970-01-01 00:00:00 +0000
++++ b/shell/cc-shell-nav-bar.c	2012-02-16 13:44:14 +0000
+@@ -0,0 +1,150 @@
++/*
++ * Copyright 2012 Canonical
++ *
++ * The Control Center is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * The Control Center is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with the Control Center; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ *
++ * Author: Aurélien Gâteau <[e-mail]>
++ */
++
++#include "cc-shell-nav-bar.h"
++#include "cc-shell-marshal.h"
++
++#include <glib/gi18n.h>
++
++G_DEFINE_TYPE (CcShellNavBar, cc_shell_nav_bar, GTK_TYPE_BUTTON_BOX)
++
++#define SHELL_NAV_BAR_PRIVATE(o) \
++  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_SHELL_NAV_BAR, CcShellNavBarPrivate))
++
++struct _CcShellNavBarPrivate
++{
++  GtkWidget *home_button;
++  GtkWidget *detail_button;
++};
++
++enum
++{
++  HOME_CLICKED,
++  LAST_SIGNAL
++};
++
++static guint signals[LAST_SIGNAL] = {0,};
++
++static void
++cc_shell_nav_bar_get_property (GObject    *object,
++                                 guint       property_id,
++                                 GValue     *value,
++                                 GParamSpec *pspec)
++{
++  switch (property_id)
++    {
++    default:
++      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++    }
++}
++
++static void
++cc_shell_nav_bar_set_property (GObject      *object,
++                                 guint         property_id,
++                                 const GValue *value,
++                                 GParamSpec   *pspec)
++{
++  switch (property_id)
++    {
++    default:
++      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++    }
++}
++
++static void
++cc_shell_nav_bar_dispose (GObject *object)
++{
++  G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->dispose (object);
++}
++
++static void
++cc_shell_nav_bar_finalize (GObject *object)
++{
++  G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->finalize (object);
++}
++
++static void
++home_button_clicked_cb (GtkButton *button,
++                        CcShellNavBar *bar)
++{
++  g_signal_emit (bar, signals[HOME_CLICKED], 0);
++}
++
++static void
++cc_shell_nav_bar_class_init (CcShellNavBarClass *klass)
++{
++  GObjectClass *object_class = G_OBJECT_CLASS (klass);
++
++  g_type_class_add_private (klass, sizeof (CcShellNavBarPrivate));
++
++  object_class->get_property = cc_shell_nav_bar_get_property;
++  object_class->set_property = cc_shell_nav_bar_set_property;
++  object_class->dispose = cc_shell_nav_bar_dispose;
++  object_class->finalize = cc_shell_nav_bar_finalize;
++
++  signals[HOME_CLICKED] = g_signal_new ("home-clicked",
++                                        CC_TYPE_SHELL_NAV_BAR,
++                                        G_SIGNAL_RUN_FIRST,
++                                        0,
++                                        NULL,
++                                        NULL,
++                                        cc_shell_marshal_VOID__VOID,
++                                        G_TYPE_NONE,
++                                        0);
++}
++
++static void
++cc_shell_nav_bar_init (CcShellNavBar *self)
++{
++  self->priv = SHELL_NAV_BAR_PRIVATE (self);
++  self->priv->home_button = gtk_button_new_with_mnemonic (_("_All Settings"));
++  self->priv->detail_button = gtk_button_new();
++
++  gtk_box_pack_start (GTK_BOX(self), self->priv->home_button, FALSE, FALSE, 0);
++  gtk_box_pack_start (GTK_BOX(self), self->priv->detail_button, FALSE, FALSE, 0);
++
++  gtk_widget_show (self->priv->home_button);
++
++  g_signal_connect (self->priv->home_button, "clicked",
++                    G_CALLBACK (home_button_clicked_cb), self);
++
++  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET(self));
++  gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
++  gtk_style_context_add_class (context, "breadcrumbs");
++}
++
++GtkWidget *
++cc_shell_nav_bar_new (void)
++{
++  return g_object_new (CC_TYPE_SHELL_NAV_BAR, NULL);
++}
++
++void
++cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label)
++{
++  gtk_widget_show (bar->priv->detail_button);
++  gtk_button_set_label (GTK_BUTTON (bar->priv->detail_button), label);
++}
++
++void
++cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar)
++{
++  gtk_widget_hide (bar->priv->detail_button);
++}
+
+=== added file 'shell/cc-shell-nav-bar.h'
+--- a/shell/cc-shell-nav-bar.h	1970-01-01 00:00:00 +0000
++++ b/shell/cc-shell-nav-bar.h	2012-02-16 12:51:54 +0000
+@@ -0,0 +1,76 @@
++/*
++ * Copyright 2012 Canonical
++ *
++ * The Control Center is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * The Control Center is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with the Control Center; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ *
++ * Author: Aurélien Gâteau <[e-mail]>
++ */
++
++#ifndef _CC_SHELL_NAV_BAR_H
++#define _CC_SHELL_NAV_BAR_H
++
++#include <gtk/gtk.h>
++
++G_BEGIN_DECLS
++
++#define CC_TYPE_SHELL_NAV_BAR cc_shell_nav_bar_get_type()
++
++#define CC_SHELL_NAV_BAR(obj) \
++  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
++  CC_TYPE_SHELL_NAV_BAR, CcShellNavBar))
++
++#define CC_SHELL_NAV_BAR_CLASS(klass) \
++  (G_TYPE_CHECK_CLASS_CAST ((klass), \
++  CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass))
++
++#define CC_IS_SHELL_NAV_BAR(obj) \
++  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
++  CC_TYPE_SHELL_NAV_BAR))
++
++#define CC_IS_SHELL_NAV_BAR_CLASS(klass) \
++  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
++  CC_TYPE_SHELL_NAV_BAR))
++
++#define CC_SHELL_NAV_BAR_GET_CLASS(obj) \
++  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
++  CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass))
++
++typedef struct _CcShellNavBar CcShellNavBar;
++typedef struct _CcShellNavBarClass CcShellNavBarClass;
++typedef struct _CcShellNavBarPrivate CcShellNavBarPrivate;
++
++struct _CcShellNavBar
++{
++  GtkButtonBox parent;
++
++  CcShellNavBarPrivate *priv;
++};
++
++struct _CcShellNavBarClass
++{
++  GtkButtonBoxClass parent_class;
++};
++
++GType cc_shell_nav_bar_get_type (void) G_GNUC_CONST;
++
++GtkWidget *cc_shell_nav_bar_new (void);
++
++void cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label);
++
++void cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar);
++
++G_END_DECLS
++
++#endif /* _CC_SHELL_NAV_BAR_H */
+
+=== modified file 'shell/gnome-control-center.c'
+--- a/shell/gnome-control-center.c	2012-02-16 15:39:10 +0000
++++ b/shell/gnome-control-center.c	2012-02-16 15:39:20 +0000
+@@ -36,6 +36,7 @@
+ #include "shell-search-renderer.h"
+ #include "cc-shell-category-view.h"
+ #include "cc-shell-model.h"
++#include "cc-shell-nav-bar.h"
+ 
+ G_DEFINE_TYPE (GnomeControlCenter, gnome_control_center, CC_TYPE_SHELL)
+ 
+@@ -71,6 +72,7 @@
+   GtkWidget  *search_entry;
+   GtkWidget  *lock_button;
+   GPtrArray  *custom_widgets;
++  GtkWidget  *nav_bar;
+ 
+   GMenuTree  *menu_tree;
+   GtkListStore *store;
+@@ -246,6 +248,8 @@
+ 
+   /* clear any custom widgets */
+   _shell_remove_all_custom_widgets (priv);
++
++  cc_shell_nav_bar_hide_detail_button (CC_SHELL_NAV_BAR (priv->nav_bar));
+ }
+ 
+ void
+@@ -263,6 +267,8 @@
+ {
+   GError *err = NULL;
+ 
++  cc_shell_nav_bar_show_detail_button (CC_SHELL_NAV_BAR(shell->priv->nav_bar), name);
++
+   if (!cc_shell_set_active_panel_from_id (CC_SHELL (shell), id, NULL, &err))
+     {
+       /* TODO: show message to user */
+@@ -838,11 +844,8 @@
+                          gint                       page_num,
+                          GnomeControlCenterPrivate *priv)
+ {
+-  /* make sure the home button is shown on all pages except the overview page */
+-
+   if (page_num == OVERVIEW_PAGE || page_num == SEARCH_PAGE)
+     {
+-      gtk_widget_hide (W (priv->builder, "home-button"));
+       gtk_widget_show (W (priv->builder, "search-entry"));
+       gtk_widget_hide (W (priv->builder, "lock-button"));
+       gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window),
+@@ -852,7 +855,6 @@
+     }
+   else
+     {
+-      gtk_widget_show (W (priv->builder, "home-button"));
+       gtk_widget_hide (W (priv->builder, "search-entry"));
+       gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT);
+     }
+@@ -1141,6 +1143,7 @@
+ {
+   GError *err = NULL;
+   GnomeControlCenterPrivate *priv;
++  GtkWidget *widget;
+ 
+   priv = self->priv = CONTROL_CENTER_PRIVATE (self);
+ 
+@@ -1172,8 +1175,14 @@
+   g_signal_connect (priv->notebook, "switch-page",
+                     G_CALLBACK (notebook_switch_page_cb), priv);
+ 
+-  g_signal_connect (gtk_builder_get_object (priv->builder, "home-button"),
+-                    "clicked", G_CALLBACK (home_button_clicked_cb), self);
++  priv->nav_bar = cc_shell_nav_bar_new ();
++  widget = W (priv->builder, "hbox1");
++  gtk_box_pack_start (GTK_BOX (widget), priv->nav_bar, FALSE, FALSE, 0);
++  gtk_box_reorder_child (GTK_BOX (widget), priv->nav_bar, 0);
++  gtk_widget_show (priv->nav_bar);
++
++  g_signal_connect (priv->nav_bar,
++                    "home-clicked", G_CALLBACK (home_button_clicked_cb), self);
+ 
+   /* keep a list of custom widgets to unload on panel change */
+   priv->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
+
+=== modified file 'shell/shell.ui'
+--- a/shell/shell.ui	2012-02-16 14:27:27 +0000
++++ b/shell/shell.ui	2012-02-16 15:47:55 +0000
+@@ -34,25 +34,6 @@
+                       <object class="GtkHBox" id="hbox1">
+                         <property name="visible">True</property>
+                         <child>
+-                          <object class="GtkButton" id="home-button">
+-                            <property name="can_focus">True</property>
+-                            <property name="receives_default">True</property>
+-                            <property name="no_show_all">True</property>
+-                            <property name="use_underline">True</property>
+-                            <property name="use_action_appearance">False</property>
+-                            <property name="image">image1</property>
+-                            <child internal-child="accessible">
+-                              <object class="AtkObject" id="home-button-atkobject">
+-                                <property name="AtkObject::accessible-name" translatable="yes">All Settings</property>
+-                              </object>
+-                            </child>
+-                          </object>
+-                          <packing>
+-                            <property name="expand">False</property>
+-                            <property name="position">0</property>
+-                          </packing>
+-                        </child>
+-                        <child>
+                           <object class="GtkAlignment" id="entry-alignment">
+                             <property name="visible">True</property>
+                             <property name="xalign">1</property>
+@@ -82,7 +63,7 @@
+                             </child>
+                           </object>
+                           <packing>
+-                            <property name="position">1</property>
++                            <property name="position">0</property>
+                           </packing>
+                         </child>
+                       </object>
+

=== 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 @@
 Index: gnome-control-center-3.3.5/configure.ac
 ===================================================================
---- gnome-control-center-3.3.5.orig/configure.ac	2012-02-15 23:16:10.407706858 +0100
-+++ gnome-control-center-3.3.5/configure.ac	2012-02-15 23:16:15.887707123 +0100
+--- gnome-control-center-3.3.5.orig/configure.ac	2012-02-16 16:50:05.000000000 +0100
++++ gnome-control-center-3.3.5/configure.ac	2012-02-16 16:57:19.000000000 +0100
 @@ -19,6 +19,14 @@
  LT_PREREQ([2.2])
  LT_INIT
@@ -38,7 +38,7 @@
 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c	2012-02-15 23:16:10.491706862 +0100
++++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.c	2012-02-16 16:57:19.000000000 +0100
 @@ -0,0 +1,546 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -589,7 +589,7 @@
 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h	2012-02-15 23:16:10.495706863 +0100
++++ gnome-control-center-3.3.5/libgnome-control-center/cc-editable-entry.h	2012-02-16 16:57:19.000000000 +0100
 @@ -0,0 +1,75 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -669,7 +669,7 @@
 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c	2012-02-15 23:16:10.495706863 +0100
++++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.c	2012-02-16 16:57:19.000000000 +0100
 @@ -0,0 +1,248 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -922,7 +922,7 @@
 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h	2012-02-15 23:16:10.495706863 +0100
++++ gnome-control-center-3.3.5/libgnome-control-center/cc-panel.h	2012-02-16 16:57:19.000000000 +0100
 @@ -0,0 +1,81 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -1008,7 +1008,7 @@
 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c	2012-02-15 23:16:10.499706863 +0100
++++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.c	2012-02-16 16:57:19.000000000 +0100
 @@ -0,0 +1,259 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -1272,7 +1272,7 @@
 Index: gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h	2012-02-15 23:16:10.499706863 +0100
++++ gnome-control-center-3.3.5/libgnome-control-center/cc-shell.h	2012-02-16 16:57:19.000000000 +0100
 @@ -0,0 +1,112 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -1389,7 +1389,7 @@
 Index: gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in	2012-02-15 23:16:10.503706863 +0100
++++ gnome-control-center-3.3.5/libgnome-control-center/libgnome-control-center.pc.in	2012-02-16 16:57:19.000000000 +0100
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -1406,7 +1406,7 @@
 Index: gnome-control-center-3.3.5/libgnome-control-center/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.3.5/libgnome-control-center/Makefile.am	2012-02-15 23:16:10.503706863 +0100
++++ gnome-control-center-3.3.5/libgnome-control-center/Makefile.am	2012-02-16 16:57:19.000000000 +0100
 @@ -0,0 +1,48 @@
 +NULL =
 +
@@ -1459,7 +1459,7 @@
 Index: gnome-control-center-3.3.5/Makefile.am
 ===================================================================
 --- gnome-control-center-3.3.5.orig/Makefile.am	2012-01-30 15:13:19.000000000 +0100
-+++ gnome-control-center-3.3.5/Makefile.am	2012-02-15 23:16:10.503706863 +0100
++++ gnome-control-center-3.3.5/Makefile.am	2012-02-16 16:57:19.000000000 +0100
 @@ -1,7 +1,7 @@
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
@@ -1473,7 +1473,7 @@
 Index: gnome-control-center-3.3.5/panels/common/Makefile.am
 ===================================================================
 --- gnome-control-center-3.3.5.orig/panels/common/Makefile.am	2012-01-30 15:13:20.000000000 +0100
-+++ gnome-control-center-3.3.5/panels/common/Makefile.am	2012-02-15 23:16:10.503706863 +0100
++++ gnome-control-center-3.3.5/panels/common/Makefile.am	2012-02-16 16:57:19.000000000 +0100
 @@ -23,9 +23,10 @@
  	cc-language-chooser.h
  
@@ -1489,7 +1489,7 @@
 Index: gnome-control-center-3.3.5/shell/gnome-control-center.h
 ===================================================================
 --- gnome-control-center-3.3.5.orig/shell/gnome-control-center.h	2012-01-30 15:13:21.000000000 +0100
-+++ gnome-control-center-3.3.5/shell/gnome-control-center.h	2012-02-15 23:16:10.503706863 +0100
++++ gnome-control-center-3.3.5/shell/gnome-control-center.h	2012-02-16 16:57:19.000000000 +0100
 @@ -22,7 +22,7 @@
  #define _GNOME_CONTROL_CENTER_H
  
@@ -1501,8 +1501,8 @@
  
 Index: gnome-control-center-3.3.5/shell/Makefile.am
 ===================================================================
---- gnome-control-center-3.3.5.orig/shell/Makefile.am	2012-01-30 15:13:20.000000000 +0100
-+++ gnome-control-center-3.3.5/shell/Makefile.am	2012-02-15 23:16:10.507706863 +0100
+--- gnome-control-center-3.3.5.orig/shell/Makefile.am	2012-02-16 16:50:05.000000000 +0100
++++ gnome-control-center-3.3.5/shell/Makefile.am	2012-02-16 16:58:10.000000000 +0100
 @@ -1,5 +1,6 @@
  INCLUDES =					\
  	-I$(top_srcdir)				\
@@ -1510,10 +1510,10 @@
  	$(SHELL_CFLAGS)
  
  bin_PROGRAMS = gnome-control-center
-@@ -27,15 +28,10 @@
- 	cc-shell-item-view.h			\
- 	cc-shell-model.c			\
+@@ -29,15 +30,10 @@
  	cc-shell-model.h			\
+ 	cc-shell-nav-bar.c			\
+ 	cc-shell-nav-bar.h			\
 -	cc-editable-entry.c			\
 -	cc-editable-entry.h			\
 -	cc-panel.c				\
@@ -1523,15 +1523,15 @@
  	$(MARSHAL_FILES)
  
  gnome_control_center_LDADD =			\
-+    $(top_builddir)/libgnome-control-center/libgnome-control-center.la \
++	$(top_builddir)/libgnome-control-center/libgnome-control-center.la \
  	$(SHELL_LIBS)
  
  gnome_control_center_LDFLAGS = -export-dynamic
 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-15 23:16:09.875706833 +0100
-+++ gnome-control-center-3.3.5/shell/gnome-control-center.c	2012-02-15 23:16:10.511706863 +0100
-@@ -200,7 +200,23 @@
+--- gnome-control-center-3.3.5.orig/shell/gnome-control-center.c	2012-02-16 16:50:05.000000000 +0100
++++ gnome-control-center-3.3.5/shell/gnome-control-center.c	2012-02-16 16:57:19.000000000 +0100
+@@ -202,7 +202,23 @@
          }
        else
          {

=== 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 @@
 57_use_nonsymbolic_keyboard_icon.patch
 58_ubuntu_icon_views_redesign.patch
 59_install_gcm_components_on_demand.patch
+60_ubuntu_nav_bar.patch
 90_force_fallback.patch
 91_configure_cheese.patch
 96_sound_nua_panel.patch