webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 5 deletions

diff --git a/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h b/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h
index 8d8a952b4..e13cb2995 100644
--- a/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h
+++ b/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h
@@ -26,11 +26,11 @@
 #ifndef PrinterListGtk_h
 #define PrinterListGtk_h
 
-#ifdef HAVE_GTK_UNIX_PRINTING
+#if HAVE(GTK_UNIX_PRINTING)
 
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _GtkPrinter GtkPrinter;
 
@@ -38,7 +38,7 @@ namespace WebKit {
 
 class PrinterListGtk: public RefCounted<PrinterListGtk> {
 public:
-    static RefPtr<PrinterListGtk> shared();
+    static RefPtr<PrinterListGtk> getOrCreate();
     ~PrinterListGtk();
 
     GtkPrinter* findPrinter(const char*) const;
@@ -47,16 +47,17 @@ public:
 private:
     PrinterListGtk();
 
-    static gboolean enumeratePrintersFunction(GtkPrinter*);
     void addPrinter(GtkPrinter*);
+    bool isEnumeratingPrinters() const { return m_enumeratingPrinters; }
 
     Vector<GRefPtr<GtkPrinter>, 4> m_printerList;
     GtkPrinter* m_defaultPrinter;
+    bool m_enumeratingPrinters;
     static PrinterListGtk* s_sharedPrinterList;
 };
 
 } // namespace WebKit
 
-#endif // HAVE_GTK_UNIX_PRINTING
+#endif // HAVE(GTK_UNIX_PRINTING)
 
 #endif // WebPrintOperationGtk_h