[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.

diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index 004a3e87f4cc1e7ecbdbfd30a25756cd37a0e1e3..c2105406abcd5bddd7648ed78e85410ab10efc48 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_ACCOUNT_CHOOSER_H__
 #define __EMPATHY_ACCOUNT_CHOOSER_H__
 
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 
 #include <libmissioncontrol/mc-account.h>
 

diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index 6ead048ebf3af71cfaba6b627fb6582f3a02b818..a89081fc07d54ba0de23c9c608baed4fb7f7249b 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 7e8e5a216766ce341da89401c4db6763cbb7c895..9187c1e0c4ee015d93567a14046c552921766677 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
index f4e40a8b0aef963ee9323aab381d879b9ed58c24..1a502304775aa52fe6b38141a08d28587843dd86 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -24,7 +24,7 @@
 #ifndef __EMPATHY_AVATAR_CHOOSER_H__
 #define __EMPATHY_AVATAR_CHOOSER_H__
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 

diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index ddb446a60c89f5c70da8bf969a14842be5771a4a..2271ecc72aca7cbfbfce3f212bed036f8c24f8a1 100644 (file)
--- a/libempathy-gtk/empathy-avatar-image.h
+++ b/libempathy-gtk/empathy-avatar-image.h
@@ -24,7 +24,7 @@
 #ifndef __EMPATHY_AVATAR_IMAGE_H__
 #define __EMPATHY_AVATAR_IMAGE_H__
 
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 

diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 2883c4ded35f5e4e5c76d24a41bf73c97d35a874..6c7982682bcedac72269639d9f44dd51d087b803 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -20,7 +20,7 @@
  * Authors: Raphael Slinckx <raphael@slinckx.net>
  */
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "empathy-cell-renderer-activatable.h"
 

diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.h b/libempathy-gtk/empathy-cell-renderer-activatable.h
index 5962c200f23952b22fd1499908e03167ec92ac5c..d58a082da9f0943c298e978903b01dad8cc42bf7 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-activatable.h
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_CELL_RENDERER_ACTIVATABLE_H__
 #define __EMPATHY_CELL_RENDERER_ACTIVATABLE_H__
 
-#include <gtk/gtkcellrendererpixbuf.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index 09fe8bd4f010f0e52f1d9effe95f34e4df388fe9..6fb7cfded3f0d3ea2bd6cb00225953e77cbf9edb 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -29,7 +29,7 @@
  *     start the new one).
  */
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-utils.h>
 #include "empathy-cell-renderer-expander.h"

diff --git a/libempathy-gtk/empathy-cell-renderer-expander.h b/libempathy-gtk/empathy-cell-renderer-expander.h
index fc569ded29126f6a7b6d33fbc925656671d98433..00e36f545d38b8de6511447b8585fccf3e2548c1 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-expander.h
+++ b/libempathy-gtk/empathy-cell-renderer-expander.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_CELL_RENDERER_EXPANDER_H__
 #define __EMPATHY_CELL_RENDERER_EXPANDER_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-cell-renderer-text.h b/libempathy-gtk/empathy-cell-renderer-text.h
index 540c2ebb990d60f4a84294f4d2738d9aa99268e9..48ded96260c08247d71691902ac4efeaa94ae361 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-text.h
+++ b/libempathy-gtk/empathy-cell-renderer-text.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_CELL_RENDERER_TEXT_H__
 #define __EMPATHY_CELL_RENDERER_TEXT_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-chat-text-view.h b/libempathy-gtk/empathy-chat-text-view.h
index 7c4ff343091db3aaab633f77970633fe35156ec4..0180f21d1ddfadd57c8bc17cc0bcf6caa0aa9e33 100644 (file)
--- a/libempathy-gtk/empathy-chat-text-view.h
+++ b/libempathy-gtk/empathy-chat-text-view.h
@@ -27,7 +27,7 @@
 #ifndef __EMPATHY_CHAT_TEXT_VIEW_H__
 #define __EMPATHY_CHAT_TEXT_VIEW_H__
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>

diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
index 893cf83e4a84485a910c197ae507010cb17efc79..f3478be6ddee4ae848c53e514e03c34c6e84695e 100644 (file)
--- a/libempathy-gtk/empathy-chat-view.h
+++ b/libempathy-gtk/empathy-chat-view.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_CHAT_VIEW_H__
 #define __EMPATHY_CHAT_VIEW_H__
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>

diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index 74d7e068191e4d740fabcf8beceb3b1014305320..12fac9617910f4e1a9a0406483fc1ab25262bc61 100644 (file)
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -28,7 +28,7 @@
 #ifndef __EMPATHY_CHAT_H__
 #define __EMPATHY_CHAT_H__
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>

diff --git a/libempathy-gtk/empathy-contact-list-store.h b/libempathy-gtk/empathy-contact-list-store.h
index 13ea099b32d72e21bfa7e118082d92a9db79abcc..007a6b069256049564dbf403d3b561dd0661670a 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-store.h
+++ b/libempathy-gtk/empathy-contact-list-store.h
@@ -26,7 +26,7 @@
 #ifndef __EMPATHY_CONTACT_LIST_STORE_H__
 #define __EMPATHY_CONTACT_LIST_STORE_H__
 
-#include <gtk/gtktreestore.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-contact.h>

diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h
index 0c48764c42e421673b069d5aa76895947abcf74f..e9c3457d8d430719202f89bfec73197dc3862421 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.h
+++ b/libempathy-gtk/empathy-contact-list-view.h
@@ -26,7 +26,7 @@
 #ifndef __EMPATHY_CONTACT_LIST_VIEW_H__
 #define __EMPATHY_CONTACT_LIST_VIEW_H__
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 

diff --git a/libempathy-gtk/empathy-contact-menu.h b/libempathy-gtk/empathy-contact-menu.h
index 8126a8e5975e36b03d75349d9499a13aa2a9d285..262ec9650ac7a8314e0915d455a76e7ea638f9a9 100644 (file)
--- a/libempathy-gtk/empathy-contact-menu.h
+++ b/libempathy-gtk/empathy-contact-menu.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_CONTACT_MENU_H__
 #define __EMPATHY_CONTACT_MENU_H__
 
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 

diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h
index 98584969688fb47919a194b991e940091aa285ea..df4a8b152a4b4caf1c4a45f440aeb723b4f42bd5 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-dialog.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_IRC_NETWORK_DIALOG_H__
 #define __EMPATHY_IRC_NETWORK_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-irc-network.h>
 

diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h
index c1781d0cf8788fb830443db53b12ae84682eb71c..08887c5e8c8f093ceb90f452349f5fdec6c41217 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.h
+++ b/libempathy-gtk/empathy-new-message-dialog.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__
 #define __EMPATHY_NEW_MESSAGE_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 62c5458646c443530d91c4bad1e34d61c5d5168c..dd30e3aedae297ed080dace490c0c804533172d6 100644 (file)
--- 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 3e8f405315e0c9b84f76e99380c28888cbd115d6..a290b32436ef8748468af4a06aefbfe4e18b58d0 100644 (file)
--- 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 40ea24f3e5ce17a68513e9c0a343af7c043ae185..b8c3d3691036146bcc12e648f0b9f4c717232623 100644 (file)
--- 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 835d6729662a06fd57c3df00e23dd8afe38a0324..c46ef8fc43b42f1249b58885e13a8da099f899d9 100644 (file)
--- 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 562fa12c63b99bded6bc9a9f28d65a4db5461843..3d34e6c6b36c4ab3b40b43c6ad8b6d7946a631cb 100644 (file)
--- 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 80a05a129cb5f38988eaf69f7e7f0036a31fe31f..6628f1e082dd4b02a2621d98a04ef53cae37d75a 100644 (file)
--- 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 6cc86d1d6f5d736db6476e324946a1e25199f351..aba58828ef43653a8df536ac1bb43f2ea89efe74 100644 (file)
--- 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 be82ca71b3183500c26ed2277f09fe6bc72557ae..30ffa57c147d8512da1b51bbb1f61dec6581aaed 100644 (file)
--- 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 4435fe3715255137517700a9f5924b55a9b56b18..769d54a3d80540068eefa117f15b7b901f06a85b 100644 (file)
--- 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