[libslab] Use XDG user directories instead of hardcoding $HOME/Documents, Desktop
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libslab] Use XDG user directories instead of hardcoding $HOME/Documents, Desktop
- Date: Thu, 18 Feb 2010 00:01:19 +0000 (UTC)
commit 0a9b3217f20e7287b937378521c06b884bf39997
Author: Julian Andres Klode <jak debian org>
Date: Sun Feb 7 16:55:56 2010 +0100
Use XDG user directories instead of hardcoding $HOME/Documents, Desktop
https://bugzilla.gnome.org/show_bug.cgi?id=486548
libslab/bookmark-agent.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/libslab/bookmark-agent.c b/libslab/bookmark-agent.c
index 3ba3423..8be315d 100644
--- a/libslab/bookmark-agent.c
+++ b/libslab/bookmark-agent.c
@@ -1103,7 +1103,9 @@ create_doc_item (BookmarkAgent *this, const gchar *uri)
if (! (strcmp (uri, "BLANK_SPREADSHEET") && strcmp (uri, "BLANK_DOCUMENT"))) {
- dir = g_build_filename (g_get_home_dir (), "Documents", NULL);
+ dir = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+ if (! dir)
+ dir = g_build_filename (g_get_home_dir (), "Documents", NULL);
if (! strcmp (uri, "BLANK_SPREADSHEET")) {
g_bookmark_file_set_title (priv->store, uri, "BLANK_SPREADSHEET");
@@ -1169,13 +1171,17 @@ create_dir_item (BookmarkAgent *this, const gchar *uri)
icon = "user-home";
}
else if (! strcmp (uri, "DOCUMENTS")) {
- path = g_build_filename (g_get_home_dir (), "Documents", NULL);
+ path = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+ if (! path)
+ path = g_build_filename (g_get_home_dir (), "Documents", NULL);
name = _("Documents");
uri_new = g_filename_to_uri (path, NULL, NULL);
g_free (path);
}
else if (! strcmp (uri, "DESKTOP")) {
- path = g_build_filename (g_get_home_dir (), "Desktop", NULL);
+ path = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
+ if (! path)
+ path = g_build_filename (g_get_home_dir (), "Desktop", NULL);
name = _("Desktop");
uri_new = g_filename_to_uri (path, NULL, NULL);
icon = "user-desktop";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]