* gnome is currently broken; tell our users

pmo-trunk-r2386

diff --git a/configure.ac b/configure.ac
index 5f2f9ea..8db19de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,7 @@ have_easysetup=false
 if test "x$with_platform" == "xgnome"; then
       PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify)
     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
+    AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead])
 else
     have_easysetup=true
     PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 osso-addressbook-1.0 libebook-1.2 libalarm)
@@ -99,11 +100,10 @@ AC_SUBST(MODEST_PLATFORM)
 
 
 
-
-
 #
-# check for wpeditor or libwpeditor-plus
+# check for wpeditor or libwpeditor-plus (on maemo)
 #
+if test "x$with_platform" == "xmaemo"; then  
 PKG_CHECK_MODULES(MODEST_WPEDITOR,wpeditor,have_wpeditor=true,have_wpeditor=false)
 if test "x$have_wpeditor" == "xfalse"; then
    PKG_CHECK_MODULES(MODEST_WPEDITOR,libwpeditor-plus,have_libwpeditorplus=true,have_libwpeditorplus=false)    
@@ -117,12 +117,13 @@ else
    wpeditor="wpeditor" 
    AC_DEFINE_UNQUOTED(MODEST_HAVE_WPEDITOR, 1, ["Whether wpeditor is used."])          
 fi
-
+fi
 
 
 #
-# check the providers-data
+# check the providers-data (on maemo)
 #
+if test "x$with_platform" == "xmaemo"; then  
 PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,modest-providers-data,have_modest_providers_data=true,have_modest_providers_data=false)
 if test "x$have_modest_providers_data" == "xfalse"; then
    PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,maemo-providers-data,have_maemo_providers_data=true,have_maemo_providers_data=false)
@@ -139,7 +140,7 @@ else
   AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path modest-providers-data`"],[modest-providers-data file path])
   providers_data="modest-providers-data"                                                               
 fi
-      
+fi      
    
 
 
@@ -197,7 +198,8 @@ fi
 
 
 #dnl wether we can and should build the 
-#dnl search plugin
+#dnl search plugin (on maemo)
+if test "x$with_platform" == "xmaemo"; then  
 PKG_CHECK_MODULES(MODEST_OGS, libosso >= 0.8.5 libogs-1.2, have_ogs=true, have_ogs=false)
 have_ogs_support=false
 AC_ARG_ENABLE(ogs_support,
@@ -217,6 +219,7 @@ esac],[have_ogs_support=$have_ogs])
 if test x$have_ogs_support = xtrue; then
        AC_DEFINE_UNQUOTED(MODEST_HAVE_OGS, 1, ["Whether ogs is available."])
 fi
+fi
 
 
 

diff --git a/src/gnome/modest-account-assistant.c b/src/gnome/modest-account-assistant.c
index f5bed16..02834ed 100644 (file)
--- a/src/gnome/modest-account-assistant.c
+++ b/src/gnome/modest-account-assistant.c
@@ -391,7 +391,7 @@ add_sending_page (ModestAccountAssistant *self)
        /* Note: This ModestPairList* must exist for as long as the combo
         * that uses it, because the ModestComboBox uses the ID opaquely, 
         * so it can't know how to manage its memory. */
-       priv->sending_transport_store_protos = modest_protocol_info_get_transport_store_protocol_pair_list (MODEST_PROTOCOL_TYPE_TRANSPORT);
+       priv->sending_transport_store_protos = modest_protocol_info_get_transport_store_protocol_pair_list ();
        combo = modest_combo_box_new (priv->sending_transport_store_protos, g_str_equal);
 
        g_signal_connect (G_OBJECT(combo), "changed",
@@ -616,7 +616,7 @@ on_apply (ModestAccountAssistant *self, gpointer user_data)
 {
        ModestAccountAssistantPrivate *priv;
        ModestTransportStoreProtocol proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
-       ModestAuthProtocol security = MODEST_PROTOCOL_SECURITY_NONE;
+       ModestAuthProtocol security = MODEST_PROTOCOL_CONNECTION_NORMAL;
        ModestConnectionProtocol auth = MODEST_PROTOCOL_AUTH_NONE;
        gchar *store_name, *transport_name;
        const gchar *account_name, *username, *servername, *path;
@@ -641,8 +641,15 @@ on_apply (ModestAccountAssistant *self, gpointer user_data)
                modest_account_mgr_add_server_account_uri (priv->account_mgr, store_name, proto, uri);
                g_free (uri);
        } else
-               modest_account_mgr_add_server_account (priv->account_mgr, store_name, servername,
-                                                      username, NULL, proto, security, auth);
+               modest_account_mgr_add_server_account (priv->account_mgr,
+                                                      store_name, 
+                                                      servername,
+                                                      0, /* FIXME: does this mean default?*/
+                                                      username,
+                                                      NULL, 
+                                                      proto, 
+                                                      security, 
+                                                      auth);
                
        /* create server account -> transport */
        transport = MODEST_TRANSPORT_WIDGET(priv->transport_widget);
@@ -657,9 +664,10 @@ on_apply (ModestAccountAssistant *self, gpointer user_data)
        
        transport_name = get_new_server_account_name (priv->account_mgr, proto,username, servername);
        modest_account_mgr_add_server_account (priv->account_mgr,
-                                               transport_name, servername,
-                                               username, NULL,
-                                               proto, security, auth);
+                                              transport_name,  servername,
+                                              0, /* FIXME: does this mean default?*/
+                                              username, NULL,
+                                              proto, security, auth);
 
        /* create account */
        account_name = get_account_name (self);