pidgin: 5ab68ddb: More updates for GTK+ 3.0. This only fix...
qulogic at pidgin.im
qulogic at pidgin.im
Tue Apr 7 01:30:45 EDT 2009
-----------------------------------------------------------------
Revision: 5ab68ddb0251205f7ef97f4c280e65696cbd5ff2
Ancestor: 158fcfd23559f1fde4f5c77cc3a498e0464a4f03
Author: qulogic at pidgin.im
Date: 2009-04-07T05:28:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5ab68ddb0251205f7ef97f4c280e65696cbd5ff2
Modified files:
pidgin/eggtrayicon.h pidgin/gtkcellrendererexpander.c
pidgin/gtkcellrendererexpander.h
pidgin/gtkcellrendererprogress.h pidgin/gtkdnd-hints.h
pidgin/gtkimhtml.c pidgin/gtkimhtml.h
pidgin/gtkimhtmltoolbar.h pidgin/gtkmenutray.c
pidgin/gtkmenutray.h pidgin/gtksourceiter.h
pidgin/gtksourceundomanager.h pidgin/gtkstatusbox.h
pidgin/minidialog.c pidgin/minidialog.h pidgin/pidginstock.h
pidgin/plugins/ticker/gtkticker.h
ChangeLog:
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
-------------- next part --------------
============================================================
--- pidgin/eggtrayicon.h e7bdda22c1f97fd9119983afc6526c63312970f0
+++ pidgin/eggtrayicon.h 0476a945e0d21e4ea1fc637effeaa60c44ba9462
@@ -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
============================================================
--- pidgin/gtkcellrendererexpander.c bcefeb1b9c816c0c8034a0da3b40263a0a80b6b9
+++ pidgin/gtkcellrendererexpander.c 5625c6488000844a387ed8a1f7681bbdc7e9518b
@@ -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,
============================================================
--- pidgin/gtkcellrendererexpander.h ad30269a097fcfaa9fc43f3e86882607e5d44616
+++ pidgin/gtkcellrendererexpander.h 04112a698158dea2b79b4e31462a78c347d7ceae
@@ -21,7 +21,7 @@
#ifndef _PIDGINCELLRENDEREREXPANDER_H_
#define _PIDGINCELLRENDEREREXPANDER_H_
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
============================================================
--- pidgin/gtkcellrendererprogress.h af7a12507fa81c9a3985fb214a5de851d44cd015
+++ pidgin/gtkcellrendererprogress.h b2bdd3fa00094b295d05acbad858e27c144ced34
@@ -21,7 +21,7 @@
#ifndef _PIDGINCELLRENDERERPROGRESS_H_
#define _PIDGINCELLRENDERERPROGRESS_H_
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
============================================================
--- pidgin/gtkdnd-hints.h f069e5db3982a7109c1c2e07d910be64d3cffacb
+++ pidgin/gtkdnd-hints.h 9e819b662ace652bab4053bbff7890a58e46e2eb
@@ -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.
============================================================
--- pidgin/gtkimhtml.c 114089733e7aa089ed0ebda608f12861760be3cd
+++ pidgin/gtkimhtml.c c59928417ffdb8329e492cc6b5cac2ea3f27567d
@@ -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>
============================================================
--- pidgin/gtkimhtml.h 6dac39c2445e8fbe2a6dbec29f5c89403d7dea5e
+++ pidgin/gtkimhtml.h 19bbcabe9eac2c68930778a11175983701ccc830
@@ -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"
============================================================
--- pidgin/gtkimhtmltoolbar.h 9914dcf4c5a863e8baa4e8087cda638abd3ecf4b
+++ pidgin/gtkimhtmltoolbar.h 24ae7a82d3db734c84694c6e7f259046ee51d88a
@@ -23,7 +23,7 @@
#ifndef _PIDGINIMHTMLTOOLBAR_H_
#define _PIDGINIMHTMLTOOLBAR_H_
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include "gtkimhtml.h"
#ifdef __cplusplus
============================================================
--- pidgin/gtkmenutray.c 4e05bc17ff1e83e6cb890dabb267f10c1971b9f5
+++ pidgin/gtkmenutray.c afc8cd8ee380a02cb91fedced599b2514a9884f9
@@ -21,9 +21,7 @@
#include "gtkmenutray.h"
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
/******************************************************************************
* Enums
============================================================
--- pidgin/gtkmenutray.h 9618e3afc5faf68aba2acb4078951e506fb72934
+++ pidgin/gtkmenutray.h fc23965ccf2c83d3b29f73197aa61cb13b803028
@@ -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))
============================================================
--- pidgin/gtksourceiter.h 994ef36809cae64390d8bd94e348477dd6d1f786
+++ pidgin/gtksourceiter.h ecee8b31cee50ffd4544102b370f3740c16f044c
@@ -28,7 +28,7 @@
#ifndef _PIDGINSOURCEITER_H_
#define _PIDGINSOURCEITER_H_
-#include <gtk/gtktextiter.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
============================================================
--- pidgin/gtksourceundomanager.h b236765b527793a1025b6348d201e594c44def97
+++ pidgin/gtksourceundomanager.h 7d9903c803631b71e8e21230fc13d829ec79f94e
@@ -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))
============================================================
--- pidgin/gtkstatusbox.h 45ad817469cd9230a169bff22f78363f1c1deb32
+++ pidgin/gtkstatusbox.h ee307911eb6628fe7b98582d9cd2d990c476c39f
@@ -34,8 +34,6 @@
#include "imgstore.h"
#include "savedstatuses.h"
#include "status.h"
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
G_BEGIN_DECLS
============================================================
--- pidgin/minidialog.c 479886cfeedaf417f97527f10aa589bb83e5a7d2
+++ pidgin/minidialog.c 19556d7545d5ffdb38a75db31d8893885bd70a4e
@@ -26,8 +26,7 @@
#include "internal.h"
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
#include "libpurple/prefs.h"
============================================================
--- pidgin/minidialog.h c9af484bf47334d98fc3029bdcaf76792d1822af
+++ pidgin/minidialog.h 2e2487f114664eff6a89dd7a7bf0b19d0d868527
@@ -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
============================================================
--- pidgin/pidginstock.h 0248b56b64c6d8befe3be03a8773da3957f3cefd
+++ pidgin/pidginstock.h 4ae3d7e30ed2f4746b0a909afe774ab0cf29aefc
@@ -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_
============================================================
--- pidgin/plugins/ticker/gtkticker.h d6055e8388055a7b57ab50d0ad412771d8730b36
+++ pidgin/plugins/ticker/gtkticker.h 80eb0ee04d1ebbc4fe28dd46c70eaeb53b975d75
@@ -26,8 +26,7 @@
#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
More information about the Commits
mailing list