r15487 - in /packages/unstable/libgnomecups/debian: changelog patches/25_browsed_ppds.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Apr  6 20:58:09 2008
New Revision: 15487

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15487
Log:
New patch, 25_browsed_ppds, fix PPD retrieval for printers picked up with
cups browsing; from Ubuntu; by Florian Pflug; see Launchpad #52867.

Added:
    packages/unstable/libgnomecups/debian/patches/25_browsed_ppds.patch
Modified:
    packages/unstable/libgnomecups/debian/changelog

Modified: packages/unstable/libgnomecups/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomecups/debian/changelog?rev=15487&op=diff
==============================================================================
--- packages/unstable/libgnomecups/debian/changelog (original)
+++ packages/unstable/libgnomecups/debian/changelog Sun Apr  6 20:58:09 2008
@@ -1,3 +1,10 @@
+libgnomecups (0.2.3-2) unstable; urgency=low
+
+  * New patch, 25_browsed_ppds, fix PPD retrieval for printers picked up with
+    cups browsing; from Ubuntu; by Florian Pflug; see Launchpad #52867.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 06 Apr 2008 22:55:05 +0200
+
 libgnomecups (0.2.3-1) unstable; urgency=low
 
   [ Loic Minier ]

Added: packages/unstable/libgnomecups/debian/patches/25_browsed_ppds.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomecups/debian/patches/25_browsed_ppds.patch?rev=15487&op=file
==============================================================================
--- packages/unstable/libgnomecups/debian/patches/25_browsed_ppds.patch (added)
+++ packages/unstable/libgnomecups/debian/patches/25_browsed_ppds.patch Sun Apr  6 20:58:09 2008
@@ -1,0 +1,53 @@
+fix PPD retrieval for printers picked up with cups browsing; from Ubuntu; by
+Florian Pflug; see Launchpad #52867
+
+diff -Nur libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c libgnomecups-0.2.2.new/libgnomecups/gnome-cups-printer.c
+--- libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c	2006-09-18 10:23:13.000000000 +0200
++++ libgnomecups-0.2.2.new/libgnomecups/gnome-cups-printer.c	2006-09-18 10:23:18.000000000 +0200
+@@ -1105,7 +1105,7 @@
+ 		return NULL;
+ 	}
+ 
+-	host = _gnome_cups_printer_get_host (printer);
++	host = _gnome_cups_printer_get_ppd_host (printer);
+ 	ppdpath = get_ppd_uri_path (printer);
+ 
+ 	gnome_cups_request_file (host, ppdpath, fd, &error);
+@@ -1976,3 +1976,26 @@
+ 	
+ 	return host;
+ }
++
++gchar *
++_gnome_cups_printer_get_ppd_host (GnomeCupsPrinter *printer)
++{
++	gchar *host = NULL;
++
++	if (printer->details->printer_uri) {
++		gchar *x, *y;
++
++		x = strstr (printer->details->printer_uri, "://");
++
++		if (x) {
++			x += 3;
++			y = strpbrk (x, ":/");
++			if (y)
++				host = g_strndup (x, y - x);
++			else 
++				host = g_strdup (x);
++		}
++	}
++	
++	return host;
++}
+diff -Nur libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.h libgnomecups-0.2.2.new/libgnomecups/gnome-cups-printer.h
+--- libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.h	2005-03-04 14:43:33.000000000 +0100
++++ libgnomecups-0.2.2.new/libgnomecups/gnome-cups-printer.h	2006-09-18 10:23:18.000000000 +0200
+@@ -184,6 +184,7 @@
+ /* Private */
+ void _gnome_cups_printer_init (void);
+ gchar *_gnome_cups_printer_get_host (GnomeCupsPrinter *printer);
++gchar *_gnome_cups_printer_get_ppd_host (GnomeCupsPrinter *printer);
+ 
+ G_END_DECLS
+