Forgotten files

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 6591ac26d96a3f2eb2236f0e8486be3eb784962b..b10f4f605167af78e22dd927e251cbdbc872a935 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2601,6 +2601,7 @@ gtk_printer_is_virtual
 gtk_printer_accepts_pdf
 gtk_printer_accepts_ps
 gtk_printer_compare
+gtk_enumerate_printers
 #endif
 #endif
 #endif

diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index abf8a80f6407c12b6564073ffbb48a276c13e861..65f7e223bd4d2c16490070194b5dc816a3bb362a 100644 (file)
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -809,5 +809,151 @@ gtk_printer_compare (GtkPrinter *a, GtkPrinter *b)
     return g_ascii_strcasecmp (name_a, name_b);
 }
 
+
+typedef struct 
+{
+  GList *backends;
+  GtkPrinterFunc func;
+  gpointer data;
+  GDestroyNotify destroy;
+  GMainLoop *loop;
+} PrinterList;
+
+static void list_done_cb (GtkPrintBackend *backend, 
+                         PrinterList     *printer_list);
+
+static void
+stop_enumeration (PrinterList *printer_list)
+{
+  GList *list, *next;
+  GtkPrintBackend *backend;
+
+  for (list = printer_list->backends; list; list = next)
+    {
+      next = list->next;
+      backend = GTK_PRINT_BACKEND (list->data);
+      list_done_cb (backend, printer_list);
+    }
+
+  if (printer_list->destroy)
+    printer_list->destroy (printer_list->data);
+
+  if (printer_list->loop)
+    {    
+      g_main_loop_quit (printer_list->loop);
+
+      g_main_loop_unref (printer_list->loop);
+    }
+
+  g_free (printer_list);
+}
+
+static void
+list_added_cb (GtkPrintBackend *backend, 
+              GtkPrinter      *printer, 
+              PrinterList     *printer_list)
+{
+  if (printer_list->func (printer, printer_list->data))
+    stop_enumeration (printer_list);
+}
+
+static void
+list_done_cb (GtkPrintBackend *backend, 
+             PrinterList     *printer_list)
+{
+  printer_list->backends = g_list_remove (printer_list->backends, backend);
+  
+  g_signal_handlers_disconnect_by_func (backend, list_added_cb, printer_list);
+  g_signal_handlers_disconnect_by_func (backend, list_done_cb, printer_list);
+  
+  gtk_print_backend_destroy (backend);
+  g_object_unref (backend);
+
+  if (printer_list->backends == NULL)
+    stop_enumeration (printer_list);
+}
+
+static void
+list_printers_init (PrinterList     *printer_list,
+                   GtkPrintBackend *backend)
+{
+  GList *list;
+  GList *node;
+
+  list = gtk_print_backend_get_printer_list (backend);
+
+  for (node = list; node != NULL; node = node->next)
+    list_added_cb (backend, node->data, printer_list);
+
+  g_list_free (list);
+
+  if (gtk_print_backend_printer_list_is_done (backend))
+    {
+      printer_list->backends = g_list_remove (printer_list->backends, backend);
+      gtk_print_backend_destroy (backend);
+      g_object_unref (backend);
+    }
+  else
+    {
+      g_signal_connect (backend, "printer-added", 
+                       (GCallback) list_added_cb, 
+                       printer_list);
+      g_signal_connect (backend, "printer-list-done", 
+                       (GCallback) list_done_cb, 
+                       printer_list);
+    }
+
+}
+
+/**
+ * gtk_enumerate_printers:
+ * @func: a function to call for each printer
+ * @data: user data to pass to @func
+ * @destroy: function to call if @data is no longer needed
+ * @wait: if %TRUE, wait in a recursive mainloop until
+ *    all printers are enumerated; otherwise return early
+ *
+ * Calls a function for all #GtkPrinter<!-- -->s. If @func
+ * returns %TRUE, the enumeration is stopped.
+ *
+ * Since: 2.10
+ */
+void
+gtk_enumerate_printers (GtkPrinterFunc func,
+                       gpointer       data,
+                       GDestroyNotify destroy,
+                       gboolean       wait)
+{
+  PrinterList *printer_list;
+  GList *printers, *node, *next;
+  GtkPrintBackend *backend;
+
+  printer_list = g_new0 (PrinterList, 1);
+
+  printer_list->func = func;
+  printer_list->data = data;
+  printer_list->destroy = destroy;
+
+  if (g_module_supported ())
+    printer_list->backends = gtk_print_backend_load_modules ();
+
+  for (node = printer_list->backends; node != NULL; node = next)
+    {
+      next = node->next;
+      backend = GTK_PRINT_BACKEND (node->data);
+      list_printers_init (printer_list, backend);
+    }
+
+  if (wait && printer_list->backends)
+    {
+      printer_list->loop = g_main_loop_new (NULL, FALSE);
+
+      GDK_THREADS_LEAVE ();  
+      g_main_loop_run (printer_list->loop);
+      GDK_THREADS_ENTER ();  
+    }
+}
+
+
 #define __GTK_PRINTER_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index c6121072554be82492da61680ff16bb98651b129..7454f0e424787164417f8e3ee1d3da38635b0963 100644 (file)
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -83,6 +83,14 @@ gboolean                 gtk_printer_accepts_ps        (GtkPrinter      *printer
 gint                     gtk_printer_compare           (GtkPrinter *a,
                                                        GtkPrinter *b);
 
+typedef gboolean (*GtkPrinterFunc) (GtkPrinter *printer,
+                                   gpointer    data);
+
+void                     gtk_enumerate_printers        (GtkPrinterFunc   func,
+                                                       gpointer         data,
+                                                       GDestroyNotify   destroy,
+                                                       gboolean         wait);
+                                                     
 G_END_DECLS
 
 #endif /* __GTK_PRINTER_H__ */