Merge lp:~noskcaj/ubuntu/trusty/thunar/bugfixes into lp:ubuntu/trusty/thunar

[Jackson Doak]

Add some bugfixes for xubuntu 14.04

[lp:~noskcaj/ubuntu/trusty/thunar/bugfixes]

103. By Jackson Doak on 2014-04-06

Update the patch again

[Martin Pitt (pitti)]

Uploaded, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-13 07:53:06 +0000
+++ debian/changelog	2014-04-06 02:41:27 +0000
@@ -1,3 +1,15 @@
+thunar (1.6.3-1ubuntu5) trusty; urgency=medium
+
+  * Add git-save-keyboard-shortcuts.patch. LP: #1186846
+    - Keyboard shortcuts save when changed rather than when thunar is closed
+  * Add menu-icon-tweaks.patch. LP: #1271861
+    - Don't use generic folder icons for open with default application
+    - Add icons for open in new tab, new window
+  * Add git-force-toolbr-icons.patch
+    - Fix for "Home" and "Open Parent" icons going missing from toolbar
+
+ -- Jackson Doak <[e-mail]>  Sat, 05 Apr 2014 08:22:40 +1100
+
 thunar (1.6.3-1ubuntu4) trusty; urgency=medium
 
   * Update gtk3-bookmarks.patch. LP: #1280641

