aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/addressbook-errors.xml.h2
-rw-r--r--addressbook/gui/component/addressbook-view.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e7154b279c..6ea8afeb44 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-25 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-20 Chris Toshok <toshok@ximian.com>
* gui/component/component-factory.c (factory): remove the dead
diff --git a/addressbook/addressbook-errors.xml.h b/addressbook/addressbook-errors.xml.h
index 54650cd65a..2ad50c14e2 100644
--- a/addressbook/addressbook-errors.xml.h
+++ b/addressbook/addressbook-errors.xml.h
@@ -18,8 +18,6 @@ char *s = N_("Could not get schema information for LDAP server.");
char *s = N_("LDAP server did not respond with valid schema information.");
/* addressbook:remove-addressbook primary */
char *s = N_("Could not remove addressbook.");
-/* addressbook:remove-addressbook secondary */
-char *s = N_("{0}");
/* addressbook:edit-categories primary */
char *s = N_("Category editor not available.");
/* addressbook:generic-error primary */
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 179c9fbf26..68f4992ce1 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -710,7 +710,9 @@ delete_addressbook_cb (GtkWidget *widget, AddressbookView *view)
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);