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

[Jackson Doak]

Bugfix for xubuntu 14.04

[Timo Jyrinki (timo-jyrinki)]

Tested in XFCE via ppa:timo-jyrinki/ppa, good to upload as is. Thanks!

review: Approve

[Martin Pitt (pitti)]

Uploaded.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-07 16:54:48 +0000
+++ debian/changelog	2014-03-12 21:04:34 +0000
@@ -1,3 +1,10 @@
+thunar (1.6.3-1ubuntu4) trusty; urgency=medium
+
+  * Update gtk3-bookmarks.patch. LP: #1280641
+    Thanks Alistair Buxton
+
+ -- Jackson Doak <[e-mail]>  Thu, 13 Mar 2014 07:53:06 +1100
+
 thunar (1.6.3-1ubuntu3) trusty; urgency=medium
 
   * Add git-xfdesktop-4.11.patch. LP: #1277149

=== modified file 'debian/patches/gtk3-bookmarks.patch'
--- debian/patches/gtk3-bookmarks.patch	2014-02-07 16:54:48 +0000
+++ debian/patches/gtk3-bookmarks.patch	2014-03-12 21:04:34 +0000
@@ -1,12 +1,12 @@
 Author: Alistair Buxton <[e-mail]>
-Date: Sun, 12 Jan 2014 17:27:30 +0000
-Description: [PATCH] Use the new Gtk bookmarks location.
+Description: Use the new Gtk bookmarks location.
 Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10627
 
 ---
- thunar/thunar-gio-extensions.c |    2 +-
- thunar/thunar-util.c           |   10 +++++++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
+ thunar/thunar-gio-extensions.c  |    2 +-
+ thunar/thunar-shortcuts-model.c |   17 +++++++++++++++++
+ thunar/thunar-util.c            |   10 +++++++++-
+ 3 files changed, 27 insertions(+), 2 deletions(-)
 
 --- a/thunar/thunar-gio-extensions.c
 +++ b/thunar/thunar-gio-extensions.c
@@ -19,6 +19,39 @@
    bookmarks = g_file_new_for_path (filename);
    g_free (filename);
  
+--- a/thunar/thunar-shortcuts-model.c
++++ b/thunar/thunar-shortcuts-model.c
+@@ -1364,6 +1364,7 @@ thunar_shortcuts_model_save (ThunarShort
+   gchar          *uri;
+   GList          *lp;
+   GError         *err = NULL;
++  GFile          *parent = NULL;
+ 
+   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ 
+@@ -1389,6 +1390,22 @@ thunar_shortcuts_model_save (ThunarShort
+         }
+     }
+ 
++  /* create folder if it does not exist */
++  parent = g_file_get_parent (model->bookmarks_file);
++  if (!g_file_make_directory_with_parents (parent, NULL, &err))
++    {
++       if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_EXISTS))
++         {
++           g_clear_error (&err);
++         }
++       else
++         {
++           g_warning ("Failed to create bookmarks folder: %s", err->message);
++           g_error_free (err);
++         }
++    }
++  g_clear_object (&parent);
++
+   /* write data to the disk */
+   bookmarks_path = g_file_get_path (model->bookmarks_file);
+   if (!g_file_set_contents (bookmarks_path, contents->str, contents->len, &err))
 --- a/thunar/thunar-util.c
 +++ b/thunar/thunar-util.c
 @@ -84,6 +84,15 @@ thunar_util_load_bookmarks (GFile

=== modified file 'thunar/thunar-shortcuts-model.c'
--- thunar/thunar-shortcuts-model.c	2013-08-15 21:37:17 +0000
+++ thunar/thunar-shortcuts-model.c	2014-03-12 21:04:34 +0000
@@ -1364,6 +1364,7 @@
   gchar          *uri;
   GList          *lp;
   GError         *err = NULL;
+  GFile          *parent = NULL;
 
   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
 
@@ -1389,6 +1390,22 @@
         }
     }
 
+  /* create folder if it does not exist */
+  parent = g_file_get_parent (model->bookmarks_file);
+  if (!g_file_make_directory_with_parents (parent, NULL, &err))
+    {
+       if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_EXISTS))
+         {
+           g_clear_error (&err);
+         }
+       else
+         {
+           g_warning ("Failed to create bookmarks folder: %s", err->message);
+           g_error_free (err);
+         }
+    }
+  g_clear_object (&parent);
+
   /* write data to the disk */
   bookmarks_path = g_file_get_path (model->bookmarks_file);
   if (!g_file_set_contents (bookmarks_path, contents->str, contents->len, &err))