diff options
| -rw-r--r-- | e-util/ChangeLog | 7 | ||||
| -rw-r--r-- | e-util/e-dialog-utils.c | 2 | ||||
| -rw-r--r-- | e-util/e-passwords.c | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 982709dbf7..77eaa49d19 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -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. diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 702ee053ca..63d3f1d74c 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -71,7 +71,9 @@ e_notice (gpointer parent, GtkMessageType type, const char *format, ...) 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); diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c index 61627729dd..3798819f22 100644 --- a/e-util/e-passwords.c +++ b/e-util/e-passwords.c @@ -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); |