From 947e9835bc346d1ef05e0d46df90bbebed090775 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Thu, 20 Nov 2008 01:58:50 +0000
Subject: include gtk/gtk.h as a workaround for GTK+ >= 2.13.3.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2074 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog                  | 11 +++++++++++
 ChangeLog.ja               | 11 +++++++++++
 src/addr_compl.c           |  7 +------
 src/addressbook.c          | 19 +------------------
 src/editgroup.c            |  8 +-------
 src/gtkutils.c             | 15 +--------------
 src/prefs_display_items.c  |  8 +-------
 src/prefs_summary_column.c |  8 +-------
 src/select-keys.c          | 13 +------------
 9 files changed, 29 insertions(+), 71 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79ebce1e..7ab27368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-20
+
+	* src/addressbook.c
+	  src/editgroup.c
+	  src/gtkutils.c
+	  src/select-keys.c
+	  src/addr_compl.c
+	  src/prefs_summary_column.c
+	  src/prefs_display_items.c: include gtk/gtk.h as a workaround for
+	  GTK+ >= 2.13.3.
+
 2008-11-19
 
 	* libsylph/session.c: session_connect(): fixed a bug that
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 709e7f95..a2db6a8f 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,14 @@
+2008-11-20
+
+	* src/addressbook.c
+	  src/editgroup.c
+	  src/gtkutils.c
+	  src/select-keys.c
+	  src/addr_compl.c
+	  src/prefs_summary_column.c
+	  src/prefs_display_items.c: GTK+ >= 2.13.3 への対処として、
+	  gtk/gtk.h を include するようにした。
+
 2008-11-19
 
 	* libsylph/session.c: session_connect(): session->server がセット
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 94a18b33..73a5e804 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -26,12 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 #include <ctype.h>
diff --git a/src/addressbook.c b/src/addressbook.c
index ca7858c7..6663c369 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -26,24 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include <setjmp.h>
 
diff --git a/src/editgroup.c b/src/editgroup.c
index b8b14ffc..b29bf58f 100644
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -26,13 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "addressbook.h"
 #include "addressitem.h"
diff --git a/src/gtkutils.c b/src/gtkutils.c
index 367a5919..29ce1b7b 100644
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -25,20 +25,7 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/src/prefs_display_items.c b/src/prefs_display_items.c
index b55af772..f68294e8 100644
--- a/src/prefs_display_items.c
+++ b/src/prefs_display_items.c
@@ -26,13 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "prefs.h"
 #include "prefs_ui.h"
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index a8c352e7..7b223b22 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -26,13 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "prefs.h"
 #include "prefs_ui.h"
diff --git a/src/select-keys.c b/src/select-keys.c
index 49d3a222..5ee703f5 100644
--- a/src/select-keys.c
+++ b/src/select-keys.c
@@ -27,18 +27,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "select-keys.h"
 #include "utils.h"
-- 
cgit v1.2.3