From 3064b1394d1d98f10808b0cf25474c2541851dd4 Mon Sep 17 00:00:00 2001
From: Luis Menina <liberforce@freeside.fr>
Date: Sat, 13 Jun 2009 22:37:40 +0200
Subject: [Goal] Clean up GLib and GTK+ includes in empathy (Fixes #585669)

Allows to compile with G_DISABLE_SINGLE_INCLUDES,
GDK_PIXBUF_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES.
This prepares for the GNOME 3.0 transition.
---
 src/empathy-about-dialog.c    | 3 +--
 src/empathy-about-dialog.h    | 2 +-
 src/empathy-accounts-dialog.h | 2 +-
 src/empathy-chat-window.h     | 2 +-
 src/empathy-main-window.h     | 2 +-
 src/empathy-map-view.h        | 2 +-
 src/empathy-preferences.h     | 2 +-
 src/ephy-spinner.c            | 4 +---
 src/ephy-spinner.h            | 3 +--
 9 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 62c545864..dd30e3aed 100644
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -25,8 +25,7 @@
 #include <config.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtksizegroup.h>
+#include <gtk/gtk.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
 
diff --git a/src/empathy-about-dialog.h b/src/empathy-about-dialog.h
index 3e8f40531..a290b3243 100644
--- a/src/empathy-about-dialog.h
+++ b/src/empathy-about-dialog.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_ABOUT_DIALOG_H__
 #define __EMPATHY_ABOUT_DIALOG_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index 40ea24f3e..b8c3d3691 100644
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_ACCOUNTS_DIALOG_H__
 #define __EMPATHY_ACCOUNTS_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <libmissioncontrol/mc-account.h>
 
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 835d67296..c46ef8fc4 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -29,7 +29,7 @@
 #define __EMPATHY_CHAT_WINDOW_H__
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <libmissioncontrol/mc-account.h>
 #include <libempathy-gtk/empathy-chat.h>
diff --git a/src/empathy-main-window.h b/src/empathy-main-window.h
index 562fa12c6..3d34e6c6b 100644
--- a/src/empathy-main-window.h
+++ b/src/empathy-main-window.h
@@ -24,7 +24,7 @@
 #ifndef __EMPATHY_MAIN_WINDOW_H__
 #define __EMPATHY_MAIN_WINDOW_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-map-view.h b/src/empathy-map-view.h
index 80a05a129..6628f1e08 100644
--- a/src/empathy-map-view.h
+++ b/src/empathy-map-view.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_MAP_VIEW_H__
 #define __EMPATHY_MAP_VIEW_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-preferences.h b/src/empathy-preferences.h
index 6cc86d1d6..aba58828e 100644
--- a/src/empathy-preferences.h
+++ b/src/empathy-preferences.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_PREFERENCES_H__
 #define __EMPATHY_PREFERENCES_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ephy-spinner.c b/src/ephy-spinner.c
index be82ca71b..30ffa57c1 100644
--- a/src/ephy-spinner.c
+++ b/src/ephy-spinner.c
@@ -34,9 +34,7 @@
 #define STOP_PROFILER(name)
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtksettings.h>
+#include <gtk/gtk.h>
 
 /* Spinner cache implementation */
 
diff --git a/src/ephy-spinner.h b/src/ephy-spinner.h
index 4435fe371..769d54a3d 100644
--- a/src/ephy-spinner.h
+++ b/src/ephy-spinner.h
@@ -25,8 +25,7 @@
 #ifndef EPHY_SPINNER_H
 #define EPHY_SPINNER_H
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-- 
cgit v1.2.3