# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1239082138 0
# Node ID 1a94a964bddf51811b63af74a37ff029d24f7db7
# Parent  0c796a1950b7c0f3ea1bf144482313a56a1faf6c
More updates for GTK+ 3.0. This only fixes the single-includes. Fixing all
the deprecated functions will take a bit more work.
This should compile with only:
-DG_DISABLE_SINGLE_INCLUDES
-DGDK_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES

diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/eggtrayicon.h
--- a/pidgin/eggtrayicon.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/eggtrayicon.h	Tue Apr 07 05:28:58 2009 +0000
@@ -21,8 +21,7 @@
 #ifndef __EGG_TRAY_ICON_H__
 #define __EGG_TRAY_ICON_H__
 
-#include <gtk/gtkplug.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 G_BEGIN_DECLS
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkcellrendererexpander.c
--- a/pidgin/gtkcellrendererexpander.c	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkcellrendererexpander.c	Tue Apr 07 05:28:58 2009 +0000
@@ -30,7 +30,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <gtk/gtktreeview.h>
 #include "gtkcellrendererexpander.h"
 
 static void pidgin_cell_renderer_expander_get_property  (GObject                    *object,
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkcellrendererexpander.h
--- a/pidgin/gtkcellrendererexpander.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkcellrendererexpander.h	Tue Apr 07 05:28:58 2009 +0000
@@ -21,7 +21,7 @@
 #ifndef _PIDGINCELLRENDEREREXPANDER_H_
 #define _PIDGINCELLRENDEREREXPANDER_H_
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkcellrendererprogress.h
--- a/pidgin/gtkcellrendererprogress.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkcellrendererprogress.h	Tue Apr 07 05:28:58 2009 +0000
@@ -21,7 +21,7 @@
 #ifndef _PIDGINCELLRENDERERPROGRESS_H_
 #define _PIDGINCELLRENDERERPROGRESS_H_
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkdnd-hints.h
--- a/pidgin/gtkdnd-hints.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkdnd-hints.h	Tue Apr 07 05:28:58 2009 +0000
@@ -25,7 +25,7 @@
 #define _PIDGIN_DND_HINTS_H_
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 /**
  * Conversation drag-and-drop arrow types.
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkimhtml.c	Tue Apr 07 05:28:58 2009 +0000
@@ -45,7 +45,7 @@
 #include "gtksourceundomanager.h"
 #include "gtksourceview-marshal.h"
 #include <gtk/gtk.h>
-#include <glib/gerror.h>
+#include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 #include <ctype.h>
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkimhtml.h
--- a/pidgin/gtkimhtml.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkimhtml.h	Tue Apr 07 05:28:58 2009 +0000
@@ -26,9 +26,7 @@
 #define _PIDGINIMHTML_H_
 
 #include <gdk/gdk.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include "gtksourceundomanager.h"
 
 #include "connection.h"
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkimhtmltoolbar.h
--- a/pidgin/gtkimhtmltoolbar.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkimhtmltoolbar.h	Tue Apr 07 05:28:58 2009 +0000
@@ -23,7 +23,7 @@
 #ifndef _PIDGINIMHTMLTOOLBAR_H_
 #define _PIDGINIMHTMLTOOLBAR_H_
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "gtkimhtml.h"
 
 #ifdef __cplusplus
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkmenutray.c
--- a/pidgin/gtkmenutray.c	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkmenutray.c	Tue Apr 07 05:28:58 2009 +0000
@@ -21,9 +21,7 @@
 
 #include "gtkmenutray.h"
 
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 
 /******************************************************************************
  * Enums
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkmenutray.h
--- a/pidgin/gtkmenutray.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkmenutray.h	Tue Apr 07 05:28:58 2009 +0000
@@ -24,9 +24,7 @@
 #ifndef PIDGIN_MENU_TRAY_H
 #define PIDGIN_MENU_TRAY_H
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
 
 #define PIDGIN_TYPE_MENU_TRAY				(pidgin_menu_tray_get_gtype())
 #define PIDGIN_MENU_TRAY(obj)				(GTK_CHECK_CAST((obj), PIDGIN_TYPE_MENU_TRAY, PidginMenuTray))
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtksourceiter.h
--- a/pidgin/gtksourceiter.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtksourceiter.h	Tue Apr 07 05:28:58 2009 +0000
@@ -28,7 +28,7 @@
 #ifndef _PIDGINSOURCEITER_H_
 #define _PIDGINSOURCEITER_H_
 
-#include <gtk/gtktextiter.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtksourceundomanager.h
--- a/pidgin/gtksourceundomanager.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtksourceundomanager.h	Tue Apr 07 05:28:58 2009 +0000
@@ -26,7 +26,7 @@
 #ifndef __GTK_SOURCE_UNDO_MANAGER_H__
 #define __GTK_SOURCE_UNDO_MANAGER_H__
 
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 
 #define GTK_SOURCE_TYPE_UNDO_MANAGER             	(gtk_source_undo_manager_get_type ())
 #define GTK_SOURCE_UNDO_MANAGER(obj)			(GTK_CHECK_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/gtkstatusbox.h
--- a/pidgin/gtkstatusbox.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/gtkstatusbox.h	Tue Apr 07 05:28:58 2009 +0000
@@ -34,8 +34,6 @@
 #include "imgstore.h"
 #include "savedstatuses.h"
 #include "status.h"
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
 
 G_BEGIN_DECLS
 
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/minidialog.c
--- a/pidgin/minidialog.c	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/minidialog.c	Tue Apr 07 05:28:58 2009 +0000
@@ -26,8 +26,7 @@
 
 #include "internal.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "libpurple/prefs.h"
 
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/minidialog.h
--- a/pidgin/minidialog.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/minidialog.h	Tue Apr 07 05:28:58 2009 +0000
@@ -28,8 +28,7 @@
 #define __PIDGIN_MINI_DIALOG_H__
 
 #include <glib-object.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/pidginstock.h
--- a/pidgin/pidginstock.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/pidginstock.h	Tue Apr 07 05:28:58 2009 +0000
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include "gtkstatus-icon-theme.h"
 
 #ifndef _PIDGIN_STOCK_H_
diff -r 0c796a1950b7 -r 1a94a964bddf pidgin/plugins/ticker/gtkticker.h
--- a/pidgin/plugins/ticker/gtkticker.h	Tue Apr 07 05:22:48 2009 +0000
+++ b/pidgin/plugins/ticker/gtkticker.h	Tue Apr 07 05:28:58 2009 +0000
@@ -26,8 +26,7 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 
 #ifdef __cplusplus