* Adds two missing initializations

pmo-trunk-r6126

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 9d8d9f4..6031a59 100644 (file)
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -341,6 +341,7 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 
        priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
 
+       program = hildon_program_get_instance ();
        win = g_list_find (priv->window_list, window);
        if (win) {
                /* this is for the case we want to register the window and it was already
@@ -357,7 +358,6 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
        g_object_ref (window);
        priv->window_list = g_list_prepend (priv->window_list, window);
 
-       program = hildon_program_get_instance ();
        current_top = GTK_WIDGET (hildon_program_peek_window_stack (program));
 
        if (!parent || ((GtkWidget *) parent != current_top)) {

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index d143b1d..f9738a5 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -2681,7 +2681,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        gchar *account_name, *from;
        ModestAccountMgr *account_mgr;
        gboolean had_error = FALSE;
-       ModestMainWindow *win;
+       ModestMainWindow *win = NULL;
 
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), FALSE);