rpms/gtk2/F-10 default_printer.patch,1.1,1.2 gtk2.spec,1.341,1.342

[Marek Kašík]

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1428

Modified Files:
	default_printer.patch gtk2.spec 
Log Message:
* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-3
- modify default_printer.patch to show a network default printer
  in the case of no local default printer
- Resolves: #478400


default_printer.patch:

Index: default_printer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/default_printer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default_printer.patch	19 Jan 2009 13:41:29 -0000	1.1
+++ default_printer.patch	28 Jan 2009 14:45:18 -0000	1.2
@@ -1,12 +1,76 @@
 --- modules/printbackends/cups/gtkprintbackendcups.c	2009-01-07 17:33:32.000000000 +0100
-+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-19 13:20:05.000000000 +0100
-@@ -1247,7 +1247,8 @@ cups_request_printer_list_cb (GtkPrintBa
-         else if (strcmp (attr->name, "printer-type") == 0)
-           {
-             got_printer_type = TRUE;
--            if (attr->values[0].integer & 0x00020000)
-+            if ((attr->values[0].integer & 0x00020000) &&
-+               !(attr->values[0].integer & 0x00000002))
++++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-21 14:16:18.000000000 +0100
+@@ -1047,6 +1047,7 @@ cups_request_printer_list_cb (GtkPrintBa
+   ipp_t *response;
+   gboolean list_has_changed;
+   GList *removed_printer_checklist;
++  gchar *remote_default_printer = NULL;
+ 
+   GDK_THREADS_ENTER ();
+ 
+@@ -1134,6 +1135,7 @@ cups_request_printer_list_cb (GtkPrintBa
+       gboolean is_accepting_jobs = TRUE;
+       gboolean default_printer = FALSE;
+       gboolean got_printer_type = FALSE;
++      gboolean remote_printer = FALSE;
+       
+       /* Skip leading attributes until we hit a printer...
+        */
+@@ -1251,6 +1253,11 @@ cups_request_printer_list_cb (GtkPrintBa
                default_printer = TRUE;
              else
                default_printer = FALSE;
++
++            if (attr->values[0].integer & 0x00000002)
++              remote_printer = TRUE;
++            else
++              remote_printer = FALSE;
+           }
+         else
+ 	  {
+@@ -1274,8 +1281,16 @@ cups_request_printer_list_cb (GtkPrintBa
+         {
+           if (default_printer && !cups_backend->got_default_printer)
+             {
+-              cups_backend->got_default_printer = TRUE;
+-              cups_backend->default_printer = g_strdup (printer_name);
++              if (!remote_printer)
++                {
++                  cups_backend->got_default_printer = TRUE;
++                  cups_backend->default_printer = g_strdup (printer_name);
++                }
++              else
++                {
++                  if (remote_default_printer == NULL)
++                    remote_default_printer = g_strdup (printer_name);
++                }
+             }
+         }
+       else
+@@ -1496,6 +1511,26 @@ done:
+   
+   gtk_print_backend_set_list_done (backend);
+ 
++  if (!cups_backend->got_default_printer && remote_default_printer != NULL)
++    {
++      cups_backend->default_printer = g_strdup (remote_default_printer);
++      cups_backend->got_default_printer = TRUE;
++      g_free (remote_default_printer);
++
++      if (cups_backend->default_printer != NULL)
++        {
++          GtkPrinter *default_printer = NULL;
++          default_printer = gtk_print_backend_find_printer (GTK_PRINT_BACKEND (cups_backend),
++                                                            cups_backend->default_printer);
++          if (default_printer != NULL)
++            {
++              gtk_printer_set_is_default (default_printer, TRUE);
++              g_signal_emit_by_name (GTK_PRINT_BACKEND (cups_backend),
++                                     "printer-status-changed", default_printer);
++            }
++        }
++    }
++
+   GDK_THREADS_LEAVE ();
+ }
+ 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- gtk2.spec	19 Jan 2009 13:41:29 -0000	1.341
+++ gtk2.spec	28 Jan 2009 14:45:18 -0000	1.342
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -300,6 +300,11 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-3
+- modify default_printer.patch to show a network default printer
+  in the case of no local default printer
+- Resolves: #478400
+
 * Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-2
 - fix a problem with default printer in a network
 - Resolves: #478400