diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-20 18:30:49 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-20 18:38:34 +0800 |
commit | f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f (patch) | |
tree | c4ce0b4804b5f9da667b50ac58f9a010cba3b808 | |
parent | a4a310d49f49c05c9e52c35177e7dcb03aa9781f (diff) | |
download | gsoc2013-evolution-f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f.tar gsoc2013-evolution-f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f.tar.gz gsoc2013-evolution-f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f.tar.bz2 gsoc2013-evolution-f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f.tar.lz gsoc2013-evolution-f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f.tar.xz gsoc2013-evolution-f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f.tar.zst gsoc2013-evolution-f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f.zip |
Fix compiler warnings.
-rw-r--r-- | modules/calendar/e-cal-shell-backend.c | 2 | ||||
-rw-r--r-- | plugins/mail-notification/mail-notification.c | 4 | ||||
-rw-r--r-- | shell/main.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 5e6f390189..f798668725 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -130,6 +130,8 @@ cal_shell_backend_ensure_sources (EShellBackend *shell_backend) base_uri[7] = base_uri_seventh; } + name = _("On This Computer"); + if (on_this_computer != NULL) { GSList *sources, *iter; const gchar *group_base_uri; diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 72e3881b23..583d474b2d 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -465,7 +465,7 @@ can_support_actions (void) static void new_notify_status (EMEventTargetFolder *t) { - gchar *msg, *safetext; + gchar *msg; gboolean new_icon = !status_icon; if (new_icon) { @@ -540,6 +540,8 @@ new_notify_status (EMEventTargetFolder *t) #ifdef HAVE_LIBNOTIFY /* Now check whether we're supposed to send notifications */ if (is_part_enabled (GCONF_KEY_STATUS_NOTIFICATION)) { + gchar *safetext; + safetext = g_markup_escape_text(msg, strlen(msg)); if (notify) { notify_notification_update (notify, _("New email"), safetext, "mail-unread"); diff --git a/shell/main.c b/shell/main.c index 98b55bdf83..4d9cd7ab0c 100644 --- a/shell/main.c +++ b/shell/main.c @@ -259,7 +259,7 @@ idle_cb (gchar **uris) gtk_main_quit (); } else { if (express_mode && requested_view == NULL) - requested_view = "mail"; + requested_view = (gchar *) "mail"; e_shell_create_shell_window (shell, requested_view); } |