2007-06-25 Johannes Schmid <johannes.schmid@openismus.com>

[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 61ae3c2..aa1bfa0 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -63,8 +63,15 @@
 #include "modest-scroll-area.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-maemo-utils.h"
 
 
@@ -343,7 +350,6 @@ init_window (ModestMsgEditWindow *obj)
 
        GtkSizeGroup *size_group;
        GtkWidget *frame;
-       GtkWidget *scroll_area;
        GtkWidget *subject_box;
        GtkWidget *attachment_icon;
        GtkWidget *window_box;
@@ -481,8 +487,13 @@ init_window (ModestMsgEditWindow *obj)
        gtk_container_add (GTK_CONTAINER(obj), window_box);
        priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body);
        gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area);
+       
+       /*
+        TODO: scroll_area was never instantiated.
+        Stop building without warnings-as-errors. murrayc.
        gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area), 
                                             gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
+       */
 
        priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
                                                              G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
@@ -1636,8 +1647,11 @@ modest_msg_edit_window_attach_file_noninteractive (
                        const gchar *mime_type;
                        gchar *basename;
                        gchar *content_id;
-                       
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+                       mime_type = gnome_vfs_get_mime_type(filename);
+#else
                        mime_type = gnome_vfs_get_file_mime_type_fast (filename, NULL);
+#endif
                        mime_part = tny_platform_factory_new_mime_part
                                (modest_runtime_get_platform_factory ());
                        stream = TNY_STREAM (tny_fs_stream_new (file_id));
@@ -1739,13 +1753,13 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
        GdkColor *new_color;
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        
-#ifdef MODEST_HILDON_VERSION_0 
+#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 /*MODEST_HILDON_VERSION_0*/
+#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/
 
        wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color);
        
@@ -1843,7 +1857,11 @@ modest_msg_edit_window_set_zoom (ModestWindow *window,
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
                                                                         "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+       /* FIXME: Not availible before Gtk 2.10 */
+#else
        gtk_radio_action_set_current_value (zoom_radio_action, (gint) (zoom*100.0+0.1));
+#endif
 }
 
 static gdouble