diff --git a/xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch b/xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch index 18c8eac..5095aa2 100644 --- a/xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch +++ b/xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch @@ -5,7 +5,7 @@ diff -Naurp xfce4-places-plugin-1.1.0.bak/panel-plugin/model_system.c xfce4-plac ThunarVfsInfo *trash_info; #endif const gchar *home_dir = xfce_get_homedir(); -+ const gchar *desktopDir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP); ++ const gchar *desktop_dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP); pbg_priv(bookmark_group)->check_changed = TRUE; @@ -14,10 +14,10 @@ diff -Naurp xfce4-places-plugin-1.1.0.bak/panel-plugin/model_system.c xfce4-plac /* Desktop */ bookmark = places_bookmark_create(_("Desktop")); - bookmark->uri = g_build_filename(home_dir, "Desktop", NULL); -+ if (G_UNLIKELY(desktopDir == NULL)) { ++ if (G_UNLIKELY(desktop_dir == NULL)) { + bookmark->uri = g_build_filename(home_dir, "Desktop", NULL); + } else { -+ bookmark->uri = g_strdup(desktopDir); ++ bookmark->uri = g_strdup(desktop_dir); + } bookmark->icon = "gnome-fs-desktop"; bookmark->finalize = pbsys_finalize_desktop_bookmark; @@ -26,17 +26,17 @@ diff -Naurp xfce4-places-plugin-1.1.0.bak/panel-plugin/model_system.c xfce4-plac gboolean trash_is_empty = FALSE; ThunarVfsInfo *trash_info; #endif -+ const gchar *desktopDir=g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP); ++ const gchar *desktop_dir=g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP); if(!pbg_priv(bookmark_group)->check_changed) return FALSE; /* Check if desktop now exists and didn't before */ - uri = g_build_filename(xfce_get_homedir(), "Desktop", NULL); -+ if (G_UNLIKELY(desktopDir==NULL)) { ++ if (G_UNLIKELY(desktop_dir==NULL)) { + uri = g_build_filename(xfce_get_homedir(), "Desktop", NULL); + } else { -+ uri = g_strdup(desktopDir); ++ uri = g_strdup(desktop_dir); + } if(g_file_test(uri, G_FILE_TEST_IS_DIR) != pbg_priv(bookmark_group)->desktop_exists){ g_free(uri); diff --git a/xfce4-places-plugin.spec b/xfce4-places-plugin.spec index 220d59d..32e3f1f 100644 --- a/xfce4-places-plugin.spec +++ b/xfce4-places-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-places-plugin Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Places menu for the Xfce panel Group: User Interface/Desktops @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sun Aug 31 2008 Christoph Wickert - 1.1.0-3 +- Update xdg-userdir-compat.patch to use upstream's variable names + * Wed Aug 27 2008 Christoph Wickert - 1.1.0-2 - Respect xdg user directory paths (#457740)