GNOME.org
 

[gnome-cups-manager] Make this compile with single glib/gtk+ includes etc.

commit 24d5dd4f3d15bc6662575f9a606fda132648af7a
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Sep 2 13:19:27 2009 +0200

    Make this compile with single glib/gtk+ includes etc.

 gnome-cups-add/add-printer.c            |    6 ++----
 gnome-cups-add/druid-helper.c           |    7 ++-----
 gnome-cups-manager/eggiconlist.c        |   13 +++++--------
 gnome-cups-manager/eggiconlist.h        |   13 +++++++------
 gnome-cups-manager/eggtrayicon.h        |    2 +-
 gnome-cups-manager/gnome-cups-icon.c    |    7 ++++---
 gnome-cups-manager/gnome-cups-manager.c |    7 ++++---
 gnome-cups-manager/gnome-printer-list.c |    6 +-----
 gnome-cups-manager/printer-properties.c |   28 ++++++----------------------
 gnome-cups-manager/tray.c               |   15 +++++----------
 gnome-cups-manager/view-printers.c      |    6 +++---
 gnome-cups-manager/view-queue.c         |   16 +++-------------
 libgnomecups/gnome-cups-i18n.c          |    2 +-
 libgnomecups/gnome-cups-permission.c    |    7 +++++--
 libgnomecups/gnome-cups-permission.h    |    3 ++-
 libgnomecups/gnome-cups-ui-connection.c |   13 +++----------
 libgnomecups/gnome-cups-ui-connection.h |    3 ++-
 libgnomecups/gnome-cups-ui-driver.c     |   20 +++-----------------
 libgnomecups/gnome-cups-ui-driver.h     |    3 ++-
 libgnomecups/gnome-cups-ui-init.c       |    7 +------
 libgnomecups/gnome-cups-ui-init.h       |    2 +-
 libgnomecups/gnome-cups-ui-print.c      |    4 +++-
 libgnomecups/gnome-cups-ui-print.h      |    3 ++-
 libgnomecups/gnome-cups-ui-util.c       |    6 +-----
 libgnomecups/gnome-cups-ui-util.h       |    2 +-
 po/LINGUAS                              |    1 -
 26 files changed, 70 insertions(+), 132 deletions(-)
---
diff --git a/gnome-cups-add/add-printer.c b/gnome-cups-add/add-printer.c
index 2e2b744..d7b97c9 100644
--- a/gnome-cups-add/add-printer.c
+++ b/gnome-cups-add/add-printer.c
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktreeview.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-druid.h>
diff --git a/gnome-cups-add/druid-helper.c b/gnome-cups-add/druid-helper.c
index 7b2374c..bf0e3d8 100644
--- a/gnome-cups-add/druid-helper.c
+++ b/gnome-cups-add/druid-helper.c
@@ -4,11 +4,8 @@
 #include <string.h>
 #include <libgnomecups/gnome-cups-ui-driver.h>
 
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktreeview.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-druid.h>
diff --git a/gnome-cups-manager/eggiconlist.c b/gnome-cups-manager/eggiconlist.c
index 7401ee1..1a5254d 100644
--- a/gnome-cups-manager/eggiconlist.c
+++ b/gnome-cups-manager/eggiconlist.c
@@ -20,11 +20,10 @@
 #include "eggiconlist.h"
 
 #include <string.h>
+
+#include <glib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 #include "eggintl.h"
 #include "eggmarshalers.h"
