* unbreak dape's gnome-desktop port

pmo-trunk-r3823

diff --git a/configure.ac b/configure.ac
index 0ed0071..113a12d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR(src/modest-main.c)
 AM_INIT_AUTOMAKE([dist-bzip2])
 
-
 ALL_LINGUAS="en_GB"
 
 MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale'
@@ -76,8 +75,8 @@ LIBS="$__COPY_LIBS"
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
 
 dnl dnl now, determine what to build
-AC_MSG_NOTICE([Determining what platform to build])
-PKG_CHECK_MODULES(MODEST_MAEMO_LIBS,libosso,[with_platform=maemo],true)
+dnl AC_MSG_NOTICE([Determining what platform to build])
+dnl PKG_CHECK_MODULES(MODEST_MAEMO_LIBS,libosso,[with_platform=maemo],true)
 
 AC_ARG_WITH(platform,
 [--with-platform=gnome         platform to build for [gnome]],
@@ -433,14 +432,18 @@ echo "Prefix           : ${prefix}"
 echo "Build tests      : $build_tests"
 echo "Build docs       : $build_docs"
 echo "Gettext Package  : $GETTEXT_PACKAGE"
-echo "Editor lib       : $wpeditor"
-echo "Addressbook      : $have_abook"
-echo "Help lib         : $helplib"
-echo "libconic support : $have_libconic"
-echo "Alarm            : $have_libalarm"
-echo "Hildon-Notify    : $have_hildon_notify"    
-echo "LibOGS support   : $have_ogs_support"
-echo "MozEmbed support : $use_mozembed"
+
+if test "x$with_platform" == "xgnome"; then
+   echo "Editor lib       : $wpeditor"
+   echo "Addressbook      : $have_abook"
+   echo "Help lib         : $helplib"
+   echo "libconic support : $have_libconic"
+   echo "Alarm            : $have_libalarm"
+   echo "Hildon-Notify    : $have_hildon_notify"    
+   echo "LibOGS support   : $have_ogs_support"
+   echo "MozEmbed support : $use_mozembed"
+fi 
+
 echo "CFLAGS           : $CFLAGS"
 echo "Debug version    : $with_debug"
 echo ""

diff --git a/src/gnome/modest-platform.c b/src/gnome/modest-platform.c
index 03baeba..24aed2e 100644 (file)
--- a/src/gnome/modest-platform.c
+++ b/src/gnome/modest-platform.c
@@ -30,10 +30,13 @@
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomeui/gnome-icon-lookup.h>
 #include <tny-gnome-device.h>
+#include <tny-camel-imap-store-account.h>
+#include <tny-camel-pop-store-account.h>
 
 #include "modest-platform.h"
 #include "modest-mail-operation-queue.h"
 #include "modest-runtime.h"
+
 #include "gnome/modest-gnome-global-settings-dialog.h"
 
 gboolean
@@ -203,6 +206,56 @@ gboolean modest_platform_connect_and_wait_if_network_account (GtkWindow *parent_
        return TRUE;
 }
 
+
+void
+modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, 
+                                              TnyFolderStore *folder_store, 
+                                              ModestConnectedPerformer callback, 
+                                              gpointer user_data)
+{
+       TnyAccount *account = NULL;
+       
+       if (!folder_store) {
+               /* We promise to instantly perform the callback, so ... */
+               if (callback) {
+                       callback (FALSE, NULL, parent_window, NULL, user_data);
+               }
+               return; 
+               
+               /* Original comment: Maybe it is something local. */
+               /* PVH's comment: maybe we should KNOW this in stead of assuming? */
+               
+       } else if (TNY_IS_FOLDER (folder_store)) {
+               /* Get the folder's parent account: */
+               account = tny_folder_get_account(TNY_FOLDER (folder_store));
+       } else if (TNY_IS_ACCOUNT (folder_store)) {
+               /* Use the folder store as an account: */
+               account = TNY_ACCOUNT (folder_store);
+       }
+ 
+       if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
+               if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT (account) &&
+                   !TNY_IS_CAMEL_IMAP_STORE_ACCOUNT (account)) {
+                       
+                       /* This IS a local account like a maildir account, which does not require 
+                        * a connection. (original comment had a vague assumption in its language
+                        * usage. There's no assuming needed, this IS what it IS: a local account), */
+ 
+                       /* We promise to instantly perform the callback, so ... */
+                       if (callback) {
+                               callback (FALSE, NULL, parent_window, account, user_data);
+                       }
+                       
+                       return;
+               }
+       }
+ 
+       modest_platform_connect_and_perform (parent_window, account, callback, user_data);
+ 
+       return;
+}
+
+
 gboolean modest_platform_set_update_interval (guint minutes)
 {
        /* TODO. */