diff options
| -rw-r--r-- | addressbook/gui/contact-list-editor/e-contact-list-editor.c | 6 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 3 | ||||
| -rw-r--r-- | plugins/mail-notification/mail-notification.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index dc31d3c1fe..7453489f0a 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -751,6 +751,7 @@ contact_list_editor_select_button_clicked_cb (GtkWidget *widget) ENameSelectorDialog *dialog; EDestinationStore *store; GList *list, *iter; + GtkWindow *window; editor = contact_list_editor_extract (widget); @@ -774,8 +775,9 @@ contact_list_editor_select_button_clicked_cb (GtkWidget *widget) g_list_free (list); - e_name_selector_show_dialog (editor->priv->name_selector, - eab_editor_get_window (EAB_EDITOR (editor))); + window = eab_editor_get_window (EAB_EDITOR (editor)); + e_name_selector_show_dialog ( + editor->priv->name_selector, GTK_WIDGET (window)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_hide (GTK_WIDGET (dialog)); diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 426d69ec55..debbb3c8d3 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -187,6 +187,8 @@ message_push (Message *msg) * use a static ring-buffer so we can call this twice * in a printf without getting nonsense results. */ +d(#define DEBUGGING_ON) +#ifdef DEBUGGING_ON static const gchar * e_ctime (const time_t *timep) { @@ -201,6 +203,7 @@ e_ctime (const time_t *timep) return ret; } +#endif /* Queues an alarm trigger for midnight so that we can load the next day's worth * of alarms. diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 0d3a76a0fb..efce1115ab 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -481,7 +481,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) { @@ -562,6 +562,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 ( |