r22997 - in /packages/unstable/gnome-main-menu/debian: changelog patches/series patches/use-xdg-user-directories.diff

[jak at users.alioth.debian.org]

Author: jak
Date: Sun Feb  7 16:38:52 2010
New Revision: 22997

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

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

Modified: packages/unstable/gnome-main-menu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/changelog?rev=22997&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/changelog [utf-8] Sun Feb  7 16:38:52 2010
@@ -3,6 +3,8 @@
   * debian/rules: Use dh_autoreconf instead of manual autoreconf stuff.
   * debian/rules: Pass --with quilt to dh on clean.
   * fix-binutils-gold-build.diff: Fix build with gold (Closes: #554655).
+  * use-xdg-user-directories.diff: Use XDG user directories instead of
+    hardcoding $HOME/Desktop and $HOME/Documents (LP: #259051).
 
  -- Julian Andres Klode <jak at debian.org>  Wed, 03 Feb 2010 16:31:22 +0100
 

Modified: packages/unstable/gnome-main-menu/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/series?rev=22997&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/patches/series [utf-8] Sun Feb  7 16:38:52 2010
@@ -6,3 +6,4 @@
 respect-nautilus-spacial-setting.diff
 applet-category.diff
 fix-binutils-gold-build.diff
+use-xdg-user-directories.diff

Added: packages/unstable/gnome-main-menu/debian/patches/use-xdg-user-directories.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/use-xdg-user-directories.diff?rev=22997&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/use-xdg-user-directories.diff (added)
+++ packages/unstable/gnome-main-menu/debian/patches/use-xdg-user-directories.diff [utf-8] Sun Feb  7 16:38:52 2010
@@ -1,0 +1,27 @@
+From 62211f5510e55ec18abc265e3eb3907ca3b0d4e8 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <jak at debian.org>
+Date: Sun, 7 Feb 2010 16:41:46 +0100
+Subject: [PATCH] Use XDG user directory instead of hardcoding $HOME/Documents.
+
+Fixes #486548.
+---
+ main-menu/src/main-menu-ui.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/main-menu/src/main-menu-ui.c b/main-menu/src/main-menu-ui.c
+index 4a8fe12..bc43ef0 100644
+--- a/main-menu/src/main-menu-ui.c
++++ b/main-menu/src/main-menu-ui.c
+@@ -2332,7 +2332,8 @@ more_buttons_clicked_cb (GtkButton *button, gpointer user_data)
+ 		if (GTK_WIDGET (button) == priv->more_buttons [APPS_PAGE])
+ 			ditem_id = libslab_get_gconf_value (APP_BROWSER_GCONF_KEY);
+ 		else if (GTK_WIDGET (button) == priv->more_buttons [DOCS_PAGE]) {
+-			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 (! g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))
+ 				dir = g_strdup (g_get_home_dir ());
+-- 
+1.6.6.1
+