2007-04-27 Murray Cumming <murrayc@murrayc.com>

* src/maemo/modest-msg-edit-window.c:
        (modest_msg_edit_window_select_color),
        (modest_msg_edit_window_select_background_color): 2 const corrections and
        moving 2 #endifs before closing brackets, to fix the build.

pmo-trunk-r1702

diff --git a/ChangeLog2 b/ChangeLog2
index 2656ede..017164f 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,12 @@
 2007-04-27  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/maemo/modest-msg-edit-window.c:
+       (modest_msg_edit_window_select_color),
+       (modest_msg_edit_window_select_background_color): 2 const corrections and 
+       moving 2 #endifs before closing brackets, to fix the build.
+
+2007-04-27  Murray Cumming  <murrayc@murrayc.com>
+
        * src/maemo/easysetup/modest-easysetup-wizard.h:
        * src/maemo/easysetup/modest-easysetup-wizard.c:
        (modest_easysetup_wizard_dialog_finalize),

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 70d6325..95492f7 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -1158,7 +1158,7 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
        gint response;
-       GdkColor *new_color = NULL;
+       const 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);
@@ -1181,8 +1181,9 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
                GdkColor col;
                hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col);
                new_color = &col;
-       }
 #endif /*MODEST_HILDON_VERSION_0*/
+       }
+
        break;
        default:
                break;
@@ -1202,7 +1203,7 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
        GtkWidget *dialog = NULL;
        gint response;
        GdkColor *old_color = NULL;
-       GdkColor *new_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));
@@ -1224,8 +1225,8 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
                GdkColor col;
                hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col);
                new_color = &col;
-          }
 #endif /*MODEST_HILDON_VERSION_0*/
+          }
                break;
        default:
                break;