rpms/desktop-printing/devel eggcups-dbus-send-null-crash.patch, NONE, 1.1 desktop-printing-0.19-dbus-api.patch, 1.1, 1.2 desktop-printing.spec, 1.48, 1.49

[fedora-cvs-commits at redhat.com]

Author: johnp

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

Modified Files:
	desktop-printing-0.19-dbus-api.patch desktop-printing.spec 
Added Files:
	eggcups-dbus-send-null-crash.patch 
Log Message:
- Add patch for fixing a crasher when plugging in a printer



eggcups-dbus-send-null-crash.patch:
 ec-driver-prompt.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE eggcups-dbus-send-null-crash.patch ---
Index: ec-driver-prompt.c
===================================================================
RCS file: /cvs/gnome/eggcups/ec-driver-prompt.c,v
retrieving revision 1.15
diff -u -r1.15 ec-driver-prompt.c
--- ec-driver-prompt.c	25 Feb 2005 05:02:35 -0000	1.15
+++ ec-driver-prompt.c	12 Jan 2006 00:44:23 -0000
@@ -214,6 +214,7 @@
 	const gchar *make, *model, *printer_udi, *printer_name;
 	gchar *return_make, *return_model;
 	DBusMessage *return_message;
+	gboolean has_user_drivers;
 
 	rb_debug ("Getting user driver...");
 
@@ -229,22 +230,25 @@
 		return;
 	}
 
-	find_user_driver (make, model, &return_make, &return_model);
+	has_user_drivers = find_user_driver (make, model, &return_make, &return_model);
 
 	return_message = dbus_message_new_method_return (message);
 
-	if (return_message != NULL) {
+	if (return_message == NULL)
+		goto out;
+
+	if (has_user_drivers) {
 		DBusMessageIter iter;
 		dbus_message_iter_init_append (return_message, &iter);
 		
 		dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &return_make);
 		dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &return_model);
-	} else {
-		dbus_connection_send (connection, return_message, NULL);
-		dbus_connection_flush (connection);
-		dbus_message_unref (return_message);
 	}
+	
+	dbus_connection_send (connection, return_message, NULL);
+	dbus_message_unref (return_message);
 
+out:
 	g_free (return_make);
 	g_free (return_model);
 }

desktop-printing-0.19-dbus-api.patch:
 main.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: desktop-printing-0.19-dbus-api.patch
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing-0.19-dbus-api.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- desktop-printing-0.19-dbus-api.patch	1 Dec 2005 23:02:54 -0000	1.1
+++ desktop-printing-0.19-dbus-api.patch	12 Jan 2006 00:58:11 -0000	1.2
@@ -1,5 +1,5 @@
---- desktop-printing-0.19/eggcups-0.19/main.c.dbus-api	2005-12-01 17:59:29.000000000 -0500
-+++ desktop-printing-0.19/eggcups-0.19/main.c	2005-12-01 17:59:40.000000000 -0500
+--- eggcups-0.19/main.c.dbus-api	2005-12-01 17:59:29.000000000 -0500
++++ eggcups-0.19/main.c	2005-12-01 17:59:40.000000000 -0500
 @@ -154,7 +154,7 @@
  	}
  	acquisition_result = dbus_bus_request_name (dbus,


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- desktop-printing.spec	10 Dec 2005 09:11:19 -0000	1.48
+++ desktop-printing.spec	12 Jan 2006 00:58:11 -0000	1.49
@@ -5,13 +5,14 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 4.1
+Release: 5 
 License: GPL
 Group: Applications/File
 # total lie
 Source0: http://web.verbum.org/eggcups/eggcups-%{version}.tar.bz2
 Source1: gnome-default-printer.png
 Patch0: desktop-printing-0.19-dbus-api.patch
+Patch1: eggcups-dbus-send-null-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: redhat-menus
@@ -32,7 +33,10 @@
 
 %prep
 %setup -q -c
+pushd eggcups-%{version}
 %patch0 -p1 -b .dbus-api
+%patch1 -p0 -b .dbus-null-crash
+popd
 
 %build
 pushd eggcups-%{version}
@@ -83,6 +87,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Wed Jan 11 2006 John (J5) Palmieri <johnp at redhat.com> - 0.19-5
+- Add patch for fixing a crasher when plugging in a printer
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0.19-4.1
 - rebuilt