[evolution/gnome-2-30] Fix compiler warnings.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-2-30] Fix compiler warnings.
- Date: Sun, 20 Jun 2010 10:38:51 +0000 (UTC)
commit f7e7fe3b99c47fefb2fb3cc4350ace5eb77a8b5f
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jun 20 06:30:49 2010 -0400
Fix compiler warnings.
modules/calendar/e-cal-shell-backend.c | 2 ++
plugins/mail-notification/mail-notification.c | 4 +++-
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 5e6f390..f798668 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 72e3881..583d474 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 98b55bd..4d9cd7a 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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]