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

[Bilal Akhtar]

GTK3 version of https://code.launchpad.net/~bilalakhtar/gtk/fix-611011/+merge/39866 .

[Michael Terry (mterry)]

Looks good. Folding into my gtk3 natty push.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-02 18:38:36 +0000
+++ debian/changelog	2010-11-05 07:22:41 +0000
@@ -1,8 +1,14 @@
 gtk+3.0 (2.91.3-0ubuntu1~build2.1) UNRELEASED; urgency=low
 
+  [ Michael Terry ]
   * debian/libgtk3.0-0.symbols:
     - Fix some symbols that had debian versioning cruft
 
+  [ Bilal Akhtar ]
+  * 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)
+
  -- Michael Terry <[e-mail]>  Tue, 02 Nov 2010 14:37:54 -0400
 
 gtk+3.0 (2.91.3-0ubuntu1~build2) maverick; urgency=low

=== 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-05 07:22:41 +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
+@@ -785,6 +785,8 @@
+         priv->entry = gtk_entry_new ();
+         priv->combo = gtk_file_chooser_button_new (_("Select a folder"),
+                                                    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-11-02 14:33:46 +0000
+++ debian/patches/series	2010-11-05 07:22:41 +0000
@@ -17,3 +17,4 @@
 074_expose_active_menu_item.patch
 075_expose_gdkwidget_for_gtkrange.patch
 091_bugzilla_tooltip_refresh.patch
+092_default_to_xdg_document_dir.patch