2007-06-22 Murray Cumming <murrayc@murrayc.com>

* src/maemo/modest-msg-edit-window.c: (init_window):
        Comment out use of an uninitialzed GtkScrolledWindow variable,
        to fix the build and stop a crash. Yet again.

pmo-trunk-r2378

diff --git a/ChangeLog b/ChangeLog
index acb6b92..93fab1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,7 @@
+2007-06-22  Murray Cumming,,,  <murrayc@murrayc-desktop>
+
+       reviewed by: <delete if not using a buddy>
+
+       * src/maemo/modest-msg-edit-window.c: (init_window):
+
 * please check the svn log instead

diff --git a/ChangeLog2 b/ChangeLog2
index ca97d9d..c38f2de 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,11 @@
 2007-06-22  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/maemo/modest-msg-edit-window.c: (init_window):
+       Comment out use of an uninitialzed GtkScrolledWindow variable, 
+       to fix the build and stop a crash. Yet again.
+
+2007-06-22  Murray Cumming  <murrayc@murrayc.com>
+
        * src/modest-tny-account-store.c: (get_password):
        Remove the call to tny_account_set_user() because this actually crashes.
        As mentioned in the last commit, it is known to not work anyway.

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 61ae3c2..0969ea6 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -343,7 +343,6 @@ init_window (ModestMsgEditWindow *obj)
 
        GtkSizeGroup *size_group;
        GtkWidget *frame;
-       GtkWidget *scroll_area;
        GtkWidget *subject_box;
        GtkWidget *attachment_icon;
        GtkWidget *window_box;
@@ -481,8 +480,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);