* Fixes NB#100064, removed a logical id

pmo-trunk-r7353

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 5ace93e..65dfcc6 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -505,10 +505,6 @@ on_button_delete (GtkButton *button, gpointer user_data)
                                                       priv->account_name, 
                                                       (const gchar *) account_title);
        g_free (account_title);
-
-       /* Close window */
-       if (removed)
-               gtk_widget_destroy (GTK_WIDGET (self));
 }
 
 static GtkWidget*

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 9d5d00f..3fe741f 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -3776,10 +3776,8 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
        gtk_box_pack_start (GTK_BOX (format_hbox), html_toggle, TRUE, TRUE, 0);
        gtk_box_pack_start (GTK_BOX (format_hbox), text_toggle, TRUE, TRUE, 0);
        gtk_widget_show_all (format_hbox);
-       captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
-                                                        _("mcen_me_editor_format"), FALSE, format_hbox);
-       gtk_widget_show (captioned);
-       gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0);
+       gtk_widget_show (format_hbox);
+       gtk_box_pack_start (GTK_BOX (vbox), format_hbox, FALSE, FALSE, 0);
 
 
        g_object_unref (title_sizegroup);