* Changes in the autotools stuff affecting a lot of platform dependent

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 8a3b868..976c2e2 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -51,7 +51,7 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
 
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 #include "modest-hildon-includes.h"
 #endif
 #include <locale.h>
@@ -83,7 +83,6 @@ static const guint MODEST_MAIN_PANED_POS_PERCENTAGE = 30;
 static const guint MODEST_MSG_PANED_POS_PERCENTAGE = 50;
 
 static const FolderCols INBOX_COLUMNS_DETAILS[] = {
-       {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40, 0},
        {MODEST_HEADER_VIEW_COLUMN_FROM,    80, 0},
        {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
@@ -96,7 +95,6 @@ static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
 };
 
 static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
-       {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40, 0},
        {MODEST_HEADER_VIEW_COLUMN_TO,    80, 0},
        {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
@@ -113,7 +111,7 @@ static const FolderCols SENT_COLUMNS_TWOLINES[] = {
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
 };
 
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 static const TnyFolderType LOCAL_FOLDERS[] = {
 /*     TNY_FOLDER_TYPE_OUTBOX, */
        TNY_FOLDER_TYPE_DRAFTS,
@@ -127,7 +125,7 @@ static const TnyFolderType LOCAL_FOLDERS[] = {
        TNY_FOLDER_TYPE_TRASH,
        TNY_FOLDER_TYPE_ARCHIVE 
 };
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_TOOLKIT_GTK */
 
 static GList*
 new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num)
@@ -234,6 +232,8 @@ modest_init (int argc, char *argv[])
                return FALSE;
        }
        
+       modest_plugin_factory_load_all (modest_runtime_get_plugin_factory ());
+
        /* do an initial guess for the device name */
        init_device_name (modest_runtime_get_conf());
        
@@ -306,7 +306,7 @@ modest_init_uninit (void)
        
        if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */
                gnome_vfs_shutdown ();
-               
+
        _is_initialized = FALSE;
        return TRUE;
 }
@@ -625,10 +625,10 @@ init_stock_icons (void)
                gint i;
 
                static GtkStockItem items[] = {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
                        { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
                        { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*MODEST_TOOLKIT_GTK*/
                        { MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
                        { MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL },
                        { MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
@@ -643,10 +643,10 @@ init_stock_icons (void)
                };
       
                static gchar *items_names [] = {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
                        MODEST_TOOLBAR_ICON_SORT,
                        MODEST_TOOLBAR_ICON_REFRESH,
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*MODEST_TOOLKIT_GTK*/
                        MODEST_TOOLBAR_ICON_SPLIT_VIEW,
                        MODEST_TOOLBAR_ICON_MAIL_SEND,
                        MODEST_TOOLBAR_ICON_NEW_MAIL,
@@ -675,7 +675,7 @@ init_stock_icons (void)
                /* Register icons to accompany stock items */
                for (i = 0; i < G_N_ELEMENTS (items); i++) {
 
-#ifdef MODEST_PLATFORM_MAEMO  /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ 
+#ifndef MODEST_PLATFORM_GTK  
                        pixbuf = gtk_icon_theme_load_icon (current_theme,
                                                           items_names[i],
                                                           26,
@@ -772,7 +772,7 @@ init_device_name (ModestConf *conf)
        gchar *devname = NULL;
        
        if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {
-               g_printerr ("modest: failed to read hostname\n");
+               g_warning ("%s: failed to read hostname\n", __FUNCTION__);
                modest_conf_set_string (conf, MODEST_CONF_DEVICE_NAME,
                                        MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME,
                                        NULL);