Hide singleton providers from wizard providers list if already set up

[modest] / src / hildon2 / modest-provider-picker.c

diff --git a/src/hildon2/modest-provider-picker.c b/src/hildon2/modest-provider-picker.c
index f5763e4..aef688c 100644 (file)
--- a/src/hildon2/modest-provider-picker.c
+++ b/src/hildon2/modest-provider-picker.c
@@ -136,7 +136,8 @@ modest_provider_picker_init (ModestProviderPicker *self)
 }
 
 ModestProviderPicker*
 }
 
 ModestProviderPicker*

-modest_provider_picker_new (void)
+modest_provider_picker_new (HildonSizeType size,
+                           HildonButtonArrangement arrangement)

 {
        ModestProviderPickerPrivate *priv;
        ModestProviderPicker *self;
 {
        ModestProviderPickerPrivate *priv;
        ModestProviderPicker *self;

@@ -144,8 +145,8 @@ modest_provider_picker_new (void)
        GtkWidget *selector;
 
        self = g_object_new (MODEST_TYPE_PROVIDER_PICKER, 
        GtkWidget *selector;
 
        self = g_object_new (MODEST_TYPE_PROVIDER_PICKER, 

-                            "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-                            "size", HILDON_SIZE_AUTO,
+                            "arrangement", arrangement,
+                            "size", size,

                             NULL);
        priv = MODEST_PROVIDER_PICKER_GET_PRIVATE (self);
 
                             NULL);
        priv = MODEST_PROVIDER_PICKER_GET_PRIVATE (self);
 

@@ -239,24 +240,34 @@ modest_provider_picker_fill (ModestProviderPicker *self,
        registry = modest_runtime_get_protocol_registry ();
        provider_protos = modest_protocol_registry_get_by_tag (registry, 
                                                               MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS);
        registry = modest_runtime_get_protocol_registry ();
        provider_protos = modest_protocol_registry_get_by_tag (registry, 
                                                               MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS);

-       tmp = provider_protos;
-       while (tmp) {
+       for (tmp = provider_protos; tmp != NULL; tmp = g_slist_next (tmp)) {
+

                GtkTreeIter iter;
                ModestProtocol *proto = MODEST_PROTOCOL (tmp->data);
                const gchar *name = modest_protocol_get_display_name (proto);
 
                /* only add store protocols, no need to duplicate them */
                GtkTreeIter iter;
                ModestProtocol *proto = MODEST_PROTOCOL (tmp->data);
                const gchar *name = modest_protocol_get_display_name (proto);
 
                /* only add store protocols, no need to duplicate them */

-               if (modest_protocol_registry_protocol_type_has_tag (registry, 
-                                                                   modest_protocol_get_type_id (proto),
-                                                                   MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS)) {
-                       gtk_list_store_append (liststore, &iter);
-                       gtk_list_store_set (liststore, &iter,
-                                           MODEL_COL_ID, modest_protocol_get_name (proto),
-                                           MODEL_COL_NAME, name,
-                                           MODEL_COL_ID_TYPE, MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL,
-                                           -1);
+               if (!modest_protocol_registry_protocol_type_has_tag (registry, 
+                                                                    modest_protocol_get_type_id (proto),
+                                                                    MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS))
+                       continue;
+                 
+               if (modest_protocol_registry_protocol_type_has_tag 
+                   (registry,
+                    modest_protocol_get_type_id (proto),
+                    MODEST_PROTOCOL_REGISTRY_SINGLETON_PROVIDER_PROTOCOLS)) {
+                       /* Check if there's already an account configured with this account type */
+                       if (modest_account_mgr_singleton_protocol_exists (modest_runtime_get_account_mgr (),
+                                                                         modest_protocol_get_type_id (proto)))
+                               continue;

                }
                }

-               tmp = g_slist_next (tmp);
+
+               gtk_list_store_append (liststore, &iter);
+               gtk_list_store_set (liststore, &iter,
+                                   MODEL_COL_ID, modest_protocol_get_name (proto),
+                                   MODEL_COL_NAME, name,
+                                   MODEL_COL_ID_TYPE, MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL,
+                                   -1);

        }
        g_slist_free (provider_protos);
        
        }
        g_slist_free (provider_protos);
        

@@ -336,7 +347,7 @@ modest_provider_picker_get_active_id_type (ModestProviderPicker *self)
 
        selector = GTK_WIDGET (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON(self)));
 
 
        selector = GTK_WIDGET (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON(self)));
 

-       if (hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (self), 0, &active)) {
+       if (hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (selector), 0, &active)) {

                ModestProviderPickerPrivate *priv = MODEST_PROVIDER_PICKER_GET_PRIVATE (self);
                ModestProviderPickerIdType id_type;
 
                ModestProviderPickerPrivate *priv = MODEST_PROVIDER_PICKER_GET_PRIVATE (self);
                ModestProviderPickerIdType id_type;