aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-utils.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-12-01 03:46:26 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-12-01 07:34:38 +0800
commitd94534c3673956164f9fb2c7f6b12188994503ae (patch)
treec26a8a2edb293478b2ad43e36de5feebaf84ce1d /mail/em-utils.c
parent420a4ccb20825d618b06c6be742c2c47cc15ca71 (diff)
downloadgsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.tar.gz
gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.tar.zst
gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.zip
Merge bits and pieces of the anjal-evo-2-30 branch.
Diffstat (limited to 'mail/em-utils.c')
-rw-r--r--mail/em-utils.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c
index cb8ebc3306..1238fcf2e5 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -79,6 +79,10 @@
#include "em-format-quote.h"
#include "e-mail-local.h"
+/* XXX This is a dirty hack on a dirty hack. We really need
+ * to rework or get rid of the functions that use this. */
+extern const gchar *shell_builtin_backend;
+
/* How many is too many? */
/* Used in em_util_ask_open_many() */
#define TOO_MANY 10
@@ -97,7 +101,8 @@ em_utils_get_data_dir (void)
* better way. Ideally, nothing below the module layer
* should need to know about the user data directory. */
shell = e_shell_get_default ();
- shell_backend = e_shell_get_backend_by_name (shell, "mail");
+ shell_backend = e_shell_get_backend_by_name (
+ shell, shell_builtin_backend);
return e_shell_backend_get_data_dir (shell_backend);
}
@@ -112,7 +117,8 @@ em_utils_get_config_dir (void)
* better way. Ideally, nothing below the module layer
* should need to know about the user config directory. */
shell = e_shell_get_default ();
- shell_backend = e_shell_get_backend_by_name (shell, "mail");
+ shell_backend = e_shell_get_backend_by_name (
+ shell, shell_builtin_backend);
return e_shell_backend_get_config_dir (shell_backend);
}
@@ -2074,7 +2080,8 @@ em_utils_show_error_silent (GtkWidget *widget)
EActivity *activity;
shell = e_shell_get_default ();
- shell_backend = e_shell_get_backend_by_name (shell, "mail");
+ shell_backend = e_shell_get_backend_by_name (
+ shell, shell_builtin_backend);
activity = e_alert_activity_new_warning (widget);
e_shell_backend_add_activity (shell_backend, activity);
@@ -2094,7 +2101,8 @@ em_utils_show_info_silent (GtkWidget *widget)
EActivity *activity;
shell = e_shell_get_default ();
- shell_backend = e_shell_get_backend_by_name (shell, "mail");
+ shell_backend = e_shell_get_backend_by_name (
+ shell, shell_builtin_backend);
activity = e_alert_activity_new_info (widget);
e_shell_backend_add_activity (shell_backend, activity);