[Pkg-xfce-commits] r1967 - in desktop/trunk/xfprint4/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-04-30 13:21:50 +0000 (Wed, 30 Apr 2008)
New Revision: 1967

Added:
   desktop/trunk/xfprint4/debian/patches/02_refresh-new-settings.patch
Modified:
   desktop/trunk/xfprint4/debian/changelog
Log:
debian/patches: 02_refresh-new-settings added, refresh settings when they
are set, not only at start time. Patch from Fabien Coutant. closes: #477144

Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog	2008-04-30 12:29:13 UTC (rev 1966)
+++ desktop/trunk/xfprint4/debian/changelog	2008-04-30 13:21:50 UTC (rev 1967)
@@ -1,3 +1,10 @@
+xfprint4 (4.4.2-3) UNRELEASED; urgency=low
+
+  * debian/patches: 02_refresh-new-settings added, refresh settings when they
+    are set, not only at start time. Patch from Fabien Coutant. closes: #477144
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 30 Apr 2008 14:49:00 +0200
+
 xfprint4 (4.4.2-2) unstable; urgency=low
 
   * debian/rules: 

Added: desktop/trunk/xfprint4/debian/patches/02_refresh-new-settings.patch
===================================================================
--- desktop/trunk/xfprint4/debian/patches/02_refresh-new-settings.patch	                        (rev 0)
+++ desktop/trunk/xfprint4/debian/patches/02_refresh-new-settings.patch	2008-04-30 13:21:50 UTC (rev 1967)
@@ -0,0 +1,49 @@
+--- xfprint-4.4.2.orig/xfprint/print_dialog.c	2007-11-17 20:31:59.000000000 +0100
++++ xfprint-4.4.2+fco/xfprint/print_dialog.c	2008-04-21 13:19:57.000000000 +0200
+@@ -422,6 +422,19 @@
+   printers_free (printers);
+ }
+ 
++static void
++print_dialog_get_settings (XfprintSettings *settings, PrintDialog * dlg)
++{
++  PrintDialogPrivate *priv = PRINT_DIALOG_GET_PRIVATE (dlg);
++
++  sheets_page_get_settings (SHEETS_PAGE (priv->sheets), &settings->sheets);
++  vpages_page_get_settings (VPAGES_PAGE (priv->vpages), &settings->vpages);
++  pprint_page_get_settings (PPRINT_PAGE (priv->pprint), &settings->pprint);
++  input_page_get_settings (INPUT_PAGE (priv->input), &settings->input);
++  head_page_get_settings (HEAD_PAGE (priv->head), &settings->headings);
++  settings->copies = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->copies));
++}
++
+ /*************/
+ /* callbacks */
+ /*************/
+@@ -437,6 +450,7 @@
+     XfprintFilter *filter;
+     
+     filters = xfprint_filterlist_new ();
++    print_dialog_get_settings (priv->settings, dlg);
+     
+     if (GTK_WIDGET_IS_SENSITIVE (priv->entry_file)) {
+       ofile = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_file)));
+@@ -495,17 +509,11 @@
+ static void
+ button_save_clicked_cb (GtkWidget * widget, PrintDialog *dlg)
+ {
+-  PrintDialogPrivate *priv = PRINT_DIALOG_GET_PRIVATE (dlg);
+   XfprintSettings *settings;
+   
+   settings = xfprintsettings_defaults ();
+ 
+-  sheets_page_get_settings (SHEETS_PAGE (priv->sheets), &settings->sheets);
+-  vpages_page_get_settings (VPAGES_PAGE (priv->vpages), &settings->vpages);
+-  pprint_page_get_settings (PPRINT_PAGE (priv->pprint), &settings->pprint);
+-  input_page_get_settings (INPUT_PAGE (priv->input), &settings->input);
+-  head_page_get_settings (HEAD_PAGE (priv->head), &settings->headings);
+-  settings->copies = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->copies));
++  print_dialog_get_settings (settings, dlg);
+ 
+   xfprintsettings_save (settings);
+   xfprintsettings_free (settings);