* modest-outside-scratchbox patch 2:

	- fix compiler warnings for 64 bit / gcc 4.2

pmo-trunk-r3820

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 3da88fe..c9cee33 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -1620,27 +1620,34 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
 
        wp_text_buffer_freeze (WP_TEXT_BUFFER (priv->text_buffer));
        if (buffer_format->cs.bold) {
 
        wp_text_buffer_freeze (WP_TEXT_BUFFER (priv->text_buffer));
        if (buffer_format->cs.bold) {

-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BOLD, (gpointer) (buffer_format->bold&0x1));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BOLD,
+                                             GINT_TO_POINTER (buffer_format->bold&0x1));

        }
        if (buffer_format->cs.italic) {
        }
        if (buffer_format->cs.italic) {

-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_ITALIC, (gpointer) (buffer_format->italic&0x1));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_ITALIC,
+                                             GINT_TO_POINTER (buffer_format->italic&0x1));

        }
        if (buffer_format->cs.color) {
        }
        if (buffer_format->cs.color) {

-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) (&(buffer_format->color)));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
+                                             GINT_TO_POINTER (&(buffer_format->color)));

        }
        if (buffer_format->cs.font_size) {
        }
        if (buffer_format->cs.font_size) {

-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, (gpointer) (buffer_format->font_size));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE,
+                                             GINT_TO_POINTER (buffer_format->font_size));

        }
        if (buffer_format->cs.justification) {
                switch (buffer_format->justification) {
                case GTK_JUSTIFY_LEFT:
        }
        if (buffer_format->cs.justification) {
                switch (buffer_format->justification) {
                case GTK_JUSTIFY_LEFT:

-                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_LEFT, (gpointer) TRUE);
+                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_LEFT,
+                                                     GINT_TO_POINTER(TRUE));

                        break;
                case GTK_JUSTIFY_CENTER:
                        break;
                case GTK_JUSTIFY_CENTER:

-                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_CENTER, (gpointer) TRUE);
+                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_CENTER,
+                                                     GINT_TO_POINTER(TRUE));

                        break;
                case GTK_JUSTIFY_RIGHT:
                        break;
                case GTK_JUSTIFY_RIGHT:

-                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_RIGHT, (gpointer) TRUE);
+                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_RIGHT,
+                                                     GINT_TO_POINTER(TRUE));

                        break;
                default:
                        break;
                        break;
                default:
                        break;

@@ -1648,14 +1655,16 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
                        
        }
        if (buffer_format->cs.font) {
                        
        }
        if (buffer_format->cs.font) {

-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, (gpointer) (buffer_format->font));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT,
+                                             GINT_TO_POINTER (buffer_format->font));

        }
        wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer));
        if (buffer_format->cs.bullet) {
        }
        wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer));
        if (buffer_format->cs.bullet) {

-         wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((buffer_format->bullet)?1:0));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET,
+                                             GINT_TO_POINTER ((buffer_format->bullet)?1:0));

        }
 /*     wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), buffer_format); */
        }
 /*     wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), buffer_format); */

-
+       

        g_free (current_format);
 
 }
        g_free (current_format);
 
 }

@@ -2180,7 +2189,7 @@ modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
 /*             wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format); */
 
                if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE,
 /*             wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format); */
 
                if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE,

-                                                  (gpointer) wp_get_font_size_index (new_size_index, 12)))
+                                                  GINT_TO_POINTER (wp_get_font_size_index (new_size_index, 12))))

                        wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
                
                text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
                        wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
                
                text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));

@@ -2211,7 +2220,7 @@ modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
                new_font_index = wp_get_font_index (gtk_label_get_text (GTK_LABEL (label)), DEFAULT_FONT);
 
                if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, 
                new_font_index = wp_get_font_index (gtk_label_get_text (GTK_LABEL (label)), DEFAULT_FONT);
 
                if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, 

-                                                  (gpointer) new_font_index))
+                                                  GINT_TO_POINTER(new_font_index)))

                        wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
                
                text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
                        wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
                
                text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));

diff --git a/src/modest-init.c b/src/modest-init.c
index e81aa98..b453992 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -730,7 +730,7 @@ init_default_settings (ModestConf *conf)
 static void
 init_device_name (ModestConf *conf)
 {
 static void
 init_device_name (ModestConf *conf)
 {

-       unsigned int len = 255; /* max len */
+       gsize len = 255; /* max len */

        gchar *devname = NULL;
        
        if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {
        gchar *devname = NULL;
        
        if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index ce015be..c054a5e 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -278,7 +278,7 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
 gchar*
 modest_text_utils_remove_address (const gchar *address_list, const gchar *address)
 {
 gchar*
 modest_text_utils_remove_address (const gchar *address_list, const gchar *address)
 {

-       gchar *dup, *token, *ptr, *result;
+       gchar *dup, *token, *ptr = NULL, *result;

        GString *filtered_emails;
        gchar *email_address;
 
        GString *filtered_emails;
        gchar *email_address;
 

diff --git a/src/widgets/modest-recpt-view.c b/src/widgets/modest-recpt-view.c
index 99cb97a..54e33c1 100644 (file)
--- a/src/widgets/modest-recpt-view.c
+++ b/src/widgets/modest-recpt-view.c
@@ -141,7 +141,7 @@ button_release_event (GtkWidget *widget,
                        index = gtk_text_iter_get_offset (&iter);
                        
                        if (!gtk_text_iter_is_end (&iter)) {
                        index = gtk_text_iter_get_offset (&iter);
                        
                        if (!gtk_text_iter_is_end (&iter)) {

-                               int selection_start, selection_end;
+                               guint selection_start, selection_end;

                                gboolean selected = FALSE;
                                GtkTextIter start_iter, end_iter;
                                GtkTextBuffer *buffer;
                                gboolean selected = FALSE;
                                GtkTextIter start_iter, end_iter;
                                GtkTextBuffer *buffer;