* set the folder name in instead of the folder-url for the search results

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index a51ca27..b853246 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -49,10 +49,9 @@
 #include "widgets/modest-global-settings-dialog.h"
 #include "modest-tny-msg.h"
 #ifdef MODEST_PLATFORM_MAEMO
-#include <hildon/hildon-notification.h>
-#else
-#include <libnotify/notify.h>
+#include "modest-hildon-includes.h"
 #endif
+#include <locale.h>
 
 static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
 static gboolean init_default_account_maybe  (ModestAccountMgr *acc_mgr);
@@ -122,6 +121,54 @@ static const TnyFolderType LOCAL_FOLDERS[] = {
 };
 #endif /* MODEST_PLATFORM_MAEMO */
 
+static GList* new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num)
+{
+       GList *result = NULL;
+       
+       guint i = 0;
+       for (i = 0; i < col_num; ++i) {
+               result = g_list_append (result, GINT_TO_POINTER (cols[i].col));
+       }
+       
+       return result;
+}
+
+GList * modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, ModestHeaderViewStyle style)
+{
+               GList *result = NULL;
+               
+               switch (folder_type) {
+               case TNY_FOLDER_TYPE_SENT:
+               case TNY_FOLDER_TYPE_DRAFTS:
+                       if (style == MODEST_HEADER_VIEW_STYLE_DETAILS)
+                               result = new_cold_ids_gslist_from_array (OUTBOX_COLUMNS_DETAILS,
+                                     G_N_ELEMENTS(OUTBOX_COLUMNS_DETAILS));
+                       else if (style == MODEST_HEADER_VIEW_STYLE_TWOLINES)
+                               result = new_cold_ids_gslist_from_array (SENT_COLUMNS_TWOLINES,
+                                     G_N_ELEMENTS(SENT_COLUMNS_TWOLINES));
+               break;
+               case TNY_FOLDER_TYPE_OUTBOX:
+                       if (style == MODEST_HEADER_VIEW_STYLE_TWOLINES)
+                               result = new_cold_ids_gslist_from_array (OUTBOX_COLUMNS_TWOLINES,
+                                     G_N_ELEMENTS(OUTBOX_COLUMNS_TWOLINES));
+               break;
+
+               default:
+                       if (style == MODEST_HEADER_VIEW_STYLE_DETAILS)
+                               result =  new_cold_ids_gslist_from_array (INBOX_COLUMNS_DETAILS,
+                                     G_N_ELEMENTS(INBOX_COLUMNS_DETAILS));
+                       else if (style == MODEST_HEADER_VIEW_STYLE_TWOLINES)
+                               result = new_cold_ids_gslist_from_array (INBOX_COLUMNS_TWOLINES,
+                                     G_N_ELEMENTS(INBOX_COLUMNS_TWOLINES));
+               };
+               
+               if (!result) {
+                       g_warning("DEBUG: %s: No default columns IDs found for "
+                               "folder_type=%d, style=%d\n", __FUNCTION__, folder_type, style);        
+               }
+               
+               return result;
+}
 
 gboolean
 modest_init_init_core (void)
@@ -139,11 +186,6 @@ modest_init_init_core (void)
        init_i18n();
        init_debug_g_type();
        init_debug_logging();
-
-       if (!g_thread_supported())
-               g_thread_init(NULL);
-       
-       gdk_threads_init ();
        
        if (!modest_runtime_init()) {
                modest_init_uninit ();
@@ -203,7 +245,9 @@ modest_init_init_ui (gint argc, gchar** argv)
        init_stock_icons ();
 
        /* Init notification system */
+       #ifndef MODEST_HILDON_VERSION_0
        notify_init ("Basics");
+       #endif
 
        return TRUE;
 }
@@ -452,16 +496,20 @@ init_i18n (void)
        const gchar* gettext_package;
        /* Setup gettext, to use our .po files: */
        /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
-#ifdef MODEST_HILDON_VERSION_0
-       gettext_package = GETTEXT_PACKAGE;
-       bindtextdomain (gettext_package, MODEST_LOCALE_DIR);
-#else
-       gettext_package = "osso-email"; /* HACK to use the localizations */
-       bindtextdomain (gettext_package, "/usr/share/locale");
-#endif /*MODEST_HILDON_VERSION_0*/
+/* #ifdef MODEST_HILDON_VERSION_0 */
+/*     gettext_package = GETTEXT_PACKAGE; */
+/*     bindtextdomain (gettext_package, MODEST_LOCALE_DIR); */
+/* #else */
+/*     gettext_package = "osso-email"; /\* HACK to use the localizations *\/ */
+/*     bindtextdomain (gettext_package, "/usr/share/locale"); */
+/* #endif /\*MODEST_HILDON_VERSION_0*\/ */
        
+       gettext_package = GETTEXT_PACKAGE;
+
        bind_textdomain_codeset (gettext_package, "UTF-8");
        textdomain (gettext_package);
+
+       setlocale (LC_ALL, "");
 }
 
 
@@ -610,7 +658,7 @@ init_default_settings (ModestConf *conf)
 static void
 init_device_name (ModestConf *conf)
 {
-       int len = 255; /* max len */
+       unsigned int len = 255; /* max len */
        gchar *devname = NULL;
        
        if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {