* restore gnome building (check for easysetup)

[modest] / src / modest-runtime.c

diff --git a/src/modest-runtime.c b/src/modest-runtime.c
index 499a8c6..de3fa1f 100644 (file)
--- a/src/modest-runtime.c
+++ b/src/modest-runtime.c
@@ -94,7 +94,14 @@ static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = {
         {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
         {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,200},
 };
-        
+
+#ifdef MODEST_PLATFORM_MAEMO
+static const TnyFolderType LOCAL_FOLDERS[] = {
+       TNY_FOLDER_TYPE_OUTBOX,
+       TNY_FOLDER_TYPE_DRAFTS,
+       TNY_FOLDER_TYPE_SENT
+};
+#else
 static const TnyFolderType LOCAL_FOLDERS[] = {
        TNY_FOLDER_TYPE_OUTBOX,
        TNY_FOLDER_TYPE_DRAFTS,
@@ -102,6 +109,8 @@ static const TnyFolderType LOCAL_FOLDERS[] = {
        TNY_FOLDER_TYPE_TRASH,
        TNY_FOLDER_TYPE_ARCHIVE 
 };
+#endif /* MODEST_PLATFORM_MAEMO */
+
 
 
 gboolean
@@ -524,10 +533,11 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-       bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALEDIR);
+       /* Setup gettext, to use our .po files: */
+       /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
+       bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
-
 }
 
 
@@ -547,6 +557,11 @@ init_stock_icons (void)
                gint i;
 
                static GtkStockItem items[] = {
+#ifdef MODEST_PLATFORM_MAEMO
+                       { MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
+                       { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
+                       { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
+#endif /*MODEST_PLATFORM_MAEMO*/
                        { MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL },
                        { MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
 /*                     { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },  */
@@ -560,6 +575,11 @@ init_stock_icons (void)
                };
       
                static gchar *items_names [] = {
+#ifdef MODEST_PLATFORM_MAEMO
+                       MODEST_TOOLBAR_ICON_SPLIT_VIEW,
+                       MODEST_TOOLBAR_ICON_SORT,
+                       MODEST_TOOLBAR_ICON_REFRESH,
+#endif /*MODEST_PLATFORM_MAEMO*/
                        MODEST_TOOLBAR_ICON_MAIL_SEND,
                        MODEST_TOOLBAR_ICON_NEW_MAIL,
 /*                     MODEST_TOOLBAR_ICON_SEND_RECEIVE,  */
@@ -570,6 +590,7 @@ init_stock_icons (void)
 /*                     MODEST_TOOLBAR_ICON_NEXT, */
 /*                     MODEST_TOOLBAR_ICON_PREV, */
 /*                     MODEST_TOOLBAR_ICON_STOP */
+                       MODEST_TOOLBAR_ICON_FORMAT_BULLETS,
                };
 
                registered = TRUE;
@@ -586,15 +607,16 @@ init_stock_icons (void)
                /* Register icons to accompany stock items */
                for (i = 0; i < G_N_ELEMENTS (items); i++) {
 
-#if MODEST_PLATFORM_ID==1  /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ 
-                       pixbuf = gdk_pixbuf_new_from_file (items_names[i], NULL);
-#else
+#ifdef MODEST_PLATFORM_MAEMO  /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ 
                        pixbuf = gtk_icon_theme_load_icon (current_theme,
                                                           items_names[i],
                                                           26,
                                                           GTK_ICON_LOOKUP_NO_SVG,
                                                           NULL);
+#else
+                       pixbuf = gdk_pixbuf_new_from_file (items_names[i], NULL);
 #endif
+
                        if (pixbuf != NULL) {
                                GtkIconSet *icon_set;
                                GdkPixbuf *transparent;