diffstat for xfce4-places-plugin-1.6.0 xfce4-places-plugin-1.6.0 changelog | 7 ++++++ control | 3 +- patches/gtk3-bookmarks.patch | 49 +++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 4 files changed, 59 insertions(+), 1 deletion(-) diff -Nru xfce4-places-plugin-1.6.0/debian/changelog xfce4-places-plugin-1.6.0/debian/changelog --- xfce4-places-plugin-1.6.0/debian/changelog 2013-11-26 19:34:11.000000000 +0000 +++ xfce4-places-plugin-1.6.0/debian/changelog 2014-03-13 07:05:40.000000000 +0000 @@ -1,3 +1,10 @@ +xfce4-places-plugin (1.6.0-1ubuntu1) trusty; urgency=medium + + * Add gtk3-bookmarks.patch to support new bookmark location + Thanks Alistair Buxton + + -- Jackson Doak Thu, 13 Mar 2014 07:43:00 +1100 + xfce4-places-plugin (1.6.0-1) unstable; urgency=low [ Evgeni Golov ] diff -Nru xfce4-places-plugin-1.6.0/debian/control xfce4-places-plugin-1.6.0/debian/control --- xfce4-places-plugin-1.6.0/debian/control 2013-07-15 20:15:18.000000000 +0000 +++ xfce4-places-plugin-1.6.0/debian/control 2014-03-13 07:05:40.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfce4-places-plugin Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, xfce4-panel-dev, libgtk2.0-dev, libxfce4util-dev, libexo-1-dev, libxfce4ui-1-dev, diff -Nru xfce4-places-plugin-1.6.0/debian/patches/gtk3-bookmarks.patch xfce4-places-plugin-1.6.0/debian/patches/gtk3-bookmarks.patch --- xfce4-places-plugin-1.6.0/debian/patches/gtk3-bookmarks.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-places-plugin-1.6.0/debian/patches/gtk3-bookmarks.patch 2014-03-13 07:05:40.000000000 +0000 @@ -0,0 +1,49 @@ +Author: Alistair Buxton +Description: Use the new Gtk+-3.0 bookmarks location, with fallback to the legacy file. +Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10626 + +--- + panel-plugin/model_user.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +--- a/panel-plugin/model_user.c ++++ b/panel-plugin/model_user.c +@@ -119,6 +119,7 @@ pbuser_build_bookmarks(PlacesBookmarkGro + GList *bookmarks = NULL; + PlacesBookmark *bookmark; + places_uri_scheme p_uri; ++ gchar *legacy_filename; + gchar *name; + gchar *space; + gchar *uri; +@@ -133,9 +134,18 @@ pbuser_build_bookmarks(PlacesBookmarkGro + fp = fopen(pbg_priv(bookmark_group)->filename, "r"); + + if(G_UNLIKELY(fp == NULL)){ +- DBG("Error opening gtk bookmarks file"); +- pbg_priv(bookmark_group)->loaded = 1; +- return; ++ /* If opening the file failed, attempt to ++ open the legacy file as a one-off. */ ++ ++ legacy_filename = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL); ++ fp = fopen(legacy_filename, "r"); ++ g_free(legacy_filename); ++ ++ if(G_UNLIKELY(fp == NULL)){ ++ DBG("Error opening gtk bookmarks file"); ++ pbg_priv(bookmark_group)->loaded = 1; ++ return; ++ } + } + + while( fgets(line, sizeof(line), fp) != NULL ) +@@ -388,7 +398,7 @@ places_bookmarks_user_create(void) + bookmark_group->finalize = pbuser_finalize; + bookmark_group->priv = g_new0(PBUserData, 1); + +- pbg_priv(bookmark_group)->filename = xfce_get_homefile(".gtk-bookmarks", NULL); ++ pbg_priv(bookmark_group)->filename = g_build_filename (g_get_user_config_dir (), "gtk-3.0", "bookmarks", NULL); + + return bookmark_group; + } diff -Nru xfce4-places-plugin-1.6.0/debian/patches/series xfce4-places-plugin-1.6.0/debian/patches/series --- xfce4-places-plugin-1.6.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-places-plugin-1.6.0/debian/patches/series 2014-03-13 07:05:40.000000000 +0000 @@ -0,0 +1 @@ +gtk3-bookmarks.patch