aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon@quotidian.org>2009-12-08 00:19:37 +0800
committerJonathon Jongsma <jonathon@quotidian.org>2009-12-08 02:25:23 +0800
commit31204c9cc21ec32c8006124cf18763161daa99d2 (patch)
tree7e2173da211f3e844172ea0dbdfb0e87638d8e85 /shell
parentf20528381a13299e8d160195d4b731e10b7ed437 (diff)
downloadgsoc2013-evolution-31204c9cc21ec32c8006124cf18763161daa99d2.tar
gsoc2013-evolution-31204c9cc21ec32c8006124cf18763161daa99d2.tar.gz
gsoc2013-evolution-31204c9cc21ec32c8006124cf18763161daa99d2.tar.bz2
gsoc2013-evolution-31204c9cc21ec32c8006124cf18763161daa99d2.tar.lz
gsoc2013-evolution-31204c9cc21ec32c8006124cf18763161daa99d2.tar.xz
gsoc2013-evolution-31204c9cc21ec32c8006124cf18763161daa99d2.tar.zst
gsoc2013-evolution-31204c9cc21ec32c8006124cf18763161daa99d2.zip
Port all error code to use GObject-ified EAlert / EAlertDialog
The changes are mainly including the e-alert-header.h header instead of just e-alert.h. This allows us to include e-alert.h in non-UI situations when necessary.
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-content.c5
-rw-r--r--shell/e-shell-migrate.c2
-rw-r--r--shell/e-shell-window-actions.c3
3 files changed, 6 insertions, 4 deletions
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",