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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-01-05 22:21:59 +0000 (Thu, 05 Jan 2012)
New Revision: 6301

Added:
   desktop/trunk/xfprint4/debian/patches/06_fix-xfconf-backend-key.patch
Modified:
   desktop/trunk/xfprint4/debian/changelog
   desktop/trunk/xfprint4/debian/patches/series
Log:
* debian/patches:
  - 06_fix-xfconf-backend-key.patch: added, fix a typo in the name of the
    xfconf key retrieved to know the printing backend.            lp: #472656

Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog	2012-01-05 21:41:24 UTC (rev 6300)
+++ desktop/trunk/xfprint4/debian/changelog	2012-01-05 22:21:59 UTC (rev 6301)
@@ -1,3 +1,11 @@
+xfprint4 (4.6.1-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 06_fix-xfconf-backend-key.patch: added, fix a typo in the name of the
+      xfconf key retrieved to know the printing backend.            lp: #472656
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 05 Jan 2012 23:15:07 +0100
+
 xfprint4 (4.6.1-2) unstable; urgency=low
 
   [ Stefan Ott ]

Added: desktop/trunk/xfprint4/debian/patches/06_fix-xfconf-backend-key.patch
===================================================================
--- desktop/trunk/xfprint4/debian/patches/06_fix-xfconf-backend-key.patch	                        (rev 0)
+++ desktop/trunk/xfprint4/debian/patches/06_fix-xfconf-backend-key.patch	2012-01-05 22:21:59 UTC (rev 6301)
@@ -0,0 +1,38 @@
+Description: Fix Xfconf key name
+ Query the proper xfconf property to know which type of backend to use,
+ and remove the extra trailing comma which made the warning message shown
+ regardless of backend loading result
+Origin: other, https://bugzilla.xfce.org/attachment.cgi?id=3318
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=5160
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xfprint4/+bug/472656
+
+--- a/xfprint-manager/main.c.orig	Tue Feb 24 22:34:16 2009
++++ b/xfprint-manager/main.c	Mon Jan  3 13:50:06 2011
+@@ -41,6 +41,7 @@
+ #include <libxfprint/printer-list-window.h>
+ 
+ #define CHANNEL         "xfprint"
++#define PROP_PRINTING_SYSTEM  "/printing-system"
+ 
+ extern void mainwin_setup (void);
+ 
+@@ -66,15 +67,15 @@ main (int argc, char **argv)
+   channel = xfconf_channel_new (CHANNEL);
+   if (channel) {
+ 
+-    if (xfconf_channel_has_property (channel, "/XfPrint/system")) {
+-      const gchar *system_name = xfconf_channel_get_string (channel, "/XfPrint/system", "none");
++    if (xfconf_channel_has_property (channel, PROP_PRINTING_SYSTEM)) {
++      const gchar *system_name = xfconf_channel_get_string (channel, PROP_PRINTING_SYSTEM, "none");
+       if (g_ascii_strcasecmp (system_name, "none") != 0) {
+         ps = printing_system_new (system_name);
+-        if (ps == NULL);
++        if (ps == NULL)
+           g_warning ("Unable to load printing system module %s", system_name);
+       }
+     } else {
+-      g_warning ("%s: XfPrint/system is not set", PACKAGE);
++      g_warning ("%s: %s is not set", PACKAGE, PROP_PRINTING_SYSTEM);
+     }
+   }
+ 

Modified: desktop/trunk/xfprint4/debian/patches/series
===================================================================
--- desktop/trunk/xfprint4/debian/patches/series	2012-01-05 21:41:24 UTC (rev 6300)
+++ desktop/trunk/xfprint4/debian/patches/series	2012-01-05 22:21:59 UTC (rev 6301)
@@ -3,3 +3,4 @@
 03_fix-wl-as-needed.patch
 04_fix-implicit-dso-linking.patch
 05_fix-g_print-format.patch
+06_fix-xfconf-backend-key.patch