* Fixed several runtime warnings and criticals

pmo-trunk-r6152

diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c
index b514942..91b2088 100644 (file)
--- a/src/hildon2/modest-country-picker.c
+++ b/src/hildon2/modest-country-picker.c
@@ -283,7 +283,6 @@ modest_country_picker_load_data(ModestCountryPicker *self)
        g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 
        selector = hildon_touch_selector_new ();
-       hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
        column = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), GTK_TREE_MODEL (model),
                                                      renderer, "text", MODEL_COL_NAME, NULL);
        g_object_set (G_OBJECT (column), "text-column", MODEL_COL_NAME, NULL);
@@ -294,6 +293,8 @@ modest_country_picker_load_data(ModestCountryPicker *self)
        /* Set this _after_ loading from file, it makes loading faster */
        hildon_touch_selector_set_model (HILDON_TOUCH_SELECTOR (selector),
                                         0, GTK_TREE_MODEL (model));
+       hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
+
        g_object_unref (model);
 }
 

diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c
index 80288d1..a2dd2ea 100644 (file)
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -623,7 +623,6 @@ update_incoming_server_title (ModestEasysetupWizardDialog *self)
                protocol_display_name = modest_protocol_get_display_name (modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type));
                
                incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), protocol_display_name);
-               g_object_set (G_OBJECT (priv->caption_incoming), "label", incomingserver_title, NULL);
                g_free(incomingserver_title);
        }
 }
@@ -757,6 +756,7 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
                                                        FALSE, sizegroup);
        gtk_box_pack_start (GTK_BOX (box), priv->incoming_security, 
                            FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show_all (priv->incoming_security);
 
        /* Set default selection */
        modest_servertype_picker_set_active_servertype (
@@ -877,7 +877,6 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
        priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
        caption = modest_maemo_utils_create_captioned (sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
                                                       priv->button_outgoing_smtp_servers);
-       hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
        gtk_widget_show (priv->button_outgoing_smtp_servers);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (caption);
@@ -951,7 +950,6 @@ create_page_complete_custom (ModestEasysetupWizardDialog *self)
        
        GtkWidget *caption = modest_maemo_utils_create_captioned (NULL, _("mcen_fi_advanced_settings"), 
                                                                  button_edit);
-       hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
        gtk_widget_show (button_edit);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (caption);

diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c
index 1c284fb..25e7e1d 100644 (file)
--- a/src/hildon2/modest-main-window.c
+++ b/src/hildon2/modest-main-window.c
@@ -1181,8 +1181,6 @@ modest_main_window_new (void)
        GtkActionGroup *action_group = NULL;
        GError *error = NULL;
        HildonProgram *app;
-       ModestConf *conf = NULL;
-       GtkAction *action = NULL;
        GdkPixbuf *window_icon;
        ShowHelper *helper;
        
@@ -1259,11 +1257,6 @@ modest_main_window_new (void)
 
        /* Menubar. Update the state of some toggles */
        parent_priv->menubar = modest_maemo_utils_get_manager_menubar_as_menu (parent_priv->ui_manager, "/MenuBar");
-       conf = modest_runtime_get_conf ();
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
-                                           "/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarNormalScreenMenu");
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     modest_conf_get_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR, NULL));
        hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
        gtk_widget_show (parent_priv->menubar);