=== added file 'debian/patches/git-force-toolbr-icons.patch'
--- debian/patches/git-force-toolbr-icons.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-force-toolbr-icons.patch	2014-04-06 02:41:27 +0000
@@ -0,0 +1,18 @@
+Origin: http://git.xfce.org/xfce/thunar/commit/?id=c9712b835be90127ef4af1ac1b1fd645081a646a
+Description: Fix "Home" and "Open Parent" icons going missing from toolbar
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10179
+
+---
+ thunar/thunar-window.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/thunar/thunar-window.c
++++ b/thunar/thunar-window.c
+@@ -1821,6 +1821,7 @@ thunar_window_install_location_bar (Thun
+           /* setup the toolbar for the location bar */
+           window->location_toolbar = gtk_ui_manager_get_widget (window->ui_manager, "/location-toolbar");
+           g_object_get (G_OBJECT (window->preferences), "misc-small-toolbar-icons", &small_icons, NULL);
++          gtk_toolbar_set_style (GTK_TOOLBAR (window->location_toolbar), GTK_TOOLBAR_ICONS);
+           gtk_toolbar_set_icon_size (GTK_TOOLBAR (window->location_toolbar),
+                                      small_icons ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR);
+           gtk_table_attach (GTK_TABLE (window->table), window->location_toolbar, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);

=== added file 'debian/patches/git-save-keyboard-shortcuts.patch'
--- debian/patches/git-save-keyboard-shortcuts.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-save-keyboard-shortcuts.patch	2014-04-06 02:41:27 +0000
@@ -0,0 +1,138 @@
+Origin: http://git.xfce.org/xfce/thunar/commit/?id=821c9b480b7feb625461b5ec1f35e92dcc87e3d9
+Bug-Ubuntu: https://launchpad.net/bugs/1186846
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10139
+Description: Makes keyboard shortcuts save when changed rather than when thunar is closed
+
+---
+ thunar/thunar-application.c |   69 +++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 7 deletions(-)
+
+--- a/thunar/thunar-application.c
++++ b/thunar/thunar-application.c
+@@ -59,6 +59,8 @@
+ #include <thunar/thunar-util.h>
+ #include <thunar/thunar-view.h>
+ 
++#define ACCEL_MAP_PATH "Thunar/accels.scm"
++
+ 
+ 
+ /* Prototype for the Thunar job launchers */
+@@ -85,6 +87,8 @@ static void           thunar_application
+                                                                  guint                   prop_id,
+                                                                  const GValue           *value,
+                                                                  GParamSpec             *pspec);
++static void           thunar_application_accel_map_changed      (ThunarApplication      *application);
++static gboolean       thunar_application_accel_map_save         (gpointer                user_data);
+ static void           thunar_application_collect_and_launch     (ThunarApplication      *application,
+                                                                  gpointer                parent,
+                                                                  const gchar            *icon_name,
+@@ -142,6 +146,9 @@ struct _ThunarApplication
+ 
+   gboolean               daemon;
+ 
++  guint                  accel_map_save_id;
++  GtkAccelMap           *accel_map;
++
+   guint                  show_dialogs_timer_id;
+ 
+ #ifdef HAVE_GUDEV
+@@ -220,7 +227,7 @@ thunar_application_init (ThunarApplicati
+   application->progress_dialog = NULL;
+ 
+   /* check if we have a saved accel map */
+-  path = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, "Thunar/accels.scm");
++  path = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, ACCEL_MAP_PATH);
+   if (G_LIKELY (path != NULL))
+     {
+       /* load the accel map */
+@@ -228,6 +235,11 @@ thunar_application_init (ThunarApplicati
+       g_free (path);
+     }
+ 
++  /* watch for changes */
++  application->accel_map = gtk_accel_map_get ();
++  g_signal_connect_swapped (G_OBJECT (application->accel_map), "changed",
++      G_CALLBACK (thunar_application_accel_map_changed), application);
++
+ #ifdef HAVE_GUDEV
+   /* establish connection with udev */
+   application->udev_client = g_udev_client_new (subsystems);
+@@ -245,21 +257,21 @@ static void
+ thunar_application_finalize (GObject *object)
+ {
+   ThunarApplication *application = THUNAR_APPLICATION (object);
+-  gchar             *path;
+   GList             *lp;
+ 
+   /* unqueue all files waiting to be processed */
+   thunar_g_file_list_free (application->files_to_launch);
+ 
+   /* save the current accel map */
+-  path = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "Thunar/accels.scm", TRUE);
+-  if (G_LIKELY (path != NULL))
++  if (G_UNLIKELY (application->accel_map_save_id != 0))
+     {
+-      /* save the accel map */
+-      gtk_accel_map_save (path);
+-      g_free (path);
++      g_source_remove (application->accel_map_save_id);
++      thunar_application_accel_map_save (application);
+     }
+ 
++  if (application->accel_map != NULL)
++    g_object_unref (G_OBJECT (application->accel_map));
++
+ #ifdef HAVE_GUDEV
+   /* cancel any pending volman watch source */
+   if (G_UNLIKELY (application->volman_watch_id != 0))
+@@ -347,6 +359,49 @@ thunar_application_set_property (GObject
+ }
+ 
+ 
++
++static gboolean
++thunar_application_accel_map_save (gpointer user_data)
++{
++  ThunarApplication *application = THUNAR_APPLICATION (user_data);
++  gchar             *path;
++
++  _thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
++
++  application->accel_map_save_id = 0;
++
++  /* save the current accel map */
++  path = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, ACCEL_MAP_PATH, TRUE);
++  if (G_LIKELY (path != NULL))
++    {
++      /* save the accel map */
++      gtk_accel_map_save (path);
++      g_free (path);
++    }
++
++  return FALSE;
++}
++
++
++
++static void
++thunar_application_accel_map_changed (ThunarApplication *application)
++{
++  _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
++
++  /* stop pending save */
++  if (application->accel_map_save_id != 0)
++    {
++      g_source_remove (application->accel_map_save_id);
++      application->accel_map_save_id = 0;
++    }
++
++  /* schedule new save */
++  application->accel_map_save_id =
++      g_timeout_add_seconds (10, thunar_application_accel_map_save, application);
++}
++
++
+ 
+ static void
+ thunar_application_collect_and_launch (ThunarApplication *application,

=== added file 'debian/patches/menu-icon-tweaks.patch'
--- debian/patches/menu-icon-tweaks.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/menu-icon-tweaks.patch	2014-04-06 02:41:27 +0000
@@ -0,0 +1,127 @@
+Author: Thaddaeus Tintenfisch <[e-mail]>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10652
+Bug-Ubuntu: https://launchpad.net/bugs/1271861
+Description: Add or change various menu icons:
+ - Open With DEFAULT Application
+ - New Tab/Window
+ - Create Folder/Document
+ - Empty File
+
+---
+ thunar/thunar-launcher.c         |    8 +++++++-
+ thunar/thunar-location-buttons.c |    2 +-
+ thunar/thunar-standard-view.c    |    2 +-
+ thunar/thunar-templates-action.c |    3 ++-
+ thunar/thunar-tree-view.c        |    7 +++++++
+ thunar/thunar-window.c           |    4 ++--
+ 6 files changed, 20 insertions(+), 6 deletions(-)
+
+--- a/thunar/thunar-launcher.c
++++ b/thunar/thunar-launcher.c
+@@ -815,8 +815,9 @@ thunar_launcher_update_idle (gpointer da
+        ** - "Open", "Open in n New Windows" and "Open in n New Tabs" actions
+        **/
+ 
+-      /* Prepare "Open" label */
++      /* Prepare "Open" label and icon */
+       gtk_action_set_label (launcher->action_open, _("_Open"));
++      gtk_action_set_stock_id (launcher->action_open, GTK_STOCK_OPEN);
+ 
+       if (n_selected_files == n_directories && n_directories >= 1)
+         {
+@@ -928,6 +929,7 @@ thunar_launcher_update_idle (gpointer da
+           /* turn the "Open" action into "Execute" */
+           g_object_set (G_OBJECT (launcher->action_open),
+                         "label", _("_Execute"),
++                        "stock-id", GTK_STOCK_EXECUTE,
+                         "tooltip", ngettext ("Execute the selected file", "Execute the selected files", n_selected_files),
+                         NULL);
+         }
+@@ -945,6 +947,10 @@ thunar_launcher_update_idle (gpointer da
+           g_free (tooltip);
+           g_free (label);
+ 
++          /* load default application icon */
++          gtk_action_set_stock_id (launcher->action_open, NULL);
++          gtk_action_set_gicon (launcher->action_open, g_app_info_get_icon (applications->data));
++
+           /* remember the default application for the "Open" action */
+           g_object_set_qdata_full (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, applications->data, g_object_unref);
+ 
+--- a/thunar/thunar-location-buttons.c
++++ b/thunar/thunar-location-buttons.c
+@@ -175,7 +175,7 @@ static const GtkActionEntry action_entri
+   { "location-buttons-open", GTK_STOCK_OPEN, N_("_Open"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open), },
+   { "location-buttons-open-in-new-tab", NULL, N_("Open in New Tab"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_tab), },
+   { "location-buttons-open-in-new-window", NULL, N_("Open in New Window"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_window), },
+-  { "location-buttons-create-folder", NULL, N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), },
++  { "location-buttons-create-folder", "folder-new", N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), },
+   { "location-buttons-empty-trash", NULL, N_("_Empty Trash"), "", N_("Delete all files and folders in the Trash"), G_CALLBACK (thunar_location_buttons_action_empty_trash), },
+   { "location-buttons-paste-into-folder", GTK_STOCK_PASTE, N_("Paste Into Folder"), "", NULL, G_CALLBACK (thunar_location_buttons_action_paste_into_folder), },
+   { "location-buttons-properties", GTK_STOCK_PROPERTIES, N_("_Properties..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_properties), },
+--- a/thunar/thunar-standard-view.c
++++ b/thunar/thunar-standard-view.c
+@@ -393,7 +393,7 @@ static const GtkActionEntry action_entri
+ {
+   { "file-context-menu", NULL, N_ ("File Context Menu"), NULL, NULL, NULL, },
+   { "folder-context-menu", NULL, N_ ("Folder Context Menu"), NULL, NULL, NULL, },
+-  { "create-folder", NULL, N_ ("Create _Folder..."), "<control><shift>N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), },
++  { "create-folder", "folder-new", N_ ("Create _Folder..."), "<control><shift>N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), },
+   { "properties", GTK_STOCK_PROPERTIES, N_ ("_Properties..."), "<alt>Return", N_ ("View the properties of the selected file"), G_CALLBACK (thunar_standard_view_action_properties), },
+   { "cut", GTK_STOCK_CUT, N_ ("Cu_t"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_cut), },
+   { "copy", GTK_STOCK_COPY, N_ ("_Copy"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_copy), },
+--- a/thunar/thunar-templates-action.c
++++ b/thunar/thunar-templates-action.c
+@@ -477,7 +477,7 @@ thunar_templates_action_load_finished (T
+       gtk_widget_show (item);
+ 
+       /* add the icon for the emtpy file item */
+-      image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
++      image = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU);
+       gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+     }
+ 
+@@ -542,6 +542,7 @@ thunar_templates_action_new (const gchar
+                        "hide-if-empty", FALSE,
+                        "label", label,
+                        "name", name,
++                       "icon-name", "document-new",
+                        NULL);
+ }
+ 
+--- a/thunar/thunar-tree-view.c
++++ b/thunar/thunar-tree-view.c
+@@ -1093,6 +1093,7 @@ thunar_tree_view_context_menu (ThunarTre
+   GtkWidget    *menu;
+   GtkWidget    *item;
+   GtkWidget    *window;
++  GIcon        *icon;
+   GList        *providers, *lp;
+   GList        *actions = NULL, *tmp;
+ 
+@@ -1201,6 +1202,12 @@ thunar_tree_view_context_menu (ThunarTre
+       g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view);
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+       gtk_widget_show (item);
++      
++      /* set the stock icon */
++      icon = g_themed_icon_new ("folder-new");
++      image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
++      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
++      g_object_unref (icon);
+ 
+       /* append a separator item */
+       item = gtk_separator_menu_item_new ();
+--- a/thunar/thunar-window.c
++++ b/thunar/thunar-window.c
+@@ -345,8 +345,8 @@ struct _ThunarWindow
+ static GtkActionEntry action_entries[] =
+ {
+   { "file-menu", NULL, N_ ("_File"), NULL, },
+-  { "new-tab", NULL, N_ ("New _Tab"), "<control>T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), },
+-  { "new-window", NULL, N_ ("New _Window"), "<control>N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), },
++  { "new-tab", "tab-new", N_ ("New _Tab"), "<control>T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), },
++  { "new-window", "window-new", N_ ("New _Window"), "<control>N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), },
+   { "sendto-menu", NULL, N_ ("_Send To"), NULL, },
+   { "empty-trash", NULL, N_ ("_Empty Trash"), NULL, N_ ("Delete all files and folders in the Trash"), G_CALLBACK (thunar_window_action_empty_trash), },
+   { "detach-tab", NULL, N_ ("Detac_h Tab"), NULL, N_ ("Open current folder in a new window"), G_CALLBACK (thunar_window_action_detach_tab), },

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-02-07 16:54:48 +0000
+++ debian/patches/series	2014-04-06 02:41:27 +0000
@@ -1,3 +1,6 @@
 01_support-non-multiarch-modules.patch
 git-xfdesktop-4.11.patch
 gtk3-bookmarks.patch
+git-save-keyboard-shortcuts.patch
+menu-icon-tweaks.patch
+git-force-toolbr-icons.patch