Merge lp:~bilalakhtar/gtk/fix-611011 into lp:~ubuntu-desktop/gtk/ubuntu

[Bilal Akhtar]

This branch fixes bug #611011 .

[lp:~bilalakhtar/gtk/fix-611011]

84. By Bilal Akhtar on 2010-11-02

Made tiny changes

[Robert Ancell (robert-ancell)]

review: Approve

[Bilal Akhtar (bilalakhtar)]

Thanks Robert for the upload! This patch has been uploaded to Ubuntu Natty.

Now the wait is for this merge to land in the ~ubuntu-desktop branch.

(wanted to make this clear for other sponsors)

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-27 21:13:48 +0000
+++ debian/changelog	2010-11-02 17:31:11 +0000
@@ -1,3 +1,11 @@
+gtk+2.0 (2.22.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/092_default_to_xdg_document_dir.patch:
+    - Use $XDG_DOCUMENTS_DIR as default directory rather than the home
+      directory for the 'Print to File' function. (LP: #611011)
+
+ -- Bilal Akhtar <[e-mail]>  Tue, 02 Nov 2010 19:15:45 +0300
+
 gtk+2.0 (2.22.0-0ubuntu1) maverick; urgency=low
 
   * New stable version

=== added file 'debian/patches/092_default_to_xdg_document_dir.patch'
--- debian/patches/092_default_to_xdg_document_dir.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/092_default_to_xdg_document_dir.patch	2010-11-02 17:31:11 +0000
@@ -0,0 +1,17 @@
+Description: Use XDG_DOCUMENTS_DIR as default for 'Print to File'
+ This patch uses $XDG_DOCUMENTS_DIR as the default directory rather
+ than the home directory when the user selects Print to File in the
+ GtkPrinterOptionWidget.
+Author: Bilal Akhtar <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/611011
+--- a/gtk/gtkprinteroptionwidget.c
++++ b/gtk/gtkprinteroptionwidget.c
+@@ -794,6 +794,8 @@
+         priv->entry = gtk_entry_new ();
+         priv->combo = gtk_file_chooser_button_new (source->display_text,
+                                                    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
++        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (priv->combo),
++                                                   g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+ 
+         g_object_set (priv->combo, "local-only", FALSE, NULL);
+         gtk_entry_set_activates_default (GTK_ENTRY (priv->entry),

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-18 15:15:04 +0000
+++ debian/patches/series	2010-11-02 17:31:11 +0000
@@ -20,3 +20,4 @@
 071_no_offscreen_widgets_grabbing.patch
 072_indicator_menu_update.patch
 091_bugzilla_tooltip_refresh.patch
+092_default_to_xdg_document_dir.patch