Build warning fixes

pmo-trunk-r7066

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index e6241c6..18bf302 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -1317,7 +1317,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        /* font color */
        priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
        priv->font_color_button = hildon_color_button_new ();
        /* font color */
        priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
        priv->font_color_button = hildon_color_button_new ();

-       GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS);
+       GTK_WIDGET_UNSET_FLAGS (priv->font_color_toolitem, GTK_CAN_FOCUS);

        GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
        gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button);
        gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
        gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button);
        gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE);

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 1248a96..3a4163c 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -818,8 +818,8 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window,
                                          TnyFolderStore **parent)
 {
        GtkWidget *accept_btn = NULL; 
                                          TnyFolderStore **parent)
 {
        GtkWidget *accept_btn = NULL; 

-       GtkWidget *dialog, *entry, *label_entry, *label_location, *hbox;
-       GtkWidget *account_picker;
+       GtkWidget *dialog, *entry = NULL, *label_entry = NULL,  *label_location = NULL, *hbox;
+       GtkWidget *account_picker = NULL;

        GList *buttons = NULL;
        gint result;
        GtkSizeGroup *sizegroup;
        GList *buttons = NULL;
        gint result;
        GtkSizeGroup *sizegroup;

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 6c1b443..8fd5ae3 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3506,6 +3506,8 @@ modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window)
        } else if (MODEST_IS_FOLDER_WINDOW (window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
 #endif
        } else if (MODEST_IS_FOLDER_WINDOW (window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
 #endif

+       } else {
+               return FALSE;

        }
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
        }
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));

@@ -3583,6 +3585,10 @@ on_delete_folder_cb (gboolean canceled,
        } else if (MODEST_IS_FOLDER_WINDOW (parent_window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (parent_window)));
 #endif
        } else if (MODEST_IS_FOLDER_WINDOW (parent_window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (parent_window)));
 #endif

+       } else {
+               g_object_unref (G_OBJECT (info->folder));
+               g_free (info);
+               return;

        }
 
        /* Unselect the folder before deleting it to free the headers */
        }
 
        /* Unselect the folder before deleting it to free the headers */

@@ -3624,6 +3630,8 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
        } else if (MODEST_IS_FOLDER_WINDOW (window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
 #endif
        } else if (MODEST_IS_FOLDER_WINDOW (window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
 #endif

+       } else {
+               return FALSE;

        }
        if (!folder_view)
                return FALSE;
        }
        if (!folder_view)
                return FALSE;