On cancelling connect dialog saving attachments, don't show error.

[modest] / src / hildon2 / modest-msg-edit-window.c

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 65ffe86..02d1423 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -75,7 +75,11 @@
 #include <modest-utils.h>
 #include "modest-maemo-utils.h"
 #include <modest-ui-constants.h>
+#include "modest-color-button.h"
 
+#ifdef MODEST_USE_CALENDAR_WIDGETS
+#include <calendar-ui-widgets.h>
+#endif
 
 #define DEFAULT_FONT_SIZE 3
 #define DEFAULT_FONT 2
@@ -1478,7 +1482,6 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        g_free (bcc);
 }
 
-
 static void
 modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 {
@@ -1508,7 +1511,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 
        /* font color */
        priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
-       priv->font_color_button = hildon_color_button_new ();
+       priv->font_color_button = modest_color_button_new ();
        gtk_widget_set_size_request (priv->font_color_button, -1, 48);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_toolitem, GTK_CAN_FOCUS);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
@@ -2195,14 +2198,13 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
 void
 modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
 {
-       
        WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
-               
+
        dialog = hildon_color_chooser_new ();
        hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color));
        g_free (buffer_format);
@@ -2220,7 +2222,6 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
 void
 modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
 {
-       
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
        GdkColor *old_color = NULL;