disabled no longer required workaround for resize grip.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@232 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 23 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 09999bb3..4d39e66c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-27
+
+	* src/mainwindow.c: main_window_create(): disable no longer required
+	  workaround for resize grip on GTK+ 2.6.
+
 2005-04-22
 
 	* src/imap.c: imap_auth(): prefer CRAM-MD5 if authentication type is
diff --git a/ChangeLog.ja b/ChangeLog.ja
index cd7ffd7b..6981f6d6 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2005-04-27
+
+	* src/mainwindow.c: main_window_create(): GTK+ 2.6 では不要なリサイズ
+	  グリップのための対処を無効にした。
+
 2005-04-22
 
 	* src/imap.c: imap_auth(): 認証方式が自動の場合は CRAM-MD5 を優先して
diff --git a/src/mainwindow.c b/src/mainwindow.c
index f0d291ba..8bc4d29e 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -771,7 +771,9 @@ MainWindow *main_window_create(SeparateType type)
 	GtkWidget *online_pixmap;
 	GtkWidget *offline_pixmap;
 	GtkTooltips *online_tip;
+#if !GTK_CHECK_VERSION(2, 6, 0)
 	GtkWidget *spacer_hbox;
+#endif
 	GtkWidget *ac_button;
 	GtkWidget *ac_label;
 
@@ -785,8 +787,6 @@ MainWindow *main_window_create(SeparateType type)
 	GtkItemFactory *ifactory;
 	GtkWidget *ac_menu;
 	GtkWidget *menuitem;
-	gint w;
-	gint h;
 	gint i;
 
 	static GdkGeometry geometry;
@@ -869,8 +869,10 @@ MainWindow *main_window_create(SeparateType type)
 
 	online_tip = gtk_tooltips_new();
 
+#if !GTK_CHECK_VERSION(2, 6, 0)
 	spacer_hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_end(GTK_BOX(statusbar), spacer_hbox, FALSE, FALSE, 0);
+#endif
 
 	ac_button = gtk_button_new();
 	gtk_button_set_relief(GTK_BUTTON(ac_button), GTK_RELIEF_NONE);
@@ -1010,9 +1012,15 @@ MainWindow *main_window_create(SeparateType type)
 	/* show main window */
 	gtk_widget_show(mainwin->window);
 
-	gdk_drawable_get_size
-		(GDK_DRAWABLE(GTK_STATUSBAR(statusbar)->grip_window), &w, &h);
-	gtk_widget_set_size_request(spacer_hbox, w, -1);
+#if !GTK_CHECK_VERSION(2, 6, 0)
+	{
+		gint w, h;
+		gdk_drawable_get_size
+			(GDK_DRAWABLE(GTK_STATUSBAR(statusbar)->grip_window),
+			 &w, &h);
+		gtk_widget_set_size_request(spacer_hbox, w, -1);
+	}
+#endif
 
 	/* initialize views */
 	folderview_init(folderview);