diff -crB nautilus-3.2.1/src/nautilus-navigation-action.

c nautilus-
mod2.clean/src/nautilus-navigation-action.c
*** nautilus-3.2.1/src/nautilus-navigation-action.c 2011-09-12 19:14:32.000000000
-0400
--- nautilus-mod2.clean/src/nautilus-navigation-action.c 2012-01-12
19:24:25.000000000 -0500
***************
*** 149,154 ****
--- 149,156 ----
case NAUTILUS_NAVIGATION_DIRECTION_BACK:
fill_menu (window, menu, TRUE);
break;
+ case NAUTILUS_NAVIGATION_DIRECTION_UP:
+ return;
default:
g_assert_not_reached ();
break;
Only in nautilus-mod2.clean/src: nautilus-navigation-action.c~
diff -crB nautilus-3.2.1/src/nautilus-navigation-action.h nautilus-
mod2.clean/src/nautilus-navigation-action.h
*** nautilus-3.2.1/src/nautilus-navigation-action.h 2011-07-31 14:29:17.000000000
-0400
--- nautilus-mod2.clean/src/nautilus-navigation-action.h 2012-01-12
19:26:13.000000000 -0500
***************
*** 47,53 ****
typedef enum
{
NAUTILUS_NAVIGATION_DIRECTION_BACK,
! NAUTILUS_NAVIGATION_DIRECTION_FORWARD
} NautilusNavigationDirection;

struct _NautilusNavigationAction
--- 47,54 ----
typedef enum
{
NAUTILUS_NAVIGATION_DIRECTION_BACK,
! NAUTILUS_NAVIGATION_DIRECTION_FORWARD,
! NAUTILUS_NAVIGATION_DIRECTION_UP
} NautilusNavigationDirection;

struct _NautilusNavigationAction
Only in nautilus-mod2.clean/src: nautilus-navigation-action.h~
diff -crB nautilus-3.2.1/src/nautilus-toolbar.c nautilus-mod2.clean/src/nautilus-
toolbar.c
*** nautilus-3.2.1/src/nautilus-toolbar.c 2011-09-12 19:14:32.000000000 -0400
--- nautilus-mod2.clean/src/nautilus-toolbar.c 2012-01-12 19:27:12.000000000 -0500
***************
*** 129,135 ****
item = gtk_tool_item_new ();
gtk_tool_item_set_expand (item, TRUE);
gtk_container_add (GTK_CONTAINER (item), hbox);
! gtk_toolbar_insert (GTK_TOOLBAR (self->priv->toolbar), item, 0);
gtk_widget_show (GTK_WIDGET (item));

/* search bar */
--- 129,135 ----
item = gtk_tool_item_new ();
gtk_tool_item_set_expand (item, TRUE);
 gtk_container_add (GTK_CONTAINER (item), hbox);
! gtk_toolbar_insert (GTK_TOOLBAR (self->priv->toolbar), item, 3);
gtk_widget_show (GTK_WIDGET (item));

/* search bar */
Only in nautilus-mod2.clean/src: nautilus-toolbar.c~
diff -crB nautilus-3.2.1/src/nautilus-toolbar-ui.xml nautilus-
mod2.clean/src/nautilus-toolbar-ui.xml
*** nautilus-3.2.1/src/nautilus-toolbar-ui.xml 2011-09-12 19:14:32.000000000 -0400
--- nautilus-mod2.clean/src/nautilus-toolbar-ui.xml 2012-01-12 19:30:25.000000000
-0500
***************
*** 2,7 ****
<toolbar name="Toolbar">
<toolitem name="Back" action="Back"/>
<toolitem name="Forward" action="Forward"/>
<toolitem name="Search" action="Search"/>
</toolbar>
! </ui>
\ No newline at end of file
--- 2,8 ----
<toolbar name="Toolbar">
<toolitem name="Back" action="Back"/>
<toolitem name="Forward" action="Forward"/>
+ <toolitem name="Up" action="Up"/>
<toolitem name="Search" action="Search"/>
</toolbar>
! </ui>
Only in nautilus-mod2.clean/src: nautilus-toolbar-ui.xml~
diff -crB nautilus-3.2.1/src/nautilus-window-menus.c nautilus-
mod2.clean/src/nautilus-window-menus.c
*** nautilus-3.2.1/src/nautilus-window-menus.c 2012-01-12 20:36:09.000000000 -0500
--- nautilus-mod2.clean/src/nautilus-window-menus.c 2012-01-12 20:30:38.000000000
-0500
***************
*** 1141,1146 ****
--- 1141,1161 ----

g_object_unref (action);

+ action = g_object_new (NAUTILUS_TYPE_NAVIGATION_ACTION,

+ "name", NAUTILUS_ACTION_UP,
+ "label", _("_Up"),
+ "stock_id", GTK_STOCK_GO_UP,
+ "tooltip", _("Go to parent folder"),
+ "arrow-tooltip", _("Forward history"),
+ "window", window,
+ "direction", NAUTILUS_NAVIGATION_DIRECTION_UP,
+ NULL);
+ g_signal_connect (action, "activate",
+ G_CALLBACK (action_up_callback), window);
+ gtk_action_group_add_action (action_group, action);
+
+ g_object_unref (action);
+
action = GTK_ACTION
(gtk_toggle_action_new (NAUTILUS_ACTION_SEARCH,
_("Search"),
***************
*** 1196,1202 ****
{
GtkActionGroup *action_group;
const gchar *nav_state_actions[] = {
! NAUTILUS_ACTION_BACK, NAUTILUS_ACTION_FORWARD,
NAUTILUS_ACTION_SEARCH, NULL
};

--- 1211,1217 ----

{
GtkActionGroup *action_group;
const gchar *nav_state_actions[] = {
! NAUTILUS_ACTION_BACK, NAUTILUS_ACTION_FORWARD, NAUTILUS_ACTION_UP,
NAUTILUS_ACTION_SEARCH, NULL
};

Only in nautilus-mod2.clean/src: nautilus-window-menus.c~