rpms/gtk2/FC-6 gtk+-2.10.4-panel-crash.patch, NONE, 1.1 gtk+-2.10.4-printernames.patch, NONE, 1.1 gtk2.spec, 1.191, 1.192

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv22683

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.4-panel-crash.patch gtk+-2.10.4-printernames.patch 
Log Message:
fix some issues


gtk+-2.10.4-panel-crash.patch:
 gtkrecentmanager.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gtk+-2.10.4-panel-crash.patch ---
--- gtk+-2.10.4/gtk/gtkrecentmanager.c.panel-crash	2006-11-22 10:35:27.000000000 -0500
+++ gtk+-2.10.4/gtk/gtkrecentmanager.c	2006-11-22 10:35:57.000000000 -0500
@@ -2553,7 +2553,7 @@
       
       local_file = g_filename_from_uri (uri, NULL, NULL);
       
-      if (local_file != NULL)
+      if (local_file)
         {
           name = g_filename_display_basename (local_file);
           validated = TRUE;
@@ -2561,7 +2561,8 @@
 		
       g_free (local_file);
     } 
-  else
+  
+  if (!name)
     {
       gchar *method;
       gchar *local_file;

gtk+-2.10.4-printernames.patch:
 gtkprintbackendcups.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gtk+-2.10.4-printernames.patch ---
--- gtk+-2.10.4/modules/printbackends/cups/gtkprintbackendcups.c.cupslongnames	2006-11-24 14:15:28.000000000 +0000
+++ gtk+-2.10.4/modules/printbackends/cups/gtkprintbackendcups.c	2006-11-24 14:15:39.000000000 +0000
@@ -1076,11 +1076,11 @@
 			resource);
 #endif
 
-          if (member_uris && !strncmp (resource, "/printers/", 10))
+          if (!strncmp (resource, "/printers/", 10))
 	    {
 	      cups_printer->ppd_name = g_strdup (resource + 10);
               GTK_NOTE (PRINTING,
-                        g_print ("CUPS Backend: Setting ppd name '%s' for printer class '%s'\n", cups_printer->ppd_name, printer_name));
+                        g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, printer_name));
             }
 
 	  gethostname (uri, sizeof(uri));


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk2.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- gtk2.spec	16 Nov 2006 13:13:48 -0000	1.191
+++ gtk2.spec	25 Nov 2006 05:26:42 -0000	1.192
@@ -38,6 +38,8 @@
 Patch8: gtk+-2.10.4-deadlock.patch
 Patch9: gtk+-2.10.4-path-check.patch
 Patch10: gtk+-2.10.4-strncpy.patch
+Patch11: gtk+-2.10.4-panel-crash.patch
+Patch12: gtk+-2.10.4-printernames.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -128,6 +130,8 @@
 %patch8 -p1 -b .deadlock
 %patch9 -p1 -b .path-check
 %patch10 -p1 -b .strncpy
+%patch11 -p1 -b .panel-crash
+%patch12 -p1 -b .printernames
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -301,6 +305,10 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sat Nov 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-6
+- Fix a recent-files related crash
+- Fix a problem with the handling of printer names
+
 * Thu Nov 16 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-5
 - Avoid a possible segfault (#215933)