Attachment 313776 Details for Bug 457740 – updated patch for xfdesktop

[patch] updated patch for xfdesktop

xfdesktop-xdg-userdir-compat.patch (text/plain), 1.59 KB, created by Andrea Santilli on 2008-08-08 02:37:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrea Santilli

Created: 2008-08-08 02:37:27 UTC

Size: 1.59 KB

patch

obsolete

>diff -Naurp xfdesktop-4.4.2.bak/src/xfce-desktop.c xfdesktop-4.4.2/src/xfce-desktop.c
>--- xfdesktop-4.4.2.bak/src/xfce-desktop.c	2007-11-17 20:31:41.000000000 +0100
>+++ xfdesktop-4.4.2/src/xfce-desktop.c	2008-08-08 04:06:35.000000000 +0200
>@@ -154,6 +154,7 @@ static void
> xfce_desktop_setup_icon_view(XfceDesktop *desktop)
> {
>     XfdesktopIconViewManager *manager = NULL;
>+    gboolean wasUserDesktopFound = TRUE;
>     
>     switch(desktop->priv->icons_style) {
>         case XFCE_DESKTOP_ICON_STYLE_NONE:
>@@ -168,9 +169,12 @@ xfce_desktop_setup_icon_view(XfceDesktop
>         case XFCE_DESKTOP_ICON_STYLE_FILES:
>             {
>                 ThunarVfsPath *path;
>-                gchar *desktop_path = xfce_get_homefile("Desktop",
>-                                                        NULL);
>-                
>+                const gchar *desktop_path = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP);
>+
>+                if (G_UNLIKELY (desktop_path == NULL)) {
>+                    gchar *desktop_path = xfce_get_homefile("Desktop", NULL);
>+                    wasUserDesktopFound = FALSE;
>+                }
>                 path = thunar_vfs_path_new(desktop_path, NULL);
>                 if(path) {
>                     XfceRc *rcfile;
>@@ -219,7 +223,8 @@ xfce_desktop_setup_icon_view(XfceDesktop
>                     g_critical("Unable to create ThunarVfsPath for '%s'",
>                                desktop_path);
>                 }
>-                g_free(desktop_path);
>+                if (wasUserDesktopFound == FALSE)
>+                  g_free(desktop_path);
>             }
>             break;
> #endif

Actions: View | Diff

Attachments on bug 457740: 313481 | 313482 | 313484 | 313775 | 313776 | 313777 | 315407 | 315408 | 315409