diff options
61 files changed, 106 insertions, 103 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 501af7d97e..f31b25de95 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -43,7 +43,7 @@ #include "addressbook/printing/e-contact-print.h" #include "addressbook/gui/widgets/eab-gui-util.h" #include "e-util/e-util.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "misc/e-dateedit.h" #include "misc/e-image-chooser.h" #include "misc/e-url-entry.h" diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index bc750d15ef..6525738fed 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -33,7 +33,7 @@ #include "e-contact-editor.h" #include "e-contact-quick-add.h" #include "eab-contact-merging.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" typedef struct _QuickAdd QuickAdd; struct _QuickAdd { diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 7eb07007da..4c5b2ba8f8 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -24,7 +24,7 @@ #include "e-contact-list-editor.h" #include <e-util/e-util-private.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include "shell/e-shell.h" #include <string.h> diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index 5359d8d607..723ce1d093 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -23,7 +23,7 @@ #include <string.h> #include "e-contact-list-model.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "shell/e-shell.h" static gpointer parent_class; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index cb64e36272..a7956a9f8f 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -52,7 +52,7 @@ #include "e-addressbook-table-adapter.h" #include "eab-contact-merging.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" #include <gdk/gdkkeysyms.h> diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index efc97e682e..0faa1a14cf 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -35,7 +35,7 @@ #include "eab-gui-util.h" #include "util/eab-book-util.h" #include <libebook/e-destination.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-html-utils.h" #include "shell/e-shell.h" #include "misc/e-image-chooser.h" @@ -147,7 +147,7 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) } } - dialog = e_alert_new_dialog_for_args ((GtkWindow *) parent, "addressbook:load-error", label_string, NULL); + dialog = e_alert_dialog_new_for_args ((GtkWindow *) parent, "addressbook:load-error", label_string, NULL); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); gtk_widget_show (dialog); diff --git a/addressbook/util/addressbook.c b/addressbook/util/addressbook.c index 7fe470a4f3..d49f19bd7a 100644 --- a/addressbook/util/addressbook.c +++ b/addressbook/util/addressbook.c @@ -30,7 +30,7 @@ #include <libedataserver/e-url.h> #include <libedataserverui/e-passwords.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "shell/e-shell.h" #include "addressbook.h" diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 81ac2b6f82..2c827afacf 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -28,7 +28,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "cancel-comp.h" diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 07d68806a5..18bd574728 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -65,7 +65,7 @@ #include "widgets/misc/e-attachment-view.h" #include "widgets/misc/e-attachment-paned.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #define COMP_EDITOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index d5f5929e6a..e0a431ffb7 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -27,7 +27,7 @@ #endif #include <glib/gi18n.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "../calendar-config.h" #include "delete-comp.h" diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index dc698b4596..823bd4be52 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -25,7 +25,7 @@ #include <config.h> #endif -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "save-comp.h" #include "comp-editor.h" diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 1d663478c8..a42501c9d6 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -27,7 +27,7 @@ #endif #include <glib/gi18n-lib.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "send-comp.h" @@ -154,7 +154,7 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo strip_alarms = NULL; } - dialog = e_alert_new_dialog_for_args (parent, id, NULL); + dialog = e_alert_dialog_new_for_args (parent, id, NULL); if (strip_alarms) sa_checkbox = add_checkbox (GTK_BOX (GTK_DIALOG (dialog)->vbox), _("Send my alarms with this event")); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 840c5526c6..f23088af83 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -32,7 +32,7 @@ #include <gdk/gdkkeysyms.h> #include <libedataserver/e-time-utils.h> #include <e-util/e-util.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-selection.h> #include <e-util/e-datetime-format.h> #include <e-util/e-dialog-utils.h> @@ -1202,7 +1202,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view, if (e_cal_is_read_only (default_client, &readonly, NULL) && readonly) { GtkWidget *widget; - widget = e_alert_new_dialog_for_args (parent, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL); + widget = e_alert_dialog_new_for_args (parent, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL); g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy), widget); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 22791b31c3..f4f15d2482 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -46,7 +46,7 @@ #include <widgets/menus/gal-define-views-dialog.h> #include "e-util/e-binding.h" #include "e-util/e-util.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" #include "shell/e-shell.h" #include "dialogs/delete-error.h" @@ -1900,7 +1900,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) return; } - w = e_alert_new_dialog_for_args (parent, "calendar:server-version", NULL); + w = e_alert_dialog_new_for_args (parent, "calendar:server-version", NULL); /*e_calendar_utils_show_error_silent (w); KILL-BONOBO */ g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w)); g_signal_connect(w, "destroy", G_CALLBACK(non_intrusive_error_remove), id); @@ -1922,7 +1922,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) return; } - w = e_alert_new_dialog_for_args (parent, "calendar:unable-to-load-the-calendar", e_cal_get_error_message (status), NULL); + w = e_alert_dialog_new_for_args (parent, "calendar:unable-to-load-the-calendar", e_cal_get_error_message (status), NULL); /*e_calendar_utils_show_error_silent (w); KILL-BONOBO */ g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w)); g_signal_connect(w, "destroy", G_CALLBACK(non_intrusive_error_remove), id); @@ -2114,7 +2114,7 @@ backend_died_cb (ECal *ecal, gpointer data) return; } - w = e_alert_new_dialog_for_args (parent, "calendar:backend_died", NULL); + w = e_alert_dialog_new_for_args (parent, "calendar:backend_died", NULL); /* e_calendar_utils_show_error_silent (w); KILL-BONOBO */ g_hash_table_insert (non_intrusive_error_table, (gpointer) id, g_object_ref(w)); g_signal_connect((GtkObject *)w, "destroy", G_CALLBACK(non_intrusive_error_remove), (gpointer) id); diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 31c069a088..7332c93aad 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -21,7 +21,7 @@ #include <errno.h> #include <fcntl.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> static void action_attach_cb (GtkAction *action, diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c index 638ca9b019..a28986625d 100644 --- a/composer/e-composer-autosave.c +++ b/composer/e-composer-autosave.c @@ -22,7 +22,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-util.h> #include <camel/camel-stream-fs.h> #include <camel/camel-stream-mem.h> diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 22f2312fe9..2f2bb99baa 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -46,7 +46,7 @@ #include <gconf/gconf-client.h> #include "e-util/e-dialog-utils.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-plugin-ui.h" #include "e-util/e-util-private.h" #include "e-util/e-account-utils.h" @@ -168,7 +168,8 @@ emcu_part_to_html (CamelMimePart *part, gssize *len, EMFormat *source) static gboolean emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, const gchar *arg0, ...) { - GtkWidget *mbox, *check = NULL; + GtkDialog *mbox; + GtkWidget *check = NULL; va_list ap; gint button; GConfClient *gconf = gconf_client_get_default (); @@ -181,24 +182,24 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, c } va_start(ap, arg0); - alert = e_alert_newv(tag, arg0, ap); + alert = e_alert_new_valist(tag, arg0, ap); va_end(ap); - mbox = e_alert_new_dialog (parent, alert); - e_alert_free (alert); + mbox = (GtkDialog*) e_alert_dialog_new (parent, alert); + g_object_unref (alert); if (promptkey) { check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again.")); gtk_container_set_border_width((GtkContainer *)check, 12); - gtk_box_pack_start ((GtkBox *)((GtkDialog *) mbox)->vbox, check, TRUE, TRUE, 0); + gtk_box_pack_start ((GtkBox *)mbox->vbox, check, TRUE, TRUE, 0); gtk_widget_show (check); } - button = gtk_dialog_run ((GtkDialog *) mbox); + button = gtk_dialog_run (mbox); if (promptkey) gconf_client_set_bool(gconf, promptkey, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check)), NULL); - gtk_widget_destroy(mbox); + gtk_widget_destroy((GtkWidget*) mbox); g_object_unref (gconf); return button == GTK_RESPONSE_YES; diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c index 61d6270ab1..f1ecf496ba 100644 --- a/filter/e-filter-rule.c +++ b/filter/e-filter-rule.c @@ -30,7 +30,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-filter-rule.h" #include "e-rule-context.h" diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c index 2ad1acc3c2..96bc845500 100644 --- a/filter/e-rule-context.c +++ b/filter/e-rule-context.c @@ -40,7 +40,7 @@ #include <libedataserver/e-xml-utils.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-xml-utils.h" #include "e-filter-code.h" @@ -96,7 +96,7 @@ new_rule_response (GtkWidget *dialog, if (!e_filter_rule_validate (rule, &alert)) { e_alert_run_dialog (GTK_WINDOW (dialog), alert); - e_alert_free (alert); + g_object_unref (alert); } if (e_rule_context_find_rule (context, rule->name, rule->source)) { diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c index c6170f09e8..3cb148e5aa 100644 --- a/filter/e-rule-editor.c +++ b/filter/e-rule-editor.c @@ -31,7 +31,7 @@ #include <glib/gi18n.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" #include "e-util/e-util.h" @@ -146,7 +146,7 @@ add_editor_response (GtkWidget *dialog, gint button, ERuleEditor *editor) EAlert *alert = NULL; if (!e_filter_rule_validate (editor->edit, &alert)) { e_alert_run_dialog (GTK_WINDOW (dialog), alert); - e_alert_free (alert); + g_object_unref (alert); return; } @@ -294,7 +294,7 @@ edit_editor_response (GtkWidget *dialog, gint button, ERuleEditor *editor) EAlert *alert = NULL; if (!e_filter_rule_validate (editor->edit, &alert)) { e_alert_run_dialog (GTK_WINDOW (dialog), alert); - e_alert_free (alert); + g_object_unref (alert); return; } diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index ff129a4a87..8249187057 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -29,7 +29,7 @@ #include <camel/camel-vee-folder.h> #include <camel/camel-vee-store.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "filter/e-filter-rule.h" #include "mail/e-mail-browser.h" @@ -94,7 +94,7 @@ e_mail_reader_confirm_delete (EMailReader *reader) if (!prompt_delete_in_vfolder) return TRUE; - dialog = e_alert_new_dialog_for_args ( + dialog = e_alert_dialog_new_for_args ( window, "mail:ask-delete-vfolder-msg", folder->full_name, NULL); diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 2cd24a9ae2..0986424c88 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -48,7 +48,7 @@ #include "shell/e-shell.h" #include "e-util/e-util.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-account-utils.h" #include "e-util/e-signature-list.h" #include "e-util/e-signature-utils.h" @@ -1894,7 +1894,7 @@ static void emae_check_authtype (GtkWidget *w, EMAccountEditorService *service) uri = e_account_get_string (account, emae_service_info[service->type].account_uri_key); g_object_ref (emae); - service->check_dialog = e_alert_new_dialog_for_args (emae->editor ? (GtkWindow *)gtk_widget_get_toplevel (emae->editor) : (GtkWindow *)gtk_widget_get_toplevel (w), + service->check_dialog = e_alert_dialog_new_for_args (emae->editor ? (GtkWindow *)gtk_widget_get_toplevel (emae->editor) : (GtkWindow *)gtk_widget_get_toplevel (w), "mail:checking-service", NULL); g_signal_connect (service->check_dialog, "response", G_CALLBACK(emae_check_authtype_response), service); gtk_widget_show (service->check_dialog); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 7a6034b296..e0da3b5679 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -40,7 +40,7 @@ #include "mail-send-recv.h" #include "e-util/e-account-utils.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util.h" #include "shell/e-shell.h" diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 3a8f2dc3d5..4a336d1fe4 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -51,7 +51,7 @@ #include "e-util/e-account-utils.h" #include "e-util/e-mktemp.h" #include "e-util/e-icon-factory.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util.h" #include "em-vfolder-rule.h" diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 4fe72c7584..cf805f3b27 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -48,7 +48,7 @@ #include "e-util/e-mktemp.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "em-vfolder-rule.h" @@ -290,7 +290,7 @@ emfu_copy_folder_selected (const gchar *uri, gpointer data) if (cfd->delete && fromstore == local_store && emfu_is_special_local_folder (cfd->fi->full_name)) { GtkWidget *w; - w = e_alert_new_dialog_for_args ( + w = e_alert_dialog_new_for_args ( e_shell_get_active_window (NULL), "mail:no-rename-special-folder", cfd->fi->full_name, NULL); em_utils_show_error_silent (w); @@ -405,7 +405,7 @@ emfu_delete_done (CamelFolder *folder, gboolean removed, CamelException *ex, gpo if (ex && camel_exception_is_set (ex)) { GtkWidget *w; - w = e_alert_new_dialog_for_args ( + w = e_alert_dialog_new_for_args ( e_shell_get_active_window (NULL), "mail:no-delete-folder", folder->full_name, camel_exception_get_description (ex), NULL); em_utils_show_error_silent (w); @@ -441,7 +441,7 @@ em_folder_utils_delete_folder (CamelFolder *folder) local_store = e_mail_local_get_store (); if (folder->parent_store == local_store && emfu_is_special_local_folder (folder->full_name)) { - dialog = e_alert_new_dialog_for_args ( + dialog = e_alert_dialog_new_for_args ( parent, "mail:no-delete-special-folder", folder->full_name, NULL); em_utils_show_error_silent (dialog); @@ -456,7 +456,7 @@ em_folder_utils_delete_folder (CamelFolder *folder) camel_object_ref (folder); - dialog = e_alert_new_dialog_for_args (parent, + dialog = e_alert_dialog_new_for_args (parent, (folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder", folder->full_name, NULL); g_object_set_data_full ((GObject *) dialog, "folder", folder, camel_object_unref); diff --git a/mail/em-utils.c b/mail/em-utils.c index 3cb662e5bd..ca824d9bbe 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -70,7 +70,7 @@ #include "e-util/e-account-utils.h" #include "e-util/e-dialog-utils.h" #include "e-util/e-alert-activity.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "shell/e-shell.h" #include "widgets/misc/e-attachment.h" @@ -170,11 +170,11 @@ em_utils_prompt_user(GtkWindow *parent, const gchar *promptkey, const gchar *tag return TRUE; va_start(ap, arg0); - alert = e_alert_newv (tag, arg0, ap); + alert = e_alert_new_valist (tag, arg0, ap); va_end(ap); - mbox = e_alert_new_dialog (parent, alert); - e_alert_free (alert); + mbox = e_alert_dialog_new (parent, alert); + g_object_unref (alert); if (promptkey) { check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again.")); @@ -322,7 +322,7 @@ em_utils_edit_filters (GtkWidget *parent) g_free (system); if (((ERuleContext *) fc)->error) { - GtkWidget *w = e_alert_new_dialog_for_args ((GtkWindow *)parent, "mail:filter-load-error", ((ERuleContext *)fc)->error, NULL); + GtkWidget *w = e_alert_dialog_new_for_args ((GtkWindow *)parent, "mail:filter-load-error", ((ERuleContext *)fc)->error, NULL); em_utils_show_error_silent (w); return; } @@ -950,7 +950,7 @@ em_utils_temp_save_part(GtkWidget *parent, CamelMimePart *part, gboolean mode) tmpdir = e_mkdtemp("evolution-tmp-XXXXXX"); if (tmpdir == NULL) { - w = e_alert_new_dialog_for_args ((GtkWindow *)parent, "mail:no-create-tmp-path", g_strerror(errno), NULL); + w = e_alert_dialog_new_for_args ((GtkWindow *)parent, "mail:no-create-tmp-path", g_strerror(errno), NULL); em_utils_show_error_silent (w); return NULL; } diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index dedb49f635..bbb3694ee8 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -33,7 +33,7 @@ #include "mail-vfolder.h" #include "mail-autofilter.h" #include "em-utils.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" #include "em-vfolder-context.h" @@ -432,7 +432,7 @@ mail_filter_delete_uri(CamelStore *store, const gchar *uri) l = l->next; } - dialog = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), "mail:filter-updated", s->str, euri, NULL); + dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (NULL), "mail:filter-updated", s->str, euri, NULL); g_string_free(s, TRUE); em_utils_show_info_silent (dialog); diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 2c06561770..b0c8ee8895 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -35,9 +35,9 @@ #include "shell/e-shell.h" #include "misc/e-gui-utils.h" -#include "e-util/e-alert.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-alert-activity.h" +#include "e-util/e-alert-dialog.h" +#include "e-util/e-icon-factory.h" #include "mail-config.h" #include "mail-session.h" @@ -274,10 +274,10 @@ mail_msg_check_error (gpointer msg) if (m->info->desc && (what = m->info->desc (m))) { - gd = (GtkDialog *)e_alert_new_dialog_for_args (parent, "mail:async-error", what, camel_exception_get_description(&m->ex), NULL); + gd = (GtkDialog *)e_alert_dialog_new_for_args (parent, "mail:async-error", what, camel_exception_get_description(&m->ex), NULL); g_free(what); } else - gd = (GtkDialog *)e_alert_new_dialog_for_args (parent, "mail:async-error-nodescribe", camel_exception_get_description(&m->ex), NULL); + gd = (GtkDialog *)e_alert_dialog_new_for_args (parent, "mail:async-error-nodescribe", camel_exception_get_description(&m->ex), NULL); g_hash_table_insert(active_errors, m->info, gd); g_signal_connect(gd, "response", G_CALLBACK(error_response), m->info); diff --git a/mail/mail-session.c b/mail/mail-session.c index 92bb551458..b7b26bf8dc 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -45,7 +45,7 @@ #include <camel/camel-i18n.h> #include "e-util/e-util.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" #include "e-account-combo-box.h" #include "shell/e-shell.h" @@ -352,7 +352,7 @@ user_message_exec (struct _user_message_msg *m) g_return_if_reached (); } - user_message_dialog = e_alert_new_dialog_for_args ( + user_message_dialog = e_alert_dialog_new_for_args ( e_shell_get_active_window (NULL), error_type, m->prompt, NULL); g_object_set ( user_message_dialog, "allow_shrink", TRUE, diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 4ab49d1869..d95ee2b876 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -32,7 +32,7 @@ #include <camel/camel-vtrash-folder.h> #include <libedataserver/e-account-list.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" #include "e-util/e-account-utils.h" @@ -600,7 +600,7 @@ done: const gchar *data_dir; gchar *user; - dialog = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), "mail:vfolder-updated", changed->str, uri, NULL); + dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (NULL), "mail:vfolder-updated", changed->str, uri, NULL); em_utils_show_info_silent (dialog); data_dir = em_utils_get_data_dir (); @@ -1094,7 +1094,7 @@ vfolder_edit_rule(const gchar *uri) GtkWidget *w; /* TODO: we should probably just create it ... */ - w = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), "mail:vfolder-notexist", uri, NULL); + w = e_alert_dialog_new_for_args (e_shell_get_active_window (NULL), "mail:vfolder-notexist", uri, NULL); em_utils_show_error_silent (w); } @@ -1113,7 +1113,7 @@ new_rule_clicked(GtkWidget *w, gint button, gpointer data) if (!e_filter_rule_validate (rule, &alert)) { e_alert_run_dialog (GTK_WINDOW (w), alert); - e_alert_free (alert); + g_object_unref (alert); return; } diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index 11b3eca445..9c53f411d5 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -45,7 +45,7 @@ #include "addressbook-config.h" #include "e-util/e-util.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" #include "addressbook/gui/widgets/eab-config.h" diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index cf5c615238..92ef88c01a 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -21,7 +21,7 @@ #include "e-book-shell-view-private.h" -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-util.h> #include <filter/e-filter-rule.h> diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index 70ddebf4f9..19c75e3e82 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -24,7 +24,7 @@ #include <string.h> #include <glib/gi18n.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-binding.h" #include "e-util/gconf-bridge.h" #include "widgets/misc/e-paned.h" diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index c1aebdbc33..3b25d0b763 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -19,7 +19,7 @@ * */ -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-cal-shell-view-private.h" /* This is for radio action groups whose value is persistent. We diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index 378fe51964..fb8ee9b04a 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -26,7 +26,7 @@ #include <libecal/e-cal.h> #include "e-util/e-binding.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util.h" #include "calendar/common/authentication.h" #include "calendar/gui/calendar-config.h" diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c index aa95991c96..f5fb6284b4 100644 --- a/modules/calendar/e-memo-shell-view-actions.c +++ b/modules/calendar/e-memo-shell-view-actions.c @@ -19,7 +19,7 @@ * */ -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-memo-shell-view-private.h" static void diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index 09f8baeb74..532e8f696b 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -25,7 +25,7 @@ #include <glib/gi18n.h> #include <libecal/e-cal.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util.h" #include "calendar/common/authentication.h" #include "calendar/gui/calendar-config.h" diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c index e5d861526d..f1285a714b 100644 --- a/modules/calendar/e-task-shell-view-actions.c +++ b/modules/calendar/e-task-shell-view-actions.c @@ -19,7 +19,7 @@ * */ -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-task-shell-view-private.h" static void diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c index a1946c6f68..e00ba9df64 100644 --- a/modules/mail/e-mail-attachment-handler.c +++ b/modules/mail/e-mail-attachment-handler.c @@ -25,7 +25,7 @@ #include <camel/camel-folder.h> #include <camel/camel-stream-mem.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "mail/em-composer-utils.h" #include "mail/mail-tools.h" diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c index 47637eb1d4..ccdcf0c97e 100644 --- a/modules/mail/e-mail-junk-hook.c +++ b/modules/mail/e-mail-junk-hook.c @@ -24,7 +24,7 @@ #include <glib/gi18n.h> #include <camel/camel-junk-plugin.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "shell/e-shell.h" #include "mail/em-junk.h" @@ -52,7 +52,7 @@ mail_junk_hook_idle_cb (struct ErrorData *data) { GtkWidget *widget; - widget = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), + widget = e_alert_dialog_new_for_args (e_shell_get_active_window (NULL), data->error_message, data->error->message, NULL); em_utils_show_error_silent (widget); diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 8dd3caf643..d54569cefe 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -29,7 +29,7 @@ #include "e-util/e-account-utils.h" #include "e-util/e-binding.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-import.h" #include "e-util/e-util.h" #include "shell/e-shell.h" diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c index 7231cc8061..67f6139d8c 100644 --- a/modules/mail/e-mail-shell-migrate.c +++ b/modules/mail/e-mail-shell-migrate.c @@ -58,7 +58,7 @@ #include "e-util/e-account-utils.h" #include "e-util/e-bconf-map.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" #include "e-util/e-plugin.h" #include "e-util/e-signature-utils.h" diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index 81ce907e18..eaacec6c33 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -34,7 +34,7 @@ #include <glib/gi18n.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-mail-store.h" #include "em-config.h" diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index b023cbc5ce..ee17785fbd 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -39,7 +39,7 @@ #include <camel/camel-mime-message.h> #include <camel/camel-multipart.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-plugin.h> #include <mail/em-utils.h> @@ -122,7 +122,7 @@ ask_for_missing_attachment (EPlugin *ep, GtkWindow *window) GtkDialog *dialog = NULL; gint response; - dialog = (GtkDialog*)e_alert_new_dialog_for_args(window, "org.gnome.evolution.plugins.attachment_reminder:attachment-reminder", NULL); + dialog = (GtkDialog*)e_alert_dialog_new_for_args(window, "org.gnome.evolution.plugins.attachment_reminder:attachment-reminder", NULL); /*Check buttons*/ check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again.")); diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 9f3413cbbe..bc7766e861 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -33,7 +33,7 @@ #include <glib/gstdio.h> #include "mail/em-config.h" #include "mail/em-account-editor.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-util.h" #include "e-util/e-dialog-utils.h" #include "shell/e-shell-utils.h" @@ -104,11 +104,11 @@ dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, con EAlert *alert = NULL; va_start(ap, arg0); - alert = e_alert_newv(tag, arg0, ap); + alert = e_alert_new_valist(tag, arg0, ap); va_end(ap); - mbox = e_alert_new_dialog (parent, alert); - e_alert_free (alert); + mbox = e_alert_dialog_new (parent, alert); + g_object_unref (alert); check = gtk_check_button_new_with_mnemonic (string); /* We should hardcode this to true */ diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index e75c47fc1c..5b10072a2d 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -29,7 +29,7 @@ #include <mail/em-config.h> #include <mail/em-composer-utils.h> #include <mail/mail-config.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-msg-composer.h> #include <camel/camel-mime-filter-tohtml.h> diff --git a/plugins/face/face.c b/plugins/face/face.c index 10864c0103..478f7888c6 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -29,7 +29,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <mail/em-event.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-util.h> #include <e-util/e-icon-factory.h> diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c index db3bcac4f7..a23e39ed00 100644 --- a/plugins/groupwise-features/camel-gw-listener.c +++ b/plugins/groupwise-features/camel-gw-listener.c @@ -29,7 +29,7 @@ #include <camel/camel-i18n.h> #include <e-gw-connection.h> #include <libedataserverui/e-passwords.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include <libedataserver/e-account.h> #include <libecal/e-cal.h> #include <shell/e-shell.h> diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 0ef1fd8e88..3de31b6838 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -29,7 +29,7 @@ #include <camel/camel-store.h> #include <camel/camel-folder.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <mail/e-mail-reader.h> #include <mail/em-utils.h> diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 5f12a9a0e5..5a2b55c2c9 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -30,7 +30,7 @@ #include <gtk/gtk.h> #include <libecal/e-cal.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <shell/e-shell-view.h> #include <calendar/gui/e-calendar-view.h> diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index b885b1445b..764fb9d8c4 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -38,7 +38,7 @@ #include <mail/mail-ops.h> #include <libedataserver/e-account.h> #include <e-util/e-util.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> #include <e-util/e-account-utils.h> diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index a6c1b58f90..625789c370 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -31,7 +31,7 @@ #include <libedataserverui/e-contact-store.h> #include <e-util/e-util.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-util-private.h> #include <e-gw-container.h> #include <e-gw-connection.h> diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index d417f4ce77..24772a89bc 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -27,7 +27,7 @@ #include <glib/gi18n-lib.h> #include <libedataserverui/e-contact-store.h> #include <e-util/e-util.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-util-private.h> #include <e-gw-container.h> #include <e-gw-connection.h> diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index f9de6c7f9f..d1819b4b48 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -52,7 +52,7 @@ #include <mail/mail-tools.h> #include <mail/mail-mt.h> #include <libedataserver/e-account-list.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <calendar/gui/calendar-config.h> #include <calendar/gui/itip-utils.h> #include <calendar/common/authentication.h> diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 8304345730..59e54e621a 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -46,7 +46,7 @@ #include "mail/mail-config.h" #include "mail/message-list.h" #include "e-util/e-util.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "shell/e-shell-view.h" #include "shell/e-shell-window.h" #include "shell/e-shell-window-actions.h" diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index 2fbf0d7bbe..677bca5825 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -33,7 +33,7 @@ #include <libedataserver/e-source.h> #include <libedataserverui/e-source-selector.h> #include <libecal/e-cal.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <string.h> #include <shell/e-shell-sidebar.h> diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 8205040086..c727c58bcd 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -24,7 +24,7 @@ #include <gconf/gconf-client.h> #include <glib/gi18n.h> #include <gtk/gtk.h> -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-import.h" #include "shell/e-shell.h" #include "shell/es-event.h" @@ -227,7 +227,7 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target) import_iterator = import_importers; import_importer = import_iterator->data; - import_dialog = e_alert_new_dialog_for_args (e_shell_get_active_window (shell), "shell:importing", _("Importing data."), NULL); + import_dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (shell), "shell:importing", _("Importing data."), NULL); g_signal_connect(import_dialog, "response", G_CALLBACK(import_dialog_response), NULL); import_label = gtk_label_new(_("Please wait")); import_progress = gtk_progress_bar_new(); diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index 44d2ff9604..6ffa73fa0a 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -25,6 +25,7 @@ #include "e-util/e-binding.h" #include "e-util/e-util.h" +#include "e-util/e-alert-dialog.h" #include "filter/e-rule-editor.h" #include "widgets/misc/e-action-combo-box.h" #include "widgets/misc/e-hinted-entry.h" @@ -1519,7 +1520,7 @@ run: if (!e_filter_rule_validate (rule, &alert)) { e_alert_run_dialog (GTK_WINDOW (dialog), alert); - e_alert_free (alert); + g_object_unref (alert); alert = NULL; goto run; } @@ -1627,7 +1628,7 @@ run: if (!e_filter_rule_validate (rule, &alert)) { e_alert_run_dialog (GTK_WINDOW (dialog), alert); - e_alert_free (alert); + g_object_unref (alert); alert = NULL; goto run; } diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index e2aacc451e..6f7208a593 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -28,7 +28,7 @@ #include <libedataserver/e-xml-utils.h> #include "e-util/e-bconf-map.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "e-util/e-file-utils.h" #include "e-util/e-util.h" diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index fdaac72abd..df96043076 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -23,7 +23,7 @@ #include "e-preferences-window.h" #include <e-util/e-dialog-utils.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-print.h> #include <gal-define-views-dialog.h> @@ -320,6 +320,7 @@ static const gchar *authors[] = { "Jonas Borgstr", "Jonathan Blandford", "Jonathan Dieter", + "Jonathon Jongsma", "Jos Dehaes", "Josselin Mouette", "JP Rosvear", diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c index 49ce3c6a32..9266425494 100644 --- a/widgets/misc/e-signature-editor.c +++ b/widgets/misc/e-signature-editor.c @@ -24,7 +24,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <e-util/e-alert.h> +#include <e-util/e-alert-dialog.h> #include <e-util/e-signature-utils.h> #define E_SIGNATURE_EDITOR_GET_PRIVATE(obj) \ |