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

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-05-01 12:29:52 +0000 (Thu, 01 May 2008)
New Revision: 1973

Added:
   desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch
Modified:
   desktop/trunk/xfprint4/debian/changelog
   desktop/trunk/xfprint4/debian/control
   desktop/trunk/xfprint4/debian/patches/series
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
  - 03_check-default-printer added, fix segfault when no default printer is
    selected (even with lpr backend). 
    Xfce #3816, #4044, r26588.                                closes: #472066

Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog	2008-04-30 13:43:53 UTC (rev 1972)
+++ desktop/trunk/xfprint4/debian/changelog	2008-05-01 12:29:52 UTC (rev 1973)
@@ -1,9 +1,13 @@
 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
+  * debian/patches: 
+    - 02_refresh-new-settings added, refresh settings when they are set, not
+      only at start time. Patch from Fabien Coutant.            closes: #477144
+    - 03_check-default-printer added, fix segfault when no default printer is
+      selected (even with lpr backend). 
+      Xfce #3816, #4044, r26588.                                closes: #472066
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 30 Apr 2008 14:49:00 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 01 May 2008 13:53:17 +0200
 
 xfprint4 (4.4.2-2) unstable; urgency=low
 

Modified: desktop/trunk/xfprint4/debian/control
===================================================================
--- desktop/trunk/xfprint4/debian/control	2008-04-30 13:43:53 UTC (rev 1972)
+++ desktop/trunk/xfprint4/debian/control	2008-05-01 12:29:52 UTC (rev 1973)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), a2ps, lpr, libcupsys2-dev, chrpath, sharutils, quilt
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), a2ps, lpr, libcupsys2-dev, chrpath, sharutils, quilt, 
 Standards-Version: 3.7.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfprint4/

Added: desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch
===================================================================
--- desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch	                        (rev 0)
+++ desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch	2008-05-01 12:29:52 UTC (rev 1973)
@@ -0,0 +1,13 @@
+Index: xfce_4_4/xfprint/print_dialog.c
+===================================================================
+--- xfce_4_4/xfprint/print_dialog.c	(revision 26587)
++++ xfce_4_4/xfprint/print_dialog.c	(revision 26588)
+@@ -406,7 +406,7 @@
+                         PRINTER_NAME_COLUMN, printer_data->name, 
+                         PRINTER_ALIAS_COLUMN, printer_data->alias ? printer_data->alias : "", -1);
+     
+-    if (!default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
++    if (default_printer && !default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
+       default_printer_found = TRUE;
+       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox_printer), &iter);
+     }

Modified: desktop/trunk/xfprint4/debian/patches/series
===================================================================
--- desktop/trunk/xfprint4/debian/patches/series	2008-04-30 13:43:53 UTC (rev 1972)
+++ desktop/trunk/xfprint4/debian/patches/series	2008-05-01 12:29:52 UTC (rev 1973)
@@ -1 +1,2 @@
 01_debug-lpr-command.patch
+03_check-default-printer.patch