Merge lp:~larsu/nautilus/lp1290067 into lp:~ubuntu-desktop/nautilus/ubuntu

[Lars Karlitski]

traditional menubar patch: restore "New Empty Document" in the file menu

Also, move the unity-new-documents patch after the restore-traditional-menubar patch, because it depends on it.

traditional menubar patch: restore "New Empty Document" in the file menu

Also, move the unity-new-documents patch after the restore-traditional-menubar patch, because it depends on it.

[Sebastien Bacher (seb128)]

great, thanks!

review: Approve

=== modified file 'debian/patches/16_unity_new_documents.patch'
--- debian/patches/16_unity_new_documents.patch	2014-01-24 21:27:00 +0000
+++ debian/patches/16_unity_new_documents.patch	2014-03-11 14:51:23 +0000
@@ -1,7 +1,8 @@
-diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-actions.h nautilus-3.8.2/src/nautilus-actions.h
---- nautilus-3.8.2.orig/src/nautilus-actions.h	2013-06-21 13:50:33.936456773 +0200
-+++ nautilus-3.8.2/src/nautilus-actions.h	2013-06-21 13:50:53.108457411 +0200
-@@ -118,6 +118,7 @@
+diff --git a/src/nautilus-actions.h b/src/nautilus-actions.h
+index 8c8e575..2b9e642 100644
+--- a/src/nautilus-actions.h
++++ b/src/nautilus-actions.h
+@@ -119,6 +119,7 @@
  #define NAUTILUS_ACTION_SCRIPTS "Scripts"
  #define NAUTILUS_ACTION_OPEN_SCRIPTS_FOLDER "Open Scripts Folder"
  #define NAUTILUS_ACTION_NEW_DOCUMENTS "New Documents"
@@ -9,10 +10,19 @@
  #define NAUTILUS_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
  #define NAUTILUS_ACTION_MANUAL_LAYOUT "Manual Layout"
  #define NAUTILUS_ACTION_REVERSED_ORDER "Reversed Order"
-diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-directory-view-ui.xml nautilus-3.8.2/src/nautilus-directory-view-ui.xml
---- nautilus-3.8.2.orig/src/nautilus-directory-view-ui.xml	2013-06-21 13:50:33.960456773 +0200
-+++ nautilus-3.8.2/src/nautilus-directory-view-ui.xml	2013-06-21 13:50:53.108457411 +0200
-@@ -16,6 +16,8 @@
+diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
+index 64a9fc6..ad98f81 100644
+--- a/src/nautilus-directory-view-ui.xml
++++ b/src/nautilus-directory-view-ui.xml
+@@ -12,6 +12,7 @@
+       <menu action="New Documents">
+         <placeholder name="New Documents Placeholder"/>
+         <separator name="After New Documents"/>
++        <menuitem name="New Empty Document" action="New Empty Document"/>
+       </menu>
+     </placeholder>
+     <placeholder name="Open Placeholder">
+@@ -95,6 +96,8 @@
      <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
      <menu action="New Documents">
        <placeholder name="New Documents Placeholder"/>
@@ -21,7 +31,7 @@
      </menu>
    </placeholder>
    <placeholder name="Global File Items Placeholder">
-@@ -42,6 +44,8 @@
+@@ -121,6 +124,8 @@
        <menuitem name="New Folder" action="New Folder"/>
        <menu action="New Documents">
          <placeholder name="New Documents Placeholder"/>
@@ -30,10 +40,11 @@
        </menu>
      </placeholder>
      <separator name="Clipboard separator"/>
-diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-view.c nautilus-3.8.2/src/nautilus-view.c
---- nautilus-3.8.2.orig/src/nautilus-view.c	2013-06-21 13:50:33.956456773 +0200
-+++ nautilus-3.8.2/src/nautilus-view.c	2013-06-21 13:50:53.120457411 +0200
-@@ -2102,6 +2102,15 @@
+diff --git a/src/nautilus-view.c b/src/nautilus-view.c
+index 481d039..049260e 100644
+--- a/src/nautilus-view.c
++++ b/src/nautilus-view.c
+@@ -2133,6 +2133,15 @@ action_new_folder_with_selection_callback (GtkAction *action,
  }
  
  static void
@@ -49,7 +60,7 @@
  action_properties_callback (GtkAction *action,
  			    gpointer callback_data)
  {
-@@ -7114,6 +7123,11 @@
+@@ -7166,6 +7175,11 @@ static const GtkActionEntry directory_view_entries[] = {
    /* label, accelerator */       N_("New Folder with Selection"), NULL,
    /* tooltip */                  N_("Create a new folder containing the selected items"),
  				 G_CALLBACK (action_new_folder_with_selection_callback) },
@@ -61,7 +72,7 @@
    /* name, stock id */         { NAUTILUS_ACTION_OPEN, NULL,
    /* label, accelerator */       N_("_Open"), "<control>o",
    /* tooltip */                  N_("Open the selected item in this window"),
-@@ -7366,6 +7380,27 @@
+@@ -7420,6 +7434,27 @@ static const GtkToggleActionEntry directory_view_toggle_entries[] = {
  };
  
  static void
@@ -89,7 +100,7 @@
  pre_activate (NautilusView *view,
  	      GtkAction *action,
  	      GtkActionGroup *action_group)
-@@ -7428,6 +7463,9 @@
+@@ -7482,6 +7517,9 @@ real_merge_menus (NautilusView *view)
  	g_object_unref (action);
  	g_free (tooltip);
  
@@ -99,7 +110,7 @@
  	g_signal_connect_object (action_group, "pre-activate",
  				 G_CALLBACK (pre_activate), G_OBJECT (view),
  				 G_CONNECT_SWAPPED);
-@@ -8797,7 +8797,11 @@
+@@ -8813,7 +8851,11 @@ real_update_menus (NautilusView *view)
  	action = gtk_action_group_get_action (view->details->dir_action_group,
  					      NAUTILUS_ACTION_NEW_DOCUMENTS);
  	gtk_action_set_sensitive (action, can_create_files);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-02-26 17:01:07 +0000
+++ debian/patches/series	2014-03-11 14:51:23 +0000
@@ -7,7 +7,6 @@
 12_unity_launcher_support.patch
 14_bring_del_instead_ctrl_del.patch
 15_use-ubuntu-help.patch
-16_unity_new_documents.patch
 17_static_unity_quicklist.patch
 18_unity_icon_color.patch
 zg_activity_logging.patch
@@ -23,6 +22,7 @@
 interactive_search.patch
 ubuntu_show_titlebar.patch
 restore-traditional-menu-bar.patch
+16_unity_new_documents.patch
 ubuntu_titlebar_css.patch
 ubuntu_backspace_behaviour.patch
 git_valid_location_widget.patch