rpms/desktop-printing/FC-5 eggcups-xml-parsing.patch, NONE, 1.1 desktop-printing.spec, 1.59, 1.60

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/desktop-printing/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6929

Modified Files:
	desktop-printing.spec 
Added Files:
	eggcups-xml-parsing.patch 
Log Message:
* Wed Jan 24 2007 Tim Waugh <twaugh at redhat.com>
- Fixed parsing of foomatic XML (bug #219283).
- Resolves: rhbz#219283


eggcups-xml-parsing.patch:
 ec-driver-prompt-dialog.c |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

--- NEW FILE eggcups-xml-parsing.patch ---
--- eggcups-0.19/ec-driver-prompt-dialog.c.xml-parsing	2006-12-12 16:46:41.000000000 +0000
+++ eggcups-0.19/ec-driver-prompt-dialog.c	2006-12-12 16:47:23.000000000 +0000
@@ -305,19 +305,6 @@
 	return g_object_new (EC_TYPE_DRIVER_PROMPT_DIALOG, NULL);
 }
 
-/*
-* Some makes in the Foomatic database are in abreviated form
-* and must be translated back to a more readable name
-*/
-static gchar *
-translate_make (gchar *make)
-{
-	if (strcmp (make, "HP") == 0)
-		return g_strdup ("Hewlett-Packard");
-	else
-		return g_strdup (make);
-}
-
 static gint
 default_tree_sort_on_first_col_func (GtkTreeModel *model,
                                      GtkTreeIter *a,
@@ -613,14 +600,13 @@
 
 	switch (dlg->priv->parse_state) {
 	case PARSE_STATE_MAKE:
-		g_free (dlg->priv->current_driver.make);
-		dlg->priv->current_driver.make = translate_make (text);
-		g_free (text);
+		if (!dlg->priv->current_driver.make)
+			dlg->priv->current_driver.make = text;
 		break;
 	case PARSE_STATE_MODEL:
-		g_free (dlg->priv->current_driver.model);
-		dlg->priv->current_driver.model = text;
+		if (!dlg->priv->current_driver.model)
+			dlg->priv->current_driver.model = text;
 		break;
 	case PARSE_STATE_DRIVER:
 		g_free (dlg->priv->current_driver.driver);


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/FC-5/desktop-printing.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- desktop-printing.spec	24 Jan 2007 14:34:49 -0000	1.59
+++ desktop-printing.spec	24 Jan 2007 14:36:53 -0000	1.60
@@ -16,6 +16,7 @@
 Patch2: eggcups-cups12.patch
 Patch3: eggcups-api-name.patch
 Patch4: eggcups-cancel-remote-job.patch
+Patch5: eggcups-xml-parsing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: redhat-menus
@@ -45,6 +46,7 @@
 %patch2 -p1 -b .cups12
 %patch3 -p1 -b .api-name
 %patch4 -p1 -b .cancel-remote-job
+%patch5 -p1 -b .xml-parsing
 popd
 
 %build
@@ -98,6 +100,7 @@
 
 %changelog
 * Wed Jan 24 2007 Tim Waugh <twaugh at redhat.com>
+- Fixed parsing of foomatic XML (bug #219283).
 - Removed broken perl scripting line (bug #214619).
 - Fixed remote job cancellation (bug #218945).
 - Fixed HAL printer interface API name (bug #214619).