Do not look into email addresses for "Check contacts"

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

diff --git a/src/hildon2/modest-hildon2-global-settings-dialog.c b/src/hildon2/modest-hildon2-global-settings-dialog.c
index 901175f..2215133 100644 (file)
--- a/src/hildon2/modest-hildon2-global-settings-dialog.c
+++ b/src/hildon2/modest-hildon2-global-settings-dialog.c
@@ -50,6 +50,7 @@
 #include "modest-defs.h"
 #include <tny-account-store.h>
 #include <modest-account-mgr-helpers.h>
+#include <modest-toolkit-utils.h>
 
 
 #define MSG_SIZE_MAX_VAL 5000
@@ -226,16 +227,16 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self)
        if (GTK_IS_COMBO_BOX (ppriv->default_account_selector)) {
                GtkWidget *caption;
 
-               caption = modest_maemo_utils_create_captioned (title_size_group, NULL,
-                                                              _("mcen_ti_default_account"), FALSE,
-                                                              ppriv->default_account_selector);
+               caption = modest_toolkit_utils_create_vcaptioned (title_size_group,
+                                                                 _("mcen_ti_default_account"), FALSE,
+                                                                 ppriv->default_account_selector);
                gtk_widget_show (caption);
                gtk_box_pack_start (GTK_BOX (vbox), caption,
                                    FALSE, FALSE, 0);
        } else {
-               modest_maemo_utils_set_vbutton_layout (title_size_group,
-                                                      _("mcen_ti_default_account"),
-                                                      ppriv->default_account_selector);
+               modest_toolkit_utils_set_vbutton_layout (title_size_group,
+                                                        _("mcen_ti_default_account"),
+                                                        ppriv->default_account_selector);
                gtk_box_pack_start (GTK_BOX (vbox), ppriv->default_account_selector,
                                    FALSE, FALSE, 0);
        }
@@ -249,19 +250,31 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self)
                                                                    ppriv->msg_format_list, g_int_equal);
        if (GTK_IS_COMBO_BOX (ppriv->msg_format)) {
                GtkWidget *caption;
-               caption = modest_maemo_utils_create_captioned (title_size_group, NULL,
-                                                              _("mcen_fi_options_messageformat"), FALSE,
-                                                              ppriv->msg_format);
+               caption = modest_toolkit_utils_create_vcaptioned (title_size_group,
+                                                                 _("mcen_fi_options_messageformat"), FALSE,
+                                                                 ppriv->msg_format);
                gtk_widget_show (caption);
                gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, 0);
        } else {
-               modest_maemo_utils_set_vbutton_layout (title_size_group,
-                                                      _("mcen_fi_options_messageformat"),
-                                                      ppriv->msg_format);
+               modest_toolkit_utils_set_vbutton_layout (title_size_group,
+                                                        _("mcen_fi_options_messageformat"),
+                                                        ppriv->msg_format);
                gtk_box_pack_start (GTK_BOX (vbox), ppriv->msg_format, FALSE, FALSE, 0);
        }
 
 
+       /* Incoming notifications */
+       ppriv->notifications = hildon_check_button_new (MODEST_EDITABLE_SIZE);
+       gtk_button_set_label (GTK_BUTTON (ppriv->notifications), _("mcen_fi_options_incoming_notifications"));
+       gtk_button_set_alignment (GTK_BUTTON (ppriv->notifications), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (vbox), ppriv->notifications, FALSE, FALSE, 0);
+
+       /* Automatic add to contacts */
+       ppriv->add_to_contacts = hildon_check_button_new (MODEST_EDITABLE_SIZE);
+       gtk_button_set_label (GTK_BUTTON (ppriv->add_to_contacts), _("mcen_fi_options_automatic_add"));
+       gtk_button_set_alignment (GTK_BUTTON (ppriv->add_to_contacts), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (vbox), ppriv->add_to_contacts, FALSE, FALSE, 0);
+
        /* Separator label */
        separator = gtk_label_new (_("mcen_ti_updating"));
        gtk_label_set_justify ((GtkLabel *) separator, GTK_JUSTIFY_CENTER);
@@ -283,15 +296,15 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self)
                                                                     ppriv->connect_via_list, g_int_equal);
        if (GTK_IS_COMBO_BOX (ppriv->connect_via)) {
                GtkWidget *caption;
-               caption = modest_maemo_utils_create_captioned (title_size_group, NULL,
-                                                              _("mcen_fi_options_connectiontype"), FALSE,
-                                                              ppriv->connect_via);
+               caption = modest_toolkit_utils_create_vcaptioned (title_size_group,
+                                                                 _("mcen_fi_options_connectiontype"), FALSE,
+                                                                 ppriv->connect_via);
                gtk_widget_show (caption);
                gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, 0);
        } else {
-               modest_maemo_utils_set_vbutton_layout (title_size_group, 
-                                                      _("mcen_fi_options_connectiontype"),
-                                                      ppriv->connect_via);
+               modest_toolkit_utils_set_vbutton_layout (title_size_group, 
+                                                        _("mcen_fi_options_connectiontype"),
+                                                        ppriv->connect_via);
                gtk_box_pack_start (GTK_BOX (vbox), ppriv->connect_via, FALSE, FALSE, 0);
        }
 
@@ -305,15 +318,15 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self)
                                                                         ppriv->update_interval_list, g_int_equal);
        if (GTK_IS_COMBO_BOX (ppriv->update_interval)) {
                GtkWidget *caption;
-               caption = modest_maemo_utils_create_captioned (title_size_group, NULL,
-                                                              _("mcen_fi_options_updateinterval"), FALSE,
-                                                              ppriv->update_interval);
+               caption = modest_toolkit_utils_create_vcaptioned (title_size_group,
+                                                                 _("mcen_fi_options_updateinterval"), FALSE,
+                                                                 ppriv->update_interval);
                gtk_widget_show (caption);
                gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, 0);
        } else {
-               modest_maemo_utils_set_vbutton_layout (title_size_group, 
-                                                      _("mcen_fi_options_updateinterval"), 
-                                                      ppriv->update_interval);
+               modest_toolkit_utils_set_vbutton_layout (title_size_group, 
+                                                        _("mcen_fi_options_updateinterval"), 
+                                                        ppriv->update_interval);
                gtk_box_pack_start (GTK_BOX (vbox), ppriv->update_interval, FALSE, FALSE, 0);
        }
 
@@ -444,6 +457,26 @@ modest_hildon2_global_settings_dialog_load_settings (ModestGlobalSettingsDialog
        ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
        conf = modest_runtime_get_conf ();
 
+       /* Incoming notifications */
+       checked = modest_conf_get_bool (conf, MODEST_CONF_NOTIFICATIONS, &error);
+       if (error) {
+               g_clear_error (&error);
+               error = NULL;
+               checked = FALSE;
+       }
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (ppriv->notifications), checked);
+       ppriv->initial_state.notifications = checked;
+
+       /* Add to contacts */
+       checked = modest_conf_get_bool (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, &error);
+       if (error) {
+               g_clear_error (&error);
+               error = NULL;
+               checked = FALSE;
+       }
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (ppriv->add_to_contacts), checked);
+       ppriv->initial_state.add_to_contacts = checked;
+
        /* Autoupdate */
        checked = modest_conf_get_bool (conf, MODEST_CONF_AUTO_UPDATE, &error);
        if (error) {