diff options
Diffstat (limited to 'plugins')
24 files changed, 53 insertions, 65 deletions
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index ab13ca914c..b023cbc5ce 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-error.h> +#include <e-util/e-alert.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_error_new(window, "org.gnome.evolution.plugins.attachment_reminder:attachment-reminder", NULL); + dialog = (GtkDialog*)e_alert_new_dialog_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 19905a6537..9f3413cbbe 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-error.h" +#include "e-util/e-alert.h" #include "e-util/e-util.h" #include "e-util/e-dialog-utils.h" #include "shell/e-shell-utils.h" @@ -101,14 +101,14 @@ dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, con va_list ap; gint button; guint32 mask = 0; - EError *error = NULL; + EAlert *alert = NULL; va_start(ap, arg0); - error = e_error_newv(tag, arg0, ap); + alert = e_alert_newv(tag, arg0, ap); va_end(ap); - mbox = e_error_new_dialog (parent, error); - e_error_free (error); + mbox = e_alert_new_dialog (parent, alert); + e_alert_free (alert); check = gtk_check_button_new_with_mnemonic (string); /* We should hardcode this to true */ @@ -188,7 +188,7 @@ action_settings_backup_cb (GtkAction *action, g_free (path); } } else { - e_error_run_dialog_for_args ( + e_alert_run_dialog_for_args ( GTK_WINDOW (shell_window), "org.gnome.backup-restore:insufficient-permissions", NULL); } @@ -224,7 +224,7 @@ action_settings_restore_cb (GtkAction *action, if (mask & BR_OK) restore (path, mask & BR_START); } else { - e_error_run_dialog_for_args ( + e_alert_run_dialog_for_args ( GTK_WINDOW (shell_window), "org.gnome.backup-restore:invalid-backup", NULL); } @@ -331,7 +331,7 @@ backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target) if (state) { if (!file || !sanity_check (file)) { - e_error_run_dialog_for_args ((GtkWindow *)assistant, + e_alert_run_dialog_for_args ((GtkWindow *)assistant, "org.gnome.backup-restore:invalid-backup", NULL); } else { diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c index ebfa0f829e..93c100631b 100644 --- a/plugins/default-mailer/default-mailer.c +++ b/plugins/default-mailer/default-mailer.c @@ -25,7 +25,6 @@ #include <string.h> #include <gconf/gconf-client.h> -#include <e-util/e-error.h> #include <mail/em-utils.h> #include <shell/es-event.h> diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index d30a40afa6..a4e1ef2e65 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -27,7 +27,6 @@ #include <string.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> -#include <e-util/e-error.h> #include "mail/em-utils.h" #include "mail/em-event.h" #include "composer/e-msg-composer.h" diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index adc9678550..e75c47fc1c 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-error.h> +#include <e-util/e-alert.h> #include <e-msg-composer.h> #include <camel/camel-mime-filter-tohtml.h> @@ -208,7 +208,7 @@ run_error_dialog (struct run_error_dialog_data *data) { g_return_val_if_fail (data != NULL, FALSE); - e_error_run (GTK_WINDOW (data->composer), data->text, NULL); + e_alert_run_dialog_for_args (GTK_WINDOW (data->composer), data->text, NULL); enable_composer (data->composer); g_free (data); @@ -430,7 +430,7 @@ static gboolean delete_cb (GtkWidget *widget, EMsgComposer *composer) { if (editor_running()) { - e_error_run (NULL, "org.gnome.evolution.plugins.external-editor:editor-still-running", NULL); + e_alert_run_dialog_for_args (NULL, "org.gnome.evolution.plugins.external-editor:editor-still-running", NULL); return TRUE; } diff --git a/plugins/face/face.c b/plugins/face/face.c index 67c37f7cd0..10864c0103 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-error.h> +#include <e-util/e-alert.h> #include <e-util/e-util.h> #include <e-util/e-icon-factory.h> @@ -172,7 +172,7 @@ prepare_image (const gchar *image_filename, gchar **file_contents, gsize *length err = error->message; if (can_claim) - e_error_run (NULL, "org.gnome.evolution.plugins.face:not-an-image", err, NULL); + e_alert_run_dialog_for_args (NULL, "org.gnome.evolution.plugins.face:not-an-image", err, NULL); if (error) g_error_free (error); @@ -184,7 +184,7 @@ prepare_image (const gchar *image_filename, gchar **file_contents, gsize *length if (height <= 0 || width <= 0) { if (can_claim) - e_error_run (NULL, "org.gnome.evolution.plugins.face:invalid-image-size", NULL, NULL); + e_alert_run_dialog_for_args (NULL, "org.gnome.evolution.plugins.face:invalid-image-size", NULL, NULL); } else if (height != 48 || width != 48) { GdkPixbuf *copy, *scale; guchar *pixels; @@ -242,7 +242,7 @@ prepare_image (const gchar *image_filename, gchar **file_contents, gsize *length g_object_unref (loader); } else { if (can_claim) - e_error_run (NULL, "org.gnome.evolution.plugins.face:file-not-found", NULL, NULL); + e_alert_run_dialog_for_args (NULL, "org.gnome.evolution.plugins.face:file-not-found", NULL, NULL); } return res; diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c index 27bd49e36c..db3bcac4f7 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-error.h" +#include "e-util/e-alert.h" #include <libedataserver/e-account.h> #include <libecal/e-cal.h> #include <shell/e-shell.h> @@ -542,7 +542,7 @@ get_addressbook_names_from_server (gchar *source_url) /*FIXME: This error message should be relocated to addressbook and should reflect * that it actually failed to get the addressbooks*/ - e_error_run_dialog_for_args (e_shell_get_active_window (NULL), + e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), "mail:gw-accountsetup-error", poa_address, NULL); return NULL; @@ -656,7 +656,7 @@ add_addressbook_sources (EAccount *account) if (!is_frequent_contacts) { /* display warning message */ - e_error_run_dialog_for_args (e_shell_get_active_window (NULL), + e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), "addressbook:gw-book-list-init", NULL); } return TRUE; diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index ac985fd213..23f4a0833f 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -27,7 +27,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <e-util/e-util.h> -#include <e-util/e-error.h> #include <e-util/e-util-private.h> #include <e-gw-connection.h> #define ROOTNODE "vboxSettings" diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index cffc371454..70b79d7c80 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-error.h> +#include <e-util/e-alert.h> #include <mail/e-mail-reader.h> @@ -100,7 +100,7 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view) if (n == GTK_RESPONSE_YES) { if (e_gw_connection_retract_request (cnc, id, NULL, FALSE, FALSE) != E_GW_CONNECTION_STATUS_OK ) - e_error_run_dialog_for_args (GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), + e_alert_run_dialog_for_args (GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), "org.gnome.evolution.message.retract:retract-failure", NULL); else { diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 611213bd42..5f12a9a0e5 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-error.h> +#include <e-util/e-alert.h> #include <shell/e-shell-view.h> #include <calendar/gui/e-calendar-view.h> @@ -176,7 +176,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status) else msg = "org.gnome.evolution.process_meeting:recurrence-decline"; - response = e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)cal_view)), + response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)cal_view)), msg, NULL); if (response == GTK_RESPONSE_YES) { icalproperty *prop; @@ -347,7 +347,7 @@ object_created_cb (CompEditor *ce, gpointer data) gtk_widget_hide (GTK_WIDGET (ce)); - response = e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)ce)), + response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)ce)), "org.gnome.evolution.process_meeting:resend-retract", NULL); if (response == GTK_RESPONSE_NO) { @@ -392,7 +392,7 @@ gw_resend_meeting_cb (GtkAction *action, EShellView *shell_view) else msg = "org.gnome.evolution.process_meeting:resend"; - response = e_error_run_dialog_for_args (GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), + response = e_alert_run_dialog_for_args (GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), msg, NULL); if (response == GTK_RESPONSE_YES) { mod = CALOBJ_MOD_ALL; diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 684dcd6d38..b885b1445b 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-error.h> +#include <e-util/e-alert.h> #include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> #include <e-util/e-account-utils.h> @@ -320,7 +320,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent) if (email[i]=='@') name = g_strndup(email, i); else { - e_error_run_dialog_for_args (error_parent, + e_alert_run_dialog_for_args (error_parent, "org.gnome.evolution.proxy-login:invalid-user", email, NULL); return; @@ -330,7 +330,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent) If so, it is violating the (li)unix philosophy of User creation. So dont care about that scenario*/ if (e_account_list_find (accounts, E_ACCOUNT_FIND_ID_ADDRESS, email) != NULL) { - e_error_run_dialog_for_args (error_parent, + e_alert_run_dialog_for_args (error_parent, "org.gnome.evolution.proxy-login:already-loggedin", email, NULL); g_free (name); @@ -367,7 +367,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent) g_free (parent_source_url); camel_url_free (parent); } else { - e_error_run_dialog_for_args (error_parent, + e_alert_run_dialog_for_args (error_parent, "org.gnome.evolution.proxy-login:invalid-user", email, NULL); return; diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index bac1f9ba80..a6c1b58f90 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-error.h> +#include <e-util/e-alert.h> #include <e-util/e-util-private.h> #include <e-gw-container.h> #include <e-gw-connection.h> @@ -330,7 +330,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa tmp = destinations; if (!tmp) { - e_error_run_dialog_for_args (parent, + e_alert_run_dialog_for_args (parent, "org.gnome.evolution.proxy:no-user", NULL, NULL); return -1; @@ -344,13 +344,13 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa continue; if (g_strrstr (email, "@") == NULL) { - e_error_run_dialog_for_args (parent, + e_alert_run_dialog_for_args (parent, "org.gnome.evolution.proxy:invalid-user", email, NULL); return -1; } if (! g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) { - e_error_run_dialog_for_args (parent, + e_alert_run_dialog_for_args (parent, "org.gnome.evolution.proxy:invalid-user", email, NULL); return -1; @@ -371,7 +371,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa return 0; } - e_error_run_dialog_for_args (parent, + e_alert_run_dialog_for_args (parent, "org.gnome.evolution.proxy:user-is-proxy", email, NULL); return -1; diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index c7850c50e7..d417f4ce77 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-error.h> +#include <e-util/e-alert.h> #include <e-util/e-util-private.h> #include <e-gw-container.h> #include <e-gw-connection.h> @@ -339,12 +339,12 @@ add_clicked(GtkButton *button, ShareFolder *sf) email = e_destination_get_email (tmp->data); /* You can't share a folder with yourself*/ if (g_strrstr (email, "@") == NULL || (!g_ascii_strcasecmp (email , self_email))) - e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))), + e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))), "org.gnome.evolution.mail_shared_folder:invalid-user", email, NULL); else { if (!g_ascii_strcasecmp (email, "" )) { - e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))), + e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))), "org.gnome.evolution.mail_shared_folder:no-user", NULL); return; diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index 23e0dbe5d6..e6adef04fc 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -27,7 +27,6 @@ #include <string.h> #include <camel/camel-i18n.h> #include <libedataserverui/e-passwords.h> -#include <e-util/e-error.h> #include <libedataserver/e-account.h> #include "camel-hula-listener.h" diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index d6c06fbdf8..f9de6c7f9f 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-error.h> +#include <e-util/e-alert.h> #include <calendar/gui/calendar-config.h> #include <calendar/gui/itip-utils.h> #include <calendar/common/authentication.h> @@ -1319,7 +1319,7 @@ update_attendee_status (struct _itip_puri *pitip) if ((a->status == ICAL_PARTSTAT_DELEGATED) && (del_prop = find_attendee (org_icalcomp, itip_strip_mailto (a->delto))) && !(find_attendee (icalcomp, itip_strip_mailto (a->delto)))) { gint response; delegate = icalproperty_get_attendee (del_prop); - response = e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (pitip->view)), + response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (pitip->view)), "org.gnome.itip-formatter:add-delegate", itip_strip_mailto (a->value), itip_strip_mailto (delegate), NULL); @@ -1338,7 +1338,7 @@ update_attendee_status (struct _itip_puri *pitip) gint response; if (a->delfrom && *a->delfrom) { - response = e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (pitip->view)), + response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (pitip->view)), "org.gnome.itip-formatter:add-delegate", itip_strip_mailto (a->delfrom), itip_strip_mailto (a->value), NULL); @@ -1358,7 +1358,7 @@ update_attendee_status (struct _itip_puri *pitip) } } - response = e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (pitip->view)), + response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (pitip->view)), "org.gnome.itip-formatter:add-unknown-attendee", NULL); if (response == GTK_RESPONSE_YES) { diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 9e88b356bd..c665f33227 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -45,12 +45,12 @@ #include "mail/mail-mt.h" #include "mail/mail-config.h" #include "e-util/e-util.h" -#include "e-util/e-error.h" +#include "e-util/e-alert.h" #include "shell/e-shell-view.h" #include "shell/e-shell-window.h" #include "shell/e-shell-window-actions.h" -/* EError Message IDs */ +/* EAlert Message IDs */ #define MESSAGE_PREFIX "org.gnome.mailing-list-actions:" #define MESSAGE_NO_ACTION MESSAGE_PREFIX "no-action" #define MESSAGE_NO_HEADER MESSAGE_PREFIX "no-header" @@ -122,7 +122,7 @@ emla_list_action_do (CamelFolder *folder, if (!header) { /* there was no header matching the action */ - e_error_run_dialog_for_args (parent, MESSAGE_NO_HEADER, NULL); + e_alert_run_dialog_for_args (parent, MESSAGE_NO_HEADER, NULL); goto exit; } @@ -131,7 +131,7 @@ emla_list_action_do (CamelFolder *folder, if (action == EMLA_ACTION_POST) { while (*headerpos == ' ') headerpos++; if (g_ascii_strcasecmp (headerpos, "NO") == 0) { - e_error_run_dialog_for_args (parent, MESSAGE_POSTING_NOT_ALLOWED, NULL); + e_alert_run_dialog_for_args (parent, MESSAGE_POSTING_NOT_ALLOWED, NULL); goto exit; } } @@ -141,7 +141,7 @@ emla_list_action_do (CamelFolder *folder, /* skip whitespace */ while (*headerpos == ' ') headerpos++; if (*headerpos != '<' || (end = strchr (headerpos++, '>')) == NULL) { - e_error_run_dialog_for_args ( + e_alert_run_dialog_for_args ( parent, MESSAGE_MALFORMED_HEADER, emla_action_headers[t].header, header, NULL); goto exit; @@ -154,7 +154,7 @@ emla_list_action_do (CamelFolder *folder, if (emla_action_headers[t].interactive) send_message_response = GTK_RESPONSE_NO; else - send_message_response = e_error_run_dialog_for_args ( + send_message_response = e_alert_run_dialog_for_args ( parent, MESSAGE_ASK_SEND_MESSAGE, url, NULL); @@ -188,7 +188,7 @@ emla_list_action_do (CamelFolder *folder, } /* if we got here, there's no valid action */ - e_error_run_dialog_for_args (parent, MESSAGE_NO_ACTION, header, NULL); + e_alert_run_dialog_for_args (parent, MESSAGE_NO_ACTION, header, NULL); exit: g_object_unref (action_data->reader); diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index cb36dc01a2..baaa80c573 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -33,7 +33,6 @@ #include <mail/mail-ops.h> #include <mail/mail-mt.h> #include <camel/camel-vee-folder.h> -#include "e-util/e-error.h" #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 7a4e856d68..63798106f1 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -34,8 +34,6 @@ #include "calendar/common/authentication.h" #include <string.h> -#include "e-util/e-error.h" - #include "format-handler.h" typedef struct _CsvConfig CsvConfig; diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index 7888ecc4c1..0c5a18f252 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -35,7 +35,6 @@ #include <string.h> #include "format-handler.h" -#include "e-util/e-error.h" static void display_error_message (GtkWidget *parent, const gchar *message) diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 8734e17710..d28d2ef587 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -38,9 +38,7 @@ #include <libxml/xpath.h> #include <string.h> -#include "e-util/e-error.h" #include "calendar/common/authentication.c" - #include "format-handler.h" static void diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index ab6afad801..2fbf0d7bbe 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-error.h> +#include <e-util/e-alert.h> #include <string.h> #include <shell/e-shell-sidebar.h> @@ -239,7 +239,7 @@ open_for_writing (GtkWindow *parent, const gchar *uri, GError **error) if (err && err->code == G_IO_ERROR_EXISTS) { g_clear_error (&err); - if (e_error_run_dialog_for_args (parent, E_ERROR_ASK_FILE_EXISTS_OVERWRITE, uri, NULL) == GTK_RESPONSE_OK) { + if (e_alert_run_dialog_for_args (parent, E_ALERT_ASK_FILE_EXISTS_OVERWRITE, uri, NULL) == GTK_RESPONSE_OK) { fostream = g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &err); if (err && fostream) { diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 7b691853fd..8205040086 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-error.h" +#include "e-util/e-alert.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_error_new (e_shell_get_active_window (shell), "shell:importing", _("Importing data."), NULL); + import_dialog = e_alert_new_dialog_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/plugins/templates/templates.c b/plugins/templates/templates.c index c3e1ff20dd..b96c01b868 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -42,7 +42,6 @@ #include <mail/mail-session.h> #include <mail/mail-ops.h> #include <mail/message-list.h> -#include <e-util/e-error.h> #include <e-util/e-plugin.h> #include <e-util/e-util.h> #include <shell/e-shell-view.h> diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 3ef047d526..f353d15366 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -49,7 +49,6 @@ #include <em-format/em-format.h> #include <mail/em-format-hook.h> #include <mail/em-utils.h> -#include <e-util/e-error.h> #include <e-util/e-mktemp.h> gint verbose = 0; |