r22995 - in /packages/unstable/libslab/debian: changelog patches/series patches/use-xdg-user-directories.diff

[jak at users.alioth.debian.org]

Author: jak
Date: Sun Feb  7 16:34:30 2010
New Revision: 22995

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22995
Log:
use-xdg-user-directories.diff: Use XDG user directories instead of
hardcoding $HOME/Desktop and $HOME/Documents.

Added:
    packages/unstable/libslab/debian/patches/use-xdg-user-directories.diff
Modified:
    packages/unstable/libslab/debian/changelog
    packages/unstable/libslab/debian/patches/series

Modified: packages/unstable/libslab/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libslab/debian/changelog?rev=22995&op=diff
==============================================================================
--- packages/unstable/libslab/debian/changelog [utf-8] (original)
+++ packages/unstable/libslab/debian/changelog [utf-8] Sun Feb  7 16:34:30 2010
@@ -1,3 +1,10 @@
+libslab (2.27.91-3) UNRELEASED; urgency=low
+
+  * use-xdg-user-directories.diff: Use XDG user directories instead of
+    hardcoding $HOME/Desktop and $HOME/Documents.
+
+ -- Julian Andres Klode <jak at debian.org>  Fri, 05 Feb 2010 21:21:31 +0100
+
 libslab (2.27.91-2) unstable; urgency=low
 
   * Merge patches from openSUSE / Novell

Modified: packages/unstable/libslab/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libslab/debian/patches/series?rev=22995&op=diff
==============================================================================
--- packages/unstable/libslab/debian/patches/series [utf-8] (original)
+++ packages/unstable/libslab/debian/patches/series [utf-8] Sun Feb  7 16:34:30 2010
@@ -2,3 +2,4 @@
 libslab-bnc536778-fix-libslab-split.patch
 libslab-bnc537483-fix-redraw.patch
 ltmain-as-needed.diff
+use-xdg-user-directories.diff

Added: packages/unstable/libslab/debian/patches/use-xdg-user-directories.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libslab/debian/patches/use-xdg-user-directories.diff?rev=22995&op=file
==============================================================================
--- packages/unstable/libslab/debian/patches/use-xdg-user-directories.diff (added)
+++ packages/unstable/libslab/debian/patches/use-xdg-user-directories.diff [utf-8] Sun Feb  7 16:34:30 2010
@@ -1,0 +1,45 @@
+From ca908787efef3979d9f90ceeb6131833054b479f Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <jak at debian.org>
+Date: Sun, 7 Feb 2010 16:55:56 +0100
+Subject: [PATCH] Use XDG user directories instead of hardcoding $HOME/Documents, Desktop.
+
+Fixes #486548.
+---
+ libslab/bookmark-agent.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/libslab/bookmark-agent.c b/libslab/bookmark-agent.c
+index 3a8cb15..e7967f2 100644
+--- a/libslab/bookmark-agent.c
++++ b/libslab/bookmark-agent.c
+@@ -1103,7 +1103,8 @@ 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)) ?: \
++			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 +1170,15 @@ create_dir_item (BookmarkAgent *this, const gchar *uri)
+ 		icon    = "gnome-fs-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)) ?: \
++			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)) ?: \
++			g_build_filename (g_get_home_dir (), "Desktop", NULL);
+ 		name = _("Desktop");
+ 		uri_new = g_filename_to_uri (path, NULL, NULL);
+ 		icon = "gnome-fs-desktop";
+-- 
+1.6.6.1
+