Do not automatically add new contacts to addressbook when sending messages

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

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 7f15f1e..126454d 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -67,15 +67,8 @@
 #include "modest-msg-edit-window-ui-dimming.h"
 
 #include "modest-hildon-includes.h"
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-color-chooser.h>
-#endif
 #include "widgets/modest-msg-edit-window-ui.h"
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#else
 #include <libgnomevfs/gnome-vfs-mime.h>
-#endif
 #include <modest-utils.h>
 #include "modest-maemo-utils.h"
 
@@ -1080,9 +1073,9 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
 
        content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
        
-       if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+       if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) {
                parent = g_object_ref (msg);
-       } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) {
+       } else if (content_type && !g_ascii_strcasecmp (content_type, "multipart/mixed")) {
                TnyList *parts = TNY_LIST (tny_simple_list_new ());
                TnyIterator *iter;
 
@@ -1092,7 +1085,7 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
                        TnyMimePart *part;
                        part = TNY_MIME_PART (tny_iterator_get_current (iter));
                        content_type = tny_mime_part_get_content_type (part);
-                       if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+                       if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) {
                                parent = part;
                                break;
                        } else {
@@ -2020,62 +2013,8 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
 
 }
 
-#ifdef MODEST_HILDON_VERSION_0
-void
-modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
-{
-       
-       WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
-       ModestMsgEditWindowPrivate *priv;
-       GtkWidget *dialog = NULL;
-       gint response;
-       GdkColor *new_color = 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_selector_new (GTK_WINDOW (window));
-       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color));
-       g_free (buffer_format);
-
-       if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
-               new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
-               if (new_color != NULL) {
-                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
-                                                     (gpointer) new_color);
-               }
-       }
-       gtk_widget_destroy (dialog);
-}
-
 
 void
-modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
-{
-       
-       ModestMsgEditWindowPrivate *priv;
-       GtkWidget *dialog = NULL;
-       gint response;
-       GdkColor *old_color = NULL;
-       const GdkColor *new_color = NULL;
-       
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
-       
-       dialog = hildon_color_selector_new (GTK_WINDOW (window));
-       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color);
-
-       if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
-               new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
-               if (new_color != NULL)
-                       wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color);
-       }
-       gtk_widget_destroy (dialog);
-
-}
-
-#else 
-void
 modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
 {
        
@@ -2122,9 +2061,6 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
        gtk_widget_destroy (dialog);
 }
 
-#endif /*!MODEST_HILDON_VERSION_0*/
-
-
 
 static TnyStream*
 create_stream_for_uri (const gchar* uri)
@@ -2524,13 +2460,7 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
        GdkColor *new_color;
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        
-#ifdef MODEST_HAVE_HILDON0_WIDGETS     
-       new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button));
-#else 
-       GdkColor col;
-       hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &col);
-       new_color = &col;
-#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/
+       hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), new_color);
 
        wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color);