@@ -1297,8 +1296,7 @@ egg_icon_list_set_adjustments (EggIconList   *icon_list,
   if (icon_list->priv->hadjustment != hadj)
     {
       icon_list->priv->hadjustment = hadj;
-      g_object_ref (icon_list->priv->hadjustment);
-      gtk_object_sink (GTK_OBJECT (icon_list->priv->hadjustment));
+      g_object_ref_sink (icon_list->priv->hadjustment);
 
       g_signal_connect (icon_list->priv->hadjustment, "value_changed",
 			G_CALLBACK (egg_icon_list_adjustment_changed),
@@ -1309,8 +1307,7 @@ egg_icon_list_set_adjustments (EggIconList   *icon_list,
   if (icon_list->priv->vadjustment != vadj)
     {
       icon_list->priv->vadjustment = vadj;
-      g_object_ref (icon_list->priv->vadjustment);
-      gtk_object_sink (GTK_OBJECT (icon_list->priv->vadjustment));
+      g_object_ref_sink (icon_list->priv->vadjustment);
 
       g_signal_connect (icon_list->priv->vadjustment, "value_changed",
 			G_CALLBACK (egg_icon_list_adjustment_changed),
diff --git a/gnome-cups-manager/eggiconlist.h b/gnome-cups-manager/eggiconlist.h
index ef143a4..e416cea 100644
--- a/gnome-cups-manager/eggiconlist.h
+++ b/gnome-cups-manager/eggiconlist.h
@@ -19,16 +19,17 @@
 #ifndef __EGG_ICON_LIST_H__
 #define __EGG_ICON_LIST_H__
 
-#include <gtk/gtkcontainer.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
 #define EGG_TYPE_ICON_LIST		(egg_icon_list_get_type ())
-#define EGG_ICON_LIST(obj)		(GTK_CHECK_CAST ((obj), EGG_TYPE_ICON_LIST, EggIconList))
-#define EGG_ICON_LIST_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_ICON_LIST, EggIconListClass))
-#define EGG_IS_ICON_LIST(obj)		(GTK_CHECK_TYPE ((obj), EGG_TYPE_ICON_LIST))
-#define EGG_IS_ICON_LIST_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_ICON_LIST))
-#define EGG_ICON_LIST_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_ICON_LIST, EggIconListClass))
+#define EGG_ICON_LIST(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_ICON_LIST, EggIconList))
+#define EGG_ICON_LIST_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_ICON_LIST, EggIconListClass))
+#define EGG_IS_ICON_LIST(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_ICON_LIST))
+#define EGG_IS_ICON_LIST_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_ICON_LIST))
+#define EGG_ICON_LIST_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_ICON_LIST, EggIconListClass))
 
 #define EGG_TYPE_ICON_LIST_ITEM		(egg_icon_list_item_get_type ())
 
diff --git a/gnome-cups-manager/eggtrayicon.h b/gnome-cups-manager/eggtrayicon.h
index 007f4c1..1a7ba44 100644
--- a/gnome-cups-manager/eggtrayicon.h
+++ b/gnome-cups-manager/eggtrayicon.h
@@ -21,7 +21,7 @@
 #ifndef __EGG_TRAY_ICON_H__
 #define __EGG_TRAY_ICON_H__
 
-#include <gtk/gtkplug.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 G_BEGIN_DECLS
diff --git a/gnome-cups-manager/gnome-cups-icon.c b/gnome-cups-manager/gnome-cups-icon.c
index 592bc8e..8200eb6 100644
--- a/gnome-cups-manager/gnome-cups-icon.c
+++ b/gnome-cups-manager/gnome-cups-icon.c
@@ -6,10 +6,11 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-listener.h>
 #include <bonobo/bonobo-main.h>
+
+#include <glib/gi18n.h>
 #include <glade/glade.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <gtk/gtk.h>
+
 #include <libgnomeui/gnome-client.h>
 #include <libgnomeui/gnome-ui-init.h>
 
diff --git a/gnome-cups-manager/gnome-cups-manager.c b/gnome-cups-manager/gnome-cups-manager.c
index 5e17f60..5f750fc 100644
--- a/gnome-cups-manager/gnome-cups-manager.c
+++ b/gnome-cups-manager/gnome-cups-manager.c
@@ -34,10 +34,11 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-listener.h>
 #include <bonobo/bonobo-main.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-client.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-icon-theme.h>
diff --git a/gnome-cups-manager/gnome-printer-list.c b/gnome-cups-manager/gnome-printer-list.c
index ddcfe9a..1d4dbce 100644
--- a/gnome-cups-manager/gnome-printer-list.c
+++ b/gnome-cups-manager/gnome-printer-list.c
@@ -29,13 +29,9 @@
 #include "printer-properties.h"
 #include "view-queue.h"
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkicontheme.h>
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 #include <libgnomecups/gnome-cups-printer.h>
 #include <libgnomecups/gnome-cups-ui-util.h>
diff --git a/gnome-cups-manager/printer-properties.c b/gnome-cups-manager/printer-properties.c
index 7a132da..07805a3 100644
--- a/gnome-cups-manager/printer-properties.c
+++ b/gnome-cups-manager/printer-properties.c
@@ -1,4 +1,7 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include "printer-properties.h"
 
@@ -7,26 +10,10 @@
 #include <cups/http.h>
 #include <cups/ipp.h>
 
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkicontheme.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-icon-theme.h>
 
 #include <libgnomecups/gnome-cups-request.h>
@@ -39,9 +26,6 @@
 #include <libgnomecups/gnome-cups-ui-connection.h>
 #include <libgnomecups/gnome-cups-permission.h>
 
-#include <gtk/gtkaccessible.h>
-#include <cups/cups.h>
-
 static void
 unref_group (gpointer user_data, GObject *obj)
 {
diff --git a/gnome-cups-manager/tray.c b/gnome-cups-manager/tray.c
index be92fb1..f2e3618 100644
--- a/gnome-cups-manager/tray.c
+++ b/gnome-cups-manager/tray.c
@@ -1,3 +1,5 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include "tray.h"
 
@@ -8,16 +10,9 @@
 
 #include "eggtrayicon.h"
 
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktooltips.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 #include <libgnomecups/gnome-cups-printer.h>
 #include <libgnomecups/gnome-cups-request.h>
diff --git a/gnome-cups-manager/view-printers.c b/gnome-cups-manager/view-printers.c
index d16726a..4eccddf 100644
--- a/gnome-cups-manager/view-printers.c
+++ b/gnome-cups-manager/view-printers.c
@@ -27,9 +27,10 @@
 #include "view-queue.h"
 #include "printer-properties.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
 #include <libgnomecups/gnome-cups-util.h>
 #include <libgnomecups/gnome-cups-ui-init.h>
 #include <libgnomecups/gnome-cups-printer.h>
@@ -37,7 +38,6 @@
 #include <libgnomecups/gnome-cups-ui-util.h>
 #include <libgnomecups/gnome-cups-permission.h>
 
-#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <cups/cups.h>
 
diff --git a/gnome-cups-manager/view-queue.c b/gnome-cups-manager/view-queue.c
index 7e59b79..0384cdf 100644
--- a/gnome-cups-manager/view-queue.c
+++ b/gnome-cups-manager/view-queue.c
@@ -6,20 +6,10 @@
 #include <cups/http.h>
 #include <cups/ipp.h>
 
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkwindow.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
 
 #include <libgnomecups/gnome-cups-request.h>
 #include <libgnomecups/gnome-cups-printer.h>
diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
index 2140520..7ccdc46 100644
--- a/libgnomecups/gnome-cups-i18n.c
+++ b/libgnomecups/gnome-cups-i18n.c
@@ -1,5 +1,5 @@
 #include <config.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include "gnome-cups-i18n.h"
 
 #ifdef ENABLE_NLS
diff --git a/libgnomecups/gnome-cups-permission.c b/libgnomecups/gnome-cups-permission.c
index 1e13cd9..3fc35c8 100644
--- a/libgnomecups/gnome-cups-permission.c
+++ b/libgnomecups/gnome-cups-permission.c
@@ -23,8 +23,11 @@
 #include <config.h>
 
 #include "gnome-cups-permission.h"
-#include <gtk/gtkmessagedialog.h>
+
+#include <glib.h>
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <string.h>
@@ -32,7 +35,7 @@
 static char *gnome_cups_app_path = NULL;
 
 gboolean
-gnome_cups_can_admin ()
+gnome_cups_can_admin (void)
 {
 	return (geteuid () == 0);
 }
diff --git a/libgnomecups/gnome-cups-permission.h b/libgnomecups/gnome-cups-permission.h
index 6c9dd21..ae9e107 100644
--- a/libgnomecups/gnome-cups-permission.h
+++ b/libgnomecups/gnome-cups-permission.h
@@ -2,7 +2,8 @@
 #ifndef GNOME_CUPS_PERMISSION_H
 #define GNOME_CUPS_PERMISSION_H
 
-#include <gtk/gtkwidget.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgnomecups/gnome-cups-ui-connection.c b/libgnomecups/gnome-cups-ui-connection.c
index c314742..a4e144e 100644
--- a/libgnomecups/gnome-cups-ui-connection.c
+++ b/libgnomecups/gnome-cups-ui-connection.c
@@ -26,16 +26,9 @@
 #include "gnome-cups-ui-util.h"
 #include <libgnomecups/gnome-cups-request.h>
 #include <libgnomecups/gnome-cups-util.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktogglebutton.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 #include <ctype.h>
diff --git a/libgnomecups/gnome-cups-ui-connection.h b/libgnomecups/gnome-cups-ui-connection.h
index ec1b082..21811c0 100644
--- a/libgnomecups/gnome-cups-ui-connection.h
+++ b/libgnomecups/gnome-cups-ui-connection.h
@@ -2,7 +2,8 @@
 #ifndef GNOME_CUPS_UI_CONNECTION_H
 #define GNOME_CUPS_UI_CONNECTION_H
 
-#include <gtk/gtkwidget.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgnomecups/gnome-cups-ui-driver.c b/libgnomecups/gnome-cups-ui-driver.c
index e226ff6..9fef2d1 100644
--- a/libgnomecups/gnome-cups-ui-driver.c
+++ b/libgnomecups/gnome-cups-ui-driver.c
@@ -27,25 +27,11 @@
 #include "gnome-cups-ui-driver.h"
 #include "gnome-cups-ui-util.h"
 #include <libgnomecups/gnome-cups-request.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkfilefilter.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtklabel.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
-#include <glib/gstrfuncs.h>
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/libgnomecups/gnome-cups-ui-driver.h b/libgnomecups/gnome-cups-ui-driver.h
index 7e0dbee..fc87885 100644
--- a/libgnomecups/gnome-cups-ui-driver.h
+++ b/libgnomecups/gnome-cups-ui-driver.h
@@ -2,7 +2,8 @@
 #ifndef GNOME_CUPS_UI_DRIVER_H
 #define GNOME_CUPS_UI_DRIVER_H
 
-#include <gtk/gtkwidget.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgnomecups/gnome-cups-ui-init.c b/libgnomecups/gnome-cups-ui-init.c
index 2048226..fa86170 100644
--- a/libgnomecups/gnome-cups-ui-init.c
+++ b/libgnomecups/gnome-cups-ui-init.c
@@ -5,12 +5,7 @@
 #include "gnome-cups-permission.h"
 #include "gnome-cups-i18n.h"
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksizegroup.h>
+#include <gtk/gtk.h>
 
 static gboolean initialized = FALSE;
 
diff --git a/libgnomecups/gnome-cups-ui-init.h b/libgnomecups/gnome-cups-ui-init.h
index 00a0951..69514ec 100644
--- a/libgnomecups/gnome-cups-ui-init.h
+++ b/libgnomecups/gnome-cups-ui-init.h
@@ -1,7 +1,7 @@
 #ifndef GNOME_CUPS_UI_INIT
 #define GNOME_CUPS_UI_INIT
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgnomecups/gnome-cups-ui-print.c b/libgnomecups/gnome-cups-ui-print.c
index b609cb4..c0a8c5c 100644
--- a/libgnomecups/gnome-cups-ui-print.c
+++ b/libgnomecups/gnome-cups-ui-print.c
@@ -1,5 +1,7 @@
 #include "config.h"
-#include <gtk/gtkmessagedialog.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
 
 #include <libgnomecups/gnome-cups-init.h>
 #include <libgnomecups/gnome-cups-printer.h>
diff --git a/libgnomecups/gnome-cups-ui-print.h b/libgnomecups/gnome-cups-ui-print.h
index 1754934..477d455 100644
--- a/libgnomecups/gnome-cups-ui-print.h
+++ b/libgnomecups/gnome-cups-ui-print.h
@@ -1,7 +1,8 @@
 #ifndef GNOME_CUPS_UI_PRINT
 #define GNOME_CUPS_UI_PRINT
 
-#include <glib/gmacros.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <libgnomecups/gnome-cups-printer.h>
 
 G_BEGIN_DECLS
diff --git a/libgnomecups/gnome-cups-ui-util.c b/libgnomecups/gnome-cups-ui-util.c
index ed9b821..351fbb1 100644
--- a/libgnomecups/gnome-cups-ui-util.c
+++ b/libgnomecups/gnome-cups-ui-util.c
@@ -9,11 +9,7 @@
 #include <libgnomecups/gnome-cups-ui-print.h>
 
 #include <glade/glade.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n.h>
 #include <cups/cups.h>
diff --git a/libgnomecups/gnome-cups-ui-util.h b/libgnomecups/gnome-cups-ui-util.h
index dd7cbfe..7c47cf4 100644
--- a/libgnomecups/gnome-cups-ui-util.h
+++ b/libgnomecups/gnome-cups-ui-util.h
@@ -4,7 +4,7 @@
 #include <glib.h>
 #include <glade/glade.h>
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnomecups/gnome-cups-printer.h>
 
 void gnome_cups_error_dialog (GtkWindow *window, 
diff --git a/po/LINGUAS b/po/LINGUAS
index b4a083d..40c166c 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -37,7 +37,6 @@ ru
 rw
 sq
 sr
-sr Latn
 sv
 tr
 uk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]