From aebe24f2bba1a41b23ab62b7adfc867e28adb3fc Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 13 Nov 2001 00:35:24 +0000 Subject: [PATCH] Warn Mon Nov 12 19:33:52 2001 Owen Taylor * gtk/gtkmessagedialog.c (gtk_message_dialog_new): Warn --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmessagedialog.c | 6 ++++++ 8 files changed, 41 insertions(+) diff --git a/ChangeLog b/ChangeLog index c43fa9241b..51ac8c00f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 12 19:33:52 2001 Owen Taylor + + * gtk/gtkmessagedialog.c (gtk_message_dialog_new): Warn + if GTK_DIALOG_NO_SEPARATOR is passed in and ignore it. + 2001-11-12 Matthias Clasen * gtk/gtktreeview.c: Documentation fixes. (#64377) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c43fa9241b..51ac8c00f9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Nov 12 19:33:52 2001 Owen Taylor + + * gtk/gtkmessagedialog.c (gtk_message_dialog_new): Warn + if GTK_DIALOG_NO_SEPARATOR is passed in and ignore it. + 2001-11-12 Matthias Clasen * gtk/gtktreeview.c: Documentation fixes. (#64377) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c43fa9241b..51ac8c00f9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Nov 12 19:33:52 2001 Owen Taylor + + * gtk/gtkmessagedialog.c (gtk_message_dialog_new): Warn + if GTK_DIALOG_NO_SEPARATOR is passed in and ignore it. + 2001-11-12 Matthias Clasen * gtk/gtktreeview.c: Documentation fixes. (#64377) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c43fa9241b..51ac8c00f9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Nov 12 19:33:52 2001 Owen Taylor + + * gtk/gtkmessagedialog.c (gtk_message_dialog_new): Warn + if GTK_DIALOG_NO_SEPARATOR is passed in and ignore it. + 2001-11-12 Matthias Clasen * gtk/gtktreeview.c: Documentation fixes. (#64377) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c43fa9241b..51ac8c00f9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Nov 12 19:33:52 2001 Owen Taylor + + * gtk/gtkmessagedialog.c (gtk_message_dialog_new): Warn + if GTK_DIALOG_NO_SEPARATOR is passed in and ignore it. + 2001-11-12 Matthias Clasen * gtk/gtktreeview.c: Documentation fixes. (#64377) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c43fa9241b..51ac8c00f9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Nov 12 19:33:52 2001 Owen Taylor + + * gtk/gtkmessagedialog.c (gtk_message_dialog_new): Warn + if GTK_DIALOG_NO_SEPARATOR is passed in and ignore it. + 2001-11-12 Matthias Clasen * gtk/gtktreeview.c: Documentation fixes. (#64377) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c43fa9241b..51ac8c00f9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Nov 12 19:33:52 2001 Owen Taylor + + * gtk/gtkmessagedialog.c (gtk_message_dialog_new): Warn + if GTK_DIALOG_NO_SEPARATOR is passed in and ignore it. + 2001-11-12 Matthias Clasen * gtk/gtktreeview.c: Documentation fixes. (#64377) diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index 3fdb91ef3b..1c66b04911 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -191,6 +191,12 @@ gtk_message_dialog_new (GtkWindow *parent, widget = GTK_WIDGET (gtk_type_new (GTK_TYPE_MESSAGE_DIALOG)); dialog = GTK_DIALOG (widget); + if (flags & GTK_DIALOG_NO_SEPARATOR) + { + g_warning ("The GTK_DIALOG_NO_SEPARATOR flag cannot be used for GtkMessageDialog"); + flags &= ~GTK_DIALOG_NO_SEPARATOR; + } + if (message_format) { va_start (args, message_format);