[Goodies-commits] r6153 - in xfce4-places-plugin/trunk: . panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2008-11-21 19:26:21 +0000 (Fri, 21 Nov 2008)
New Revision: 6153

Modified:
   xfce4-places-plugin/trunk/ChangeLog
   xfce4-places-plugin/trunk/panel-plugin/model_system.c
Log:
Add xdg user dirs support, thanks to Andea Santilli.

See bug #4461 for details.

Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2008-11-21 19:19:59 UTC (rev 6152)
+++ xfce4-places-plugin/trunk/ChangeLog	2008-11-21 19:26:21 UTC (rev 6153)
@@ -1,5 +1,7 @@
 2008-11-21	Diego Ongaro <ongardie at gmail.com>
 
+	* model_system.c: Add xdg user dirs support, thanks to Andea
+	  Santilli. See bug #4461.
 	* view.c: disconnect from button signals on finalize
 	* button.{c,h}: Fix warnings and segfault on plugin exit
 	* INSTALL: updated with newer version of autotools

Modified: xfce4-places-plugin/trunk/panel-plugin/model_system.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model_system.c	2008-11-21 19:19:59 UTC (rev 6152)
+++ xfce4-places-plugin/trunk/panel-plugin/model_system.c	2008-11-21 19:26:21 UTC (rev 6153)
@@ -36,7 +36,8 @@
 #define EXO_API_SUBJECT_TO_CHANGE
 #include <thunar-vfs/thunar-vfs.h>
 
-#define TRASH THUNAR_VFS_CHECK_VERSION(0,4,0)
+#define TRASH          THUNAR_VFS_CHECK_VERSION(0,4,0)
+#define XDG_USER_DIRS  GLIB_CHECK_VERSION(2,14,0)
 
 #define pbg_priv(pbg) ((PBSysData*) pbg->priv)
 
@@ -45,7 +46,7 @@
 
     /* These are the things that might "change" */
     gboolean       check_changed;   /* starts off false to indicate the following are meaningless */
-    gboolean       desktop_exists;
+    gchar         *desktop_dir;     /* NULL => no desktop or desktop is same as home */
 #if TRASH
     gboolean       trash_is_empty;
     ThunarVfsPath *trash_path;
@@ -77,6 +78,36 @@
 }
 #endif
 
+static gchar*
+pbsys_desktop_dir()
+{
+    const gchar *home_dir = xfce_get_homedir();
+    gchar *desktop_dir = NULL;
+
+#if XDG_USER_DIRS
+    /* get the xdg desktop directory, or possibly NULL */
+    desktop_dir = g_strdup(g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP));
+
+    /* if xdg desktop is the same as home, pretend it's not there */
+    if(exo_str_is_equal(desktop_dir, home_dir)){
+        g_free(desktop_dir);
+        return NULL;
+    }
+#endif
+
+    /* fall back to ~/Desktop */
+    if(desktop_dir == NULL)
+        desktop_dir = g_build_filename(home_dir, "Desktop", NULL);
+
+    /* make sure the directory is there */
+    if(!g_file_test(desktop_dir, G_FILE_TEST_IS_DIR)){
+        g_free(desktop_dir);
+        return NULL;
+    }
+
+    return desktop_dir;
+}
+
 static GList*
 pbsys_get_bookmarks(PlacesBookmarkGroup *bookmark_group)
 {
@@ -87,6 +118,7 @@
     ThunarVfsInfo *trash_info;
 #endif
     const gchar *home_dir = xfce_get_homedir();
+    gchar *desktop_dir;
 
     pbg_priv(bookmark_group)->check_changed = TRUE;
 
@@ -132,29 +164,27 @@
 #endif
 
     /* Desktop */
-    bookmark                = places_bookmark_create(_("Desktop"));
-    bookmark->uri           = g_build_filename(home_dir, "Desktop", NULL);
-    bookmark->icon          = "gnome-fs-desktop";
-    bookmark->finalize      = pbsys_finalize_desktop_bookmark;
+    desktop_dir = pbsys_desktop_dir();
 
-    if(g_file_test(bookmark->uri, G_FILE_TEST_IS_DIR)){
-    
+    g_free(pbg_priv(bookmark_group)->desktop_dir);
+    pbg_priv(bookmark_group)->desktop_dir = g_strdup(desktop_dir);
+
+    if(desktop_dir != NULL){
+        bookmark                = places_bookmark_create(_("Desktop"));
+        bookmark->uri           = desktop_dir;
+        bookmark->icon          = "gnome-fs-desktop";
+        bookmark->finalize      = pbsys_finalize_desktop_bookmark;
+
+
         terminal                 = places_create_open_terminal_action(bookmark);
         bookmark->actions        = g_list_prepend(bookmark->actions, terminal);
         open                     = places_create_open_action(bookmark);
         bookmark->actions        = g_list_prepend(bookmark->actions, open);
         bookmark->primary_action = open;
 
-        pbg_priv(bookmark_group)->desktop_exists = TRUE;
         bookmarks = g_list_append(bookmarks, bookmark);
+    }
 
-    }else{
-
-        pbg_priv(bookmark_group)->desktop_exists = FALSE;
-        places_bookmark_destroy(bookmark);
-
-    }
-    
     /* File System (/) */
     bookmark                = places_bookmark_create(_("File System"));
     bookmark->uri           = "/";
@@ -174,7 +204,7 @@
 gboolean
 pbsys_changed(PlacesBookmarkGroup *bookmark_group)
 {
-    gchar *uri;
+    gchar *desktop_dir;
 #if TRASH
     gboolean trash_is_empty = FALSE;
     ThunarVfsInfo *trash_info;
@@ -184,12 +214,12 @@
         return FALSE;
     
     /* Check if desktop now exists and didn't before */
-    uri = g_build_filename(xfce_get_homedir(), "Desktop", NULL);
-    if(g_file_test(uri, G_FILE_TEST_IS_DIR) != pbg_priv(bookmark_group)->desktop_exists){
-        g_free(uri);
+    desktop_dir = pbsys_desktop_dir();
+    if(!exo_str_is_equal(desktop_dir, pbg_priv(bookmark_group)->desktop_dir)){
+        g_free(desktop_dir);
         return TRUE;
     }else
-        g_free(uri);
+        g_free(desktop_dir);
 
 #if TRASH
     /* see if trash gets a different icon (e.g., was empty, now full) */
@@ -212,7 +242,9 @@
     thunar_vfs_path_unref(pbg_priv(bookmark_group)->trash_path);
     thunar_vfs_shutdown();
 #endif
-    
+
+    g_free(pbg_priv(bookmark_group)->desktop_dir);
+
     g_free(pbg_priv(bookmark_group));
 
 }