two small modification

[modest] / src / maemo / modest-maemo-global-settings-dialog.c

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index 7f3d2ca..d2a1d1a 100644 (file)
--- a/src/maemo/modest-maemo-global-settings-dialog.c
+++ b/src/maemo/modest-maemo-global-settings-dialog.c
@@ -162,9 +162,14 @@ idle_select_default_focus (gpointer data)
        /* Grab focus, we need to block in order to prevent a
           recursive call to this callback */
        g_signal_handler_block (G_OBJECT (ppriv->notebook), priv->switch_handler);
-       gdk_threads_enter ();
+
+       /* This is a GDK lock because we are an idle callback and
+        * the code below is or does Gtk+ code */
+
+       gdk_threads_enter (); /* CHECKED */
        gtk_widget_grab_focus (helper->focus_widget);
-       gdk_threads_leave ();
+       gdk_threads_leave (); /* CHECKED */
+
        g_signal_handler_unblock (G_OBJECT (ppriv->notebook), priv->switch_handler);
        g_free (helper);
 
@@ -272,7 +277,6 @@ modest_maemo_global_settings_dialog_new (void)
        return GTK_WIDGET(g_object_new(MODEST_TYPE_MAEMO_GLOBAL_SETTINGS_DIALOG, NULL));
 }
 
-
 /*
  * Creates the updating page
  */
@@ -346,7 +350,7 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self)
        g_signal_connect (ppriv->size_limit, "range_error", G_CALLBACK (on_range_error), self);
        caption = hildon_caption_new (size_group, 
                                      _("mcen_fi_advsetup_sizelimit"), 
-                                     ppriv->size_limit, 
+                                     ppriv->size_limit,
                                      NULL, 
                                      HILDON_CAPTION_MANDATORY);
        gtk_box_pack_start (GTK_BOX (vbox_limit), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -396,15 +400,6 @@ create_composing_page (ModestMaemoGlobalSettingsDialog *self)
                                      HILDON_CAPTION_MANDATORY);
        gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
 
-       /* Reply */
-       ppriv->include_reply = gtk_check_button_new ();
-       caption = hildon_caption_new (size_group, 
-                                     _("mcen_va_options_include_original_inreply"), 
-                                     ppriv->include_reply, 
-                                     NULL, 
-                                     HILDON_CAPTION_MANDATORY);
-       gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-
        return vbox;
 }