From a220373a55bcd5ee15fa553770042e932dcaa382 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 23 Jan 2009 06:00:44 +0000 Subject: Skip Desktop if it equals the home folder svn path=/trunk/; revision=22192 --- ChangeLog | 8 ++++++++ gtk/gtkfilechooserdefault.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 54422d1add..cc317f603e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-01-23 Matthias Clasen + + Skip Desktop if it equals the home folder + Patch by Christian Dywan + + * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Skip + Desktop if it equals the home folder. + 2009-01-23 Matthias Clasen Bug 536965 – GtkPlug: crash on theme change diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 6725e980fa..49d7471af4 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1920,6 +1920,15 @@ shortcuts_append_desktop (GtkFileChooserDefault *impl) profile_start ("start", NULL); name = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP); + /* "To disable a directory, point it to the homedir." + * See http://freedesktop.org/wiki/Software/xdg-user-dirs + **/ + if (!g_strcmp0 (name, g_get_home_dir ())) + { + profile_end ("end", NULL); + return; + } + file = g_file_new_for_path (name); shortcuts_insert_file (impl, -1, SHORTCUT_TYPE_FILE, NULL, file, _("Desktop"), FALSE, SHORTCUTS_DESKTOP); impl->has_desktop = TRUE; -- cgit v1.2.1