[evolution-patches] Patch: fix GTK+ 2.4 warning with GTK Message dialog

[Frederic Crozat <fcrozat mandrakesoft com>]

Following a previous patch fixing the problem in e-shell-importer, I've
check all evolution code to disable call to gtk_dialog_set_has_separator
on message dialog (which causes a warning when running gtk+ 2.4).


-- 
Frederic Crozat <fcrozat mandrakesoft com>
Mandrakesoft

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1813
diff -u -p -r1.1813 ChangeLog
--- addressbook/ChangeLog	19 Aug 2004 20:33:10 -0000	1.1813
+++ addressbook/ChangeLog	20 Aug 2004 17:30:25 -0000
@@ -1,3 +1,9 @@
+2004-08-20  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* gui/component/addressbook-view.c: (delete_addressbook_cb):
+	Don't call gtk_dialog_set_has_separator on Gtk Message Dialog
+        with GTK+ >= 2.4.0.
+
 2004-08-19  Chris Toshok  <toshok ximian com>
 
 	[ likely fixes #61500 ]
Index: addressbook/gui/component/addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-view.c,v
retrieving revision 1.17
diff -u -p -r1.17 addressbook-view.c
--- addressbook/gui/component/addressbook-view.c	19 Aug 2004 20:33:11 -0000	1.17
+++ addressbook/gui/component/addressbook-view.c	20 Aug 2004 17:30:25 -0000
@@ -710,7 +710,9 @@ delete_addressbook_cb (GtkWidget *widget
 		GTK_BUTTONS_YES_NO,
 		_("Address book '%s' will be removed. Are you sure you want to continue?"),
 		e_source_peek_name (selected_source));
+#if !GTK_CHECK_VERSION (2,4,0)
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+#endif
 
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) {
 		gtk_widget_destroy (dialog);
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2490
diff -u -p -r1.2490 ChangeLog
--- calendar/ChangeLog	18 Aug 2004 14:42:19 -0000	1.2490
+++ calendar/ChangeLog	20 Aug 2004 17:30:25 -0000
@@ -1,3 +1,9 @@
+2004-08-20  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* gui/dialogs/recur-comp.c: (recur_component_dialog):
+	Don't call gtk_dialog_set_has_separator on Gtk Message Dialog
+        with GTK+ >= 2.4.0.
+
 2004-08-18  Sivaiah Nallagatla <snallagatla novell com>
 
 	* gui/alarm-notify/alarm-notify.c (alarm-notify_init) :
Index: calendar/gui/dialogs/recur-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/recur-comp.c,v
retrieving revision 1.11
diff -u -p -r1.11 recur-comp.c
--- calendar/gui/dialogs/recur-comp.c	12 Jul 2004 17:06:41 -0000	1.11
+++ calendar/gui/dialogs/recur-comp.c	20 Aug 2004 17:30:25 -0000
@@ -67,7 +67,9 @@ recur_component_dialog (ECal *client,
 
 	dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "%s", str);
 	g_free (str);
+#if !GTK_CHECK_VERSION (2,4,0)
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+#endif
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 
 	hbox = gtk_hbox_new (FALSE, 12);
Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.479
diff -u -p -r1.479 ChangeLog
--- e-util/ChangeLog	13 Aug 2004 16:44:28 -0000	1.479
+++ e-util/ChangeLog	20 Aug 2004 17:30:26 -0000
@@ -1,3 +1,10 @@
+2004-08-20  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* e-dialog-utils.c: (e_notice):
+	* e-passwords.c: (ep_ask_password):
+	Don't call gtk_dialog_set_has_separator on Gtk Message Dialog 
+	with GTK+ >= 2.4.0.
+
 2004-08-13  Rodrigo Moya <rodrigo novell com>
 
 	* e-categories-config.c: include gtkdialog.h rather than gnome-dialog.h.
Index: e-util/e-dialog-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-dialog-utils.c,v
retrieving revision 1.20
diff -u -p -r1.20 e-dialog-utils.c
--- e-util/e-dialog-utils.c	12 Aug 2004 20:36:31 -0000	1.20
+++ e-util/e-dialog-utils.c	20 Aug 2004 17:30:26 -0000
@@ -71,7 +71,9 @@ e_notice (gpointer parent, GtkMessageTyp
 					 GTK_BUTTONS_OK,
 					 "%s",
 					 str);
+#if !GTK_CHECK_VERSION (2,4,0)
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+#endif
 	va_end (args);
 	g_free (str);
 	
Index: e-util/e-passwords.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-passwords.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-passwords.c
--- e-util/e-passwords.c	12 Aug 2004 06:53:12 -0000	1.19
+++ e-util/e-passwords.c	20 Aug 2004 17:30:26 -0000
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-i18n.h>
+#include <gtk/gtkversion.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkcheckbutton.h>
@@ -429,7 +430,9 @@ ep_ask_password(EPassMsg *msg)
 							       msg->prompt);
 	gtk_window_set_title(GTK_WINDOW(password_dialog), msg->title);
 
+#if !GTK_CHECK_VERSION (2,4,0)
 	gtk_dialog_set_has_separator(password_dialog, FALSE);
+#endif
 	gtk_dialog_set_default_response(password_dialog, GTK_RESPONSE_OK);
 
 	vbox = gtk_vbox_new (FALSE, 6);
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1466
diff -u -p -r1.1466 ChangeLog
--- shell/ChangeLog	12 Aug 2004 20:37:07 -0000	1.1466
+++ shell/ChangeLog	20 Aug 2004 17:30:26 -0000
@@ -1,3 +1,18 @@
+2004-08-20  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* e-shell-startup-wizard.c: (prepare_importer_page):
+	don't call gtk_dialog_set_has_separator
+	on Message Dialog on GTK+ >= 2.4.0 (output warning)
+
 2004-08-12  Carlos Garnacho Parro  <carlosg gnome org>
 
 	* e-shell-importer.c: added the "use_filechooser" property to the
Index: shell/e-shell-startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-startup-wizard.c,v
retrieving revision 1.52
diff -u -p -r1.52 e-shell-startup-wizard.c
--- shell/e-shell-startup-wizard.c	17 May 2004 20:01:24 -0000	1.52
+++ shell/e-shell-startup-wizard.c	20 Aug 2004 17:30:26 -0000
@@ -569,7 +569,9 @@ prepare_importer_page (GnomeDruidPage *p
 	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO,
 					 GTK_BUTTONS_NONE,
 					 _("Please wait...\nScanning for existing setups"));
+#if !GTK_CHECK_VERSION (2,4,0)
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+#endif
 	e_make_widget_backing_stored (dialog);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Starting import"));