Fixed the bug 61219, changed from showing dialog to showing banner if the account...

[modest] / src / maemo / easysetup / modest-easysetup-servertype-combo-box.c

diff --git a/src/maemo/easysetup/modest-easysetup-servertype-combo-box.c b/src/maemo/easysetup/modest-easysetup-servertype-combo-box.c
index 7e87ecb..90dd408 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-servertype-combo-box.c
+++ b/src/maemo/easysetup/modest-easysetup-servertype-combo-box.c
@@ -1,11 +1,32 @@
-/* Copyright (c) 2007, Nokia Corporation
+/* Copyright (c) 2006, Nokia Corporation
  * All rights reserved.
  *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define _GNU_SOURCE /* So we can use the getline() function, which is a convenient GNU extension. */
-#include <stdio.h>
-
 #include "modest-easysetup-servertype-combo-box.h"
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkcelllayout.h>
@@ -15,6 +36,11 @@
 #include <stdlib.h>
 #include <string.h> /* For memcpy() */
 
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 G_DEFINE_TYPE (EasysetupServertypeComboBox, easysetup_servertype_combo_box, GTK_TYPE_COMBO_BOX);
 
 #define SERVERTYPE_COMBO_BOX_GET_PRIVATE(o) \
@@ -137,9 +163,9 @@ void easysetup_servertype_combo_box_fill (EasysetupServertypeComboBox *combobox)
 
 /**
  * Returns the selected servertype, 
- * or MODEST_PROTOCOL_UNKNOWN if no servertype was selected.
+ * or MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN if no servertype was selected.
  */
-ModestProtocol
+ModestTransportStoreProtocol
 easysetup_servertype_combo_box_get_active_servertype (EasysetupServertypeComboBox *combobox)
 {
        GtkTreeIter active;
@@ -147,12 +173,12 @@ easysetup_servertype_combo_box_get_active_servertype (EasysetupServertypeComboBo
        if (found) {
                EasysetupServertypeComboBoxPrivate *priv = SERVERTYPE_COMBO_BOX_GET_PRIVATE (combobox);
 
-               ModestProtocol servertype = MODEST_PROTOCOL_UNKNOWN;
+               ModestTransportStoreProtocol servertype = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
                gtk_tree_model_get (priv->model, &active, MODEL_COL_ID, &servertype, -1);
                return servertype;      
        }
 
-       return MODEST_PROTOCOL_UNKNOWN; /* Failed. */
+       return MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; /* Failed. */
 }
 
 /* This allows us to pass more than one piece of data to the signal handler,
@@ -185,10 +211,10 @@ on_model_foreach_select_id(GtkTreeModel *model,
 
 /**
  * Selects the specified servertype, 
- * or MODEST_PROTOCOL_UNKNOWN if no servertype was selected.
+ * or MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN if no servertype was selected.
  */
 gboolean
-easysetup_servertype_combo_box_set_active_servertype (EasysetupServertypeComboBox *combobox, ModestProtocol servertype)
+easysetup_servertype_combo_box_set_active_servertype (EasysetupServertypeComboBox *combobox, ModestTransportStoreProtocol servertype)
 {
        EasysetupServertypeComboBoxPrivate *priv = SERVERTYPE_COMBO_BOX_GET_PRIVATE (combobox);