[Xfce4-commits] <thunar:master> Fix the home folder being displayed as "Desktop" if home == desktop.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 42c5b95e3ee2169537659a45a9ec4740c56a1cf6 (commit)
       from 03838b1f6f9e236d7d8077b85ff53245d70e05ca (commit)

commit 42c5b95e3ee2169537659a45a9ec4740c56a1cf6
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Wed Nov 10 00:12:57 2010 +0100

    Fix the home folder being displayed as "Desktop" if home == desktop.
    
    If the home and desktop folders are the same, then we want to show the
    home folder as "username" rather than as "Desktop" in the shortcuts
    pane. So we will no longer apply special label treatment to the desktop
    folder (I guess GIO would internally figure out the localized desktop
    display name based on xdg-user-dirs anyway...).

 thunar/thunar-shortcuts-model.c |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index d87891a..2aae575 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -278,29 +278,6 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
           shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED;
           shortcut->file = file;
 
-          if (thunar_g_file_is_desktop (lp->data))
-            {
-              gchar *old_locale = NULL;
-              gchar *locale = NULL;
-
-              bindtextdomain (XDG_USER_DIRS_PACKAGE, PACKAGE_LOCALE_DIR);
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-              bind_textdomain_codeset (XDG_USER_DIRS_PACKAGE, "UTF-8");
-#endif /* HAVE_BIND_TEXTDOMAIN_CODESET */
-
-              /* save the old locale */
-              old_locale = setlocale (LC_MESSAGES, NULL);
-
-              /* set the new locale */
-              locale = _thunar_get_xdg_user_dirs_locale ();
-              setlocale (LC_MESSAGES, locale);
-              g_free (locale);
-
-              shortcut->name = g_strdup (dgettext (XDG_USER_DIRS_PACKAGE, "Desktop"));
-
-              setlocale (LC_MESSAGES, old_locale);
-            }
-
           /* append the shortcut to the list */
           thunar_shortcuts_model_add_shortcut (model, shortcut, path);
           gtk_tree_path_next (path);