trying to commit

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index b5949c0..8f09230 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -78,7 +78,7 @@ static const FolderCols INBOX_COLUMNS_DETAILS[] = {
 static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 180, 0},
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE, 240, 1}
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE, 240, -1}
 };
 
 static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
@@ -99,7 +99,7 @@ static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = {
 static const FolderCols SENT_COLUMNS_TWOLINES[] = {
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE, 240, 1}
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE, 240, -1}
 };
 
 #ifdef MODEST_PLATFORM_MAEMO
@@ -191,7 +191,7 @@ modest_init_init_ui (gint argc, gchar** argv)
 
        /* Set application name */
        g_set_application_name (modest_platform_get_app_name());
-       g_message (modest_platform_get_app_name());
+       /* g_message (modest_platform_get_app_name()); */
 
        init_stock_icons ();
        return TRUE;
@@ -354,7 +354,7 @@ free_element (gpointer data, gpointer user_data)
 }
 
 
-
+/* TODO: This is a duplicate of modest_account_mgr_set_first_account_as_default(). */
 /**
  * init_default_account_maybe:
  *
@@ -372,7 +372,7 @@ init_default_account_maybe  (ModestAccountMgr *acc_mgr)
        gchar *default_account;
        gboolean retval = TRUE;
        
-       all_accounts = modest_account_mgr_account_names (acc_mgr);
+       all_accounts = modest_account_mgr_account_names (acc_mgr, TRUE /* enabled accounts only */);
        if (all_accounts) { /* if there are any accounts, there should be a default one */
                default_account = 
                        modest_account_mgr_get_default_account (acc_mgr);
@@ -429,11 +429,19 @@ init_debug_logging (void)
 static void
 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 */
-       bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
-       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-       textdomain (GETTEXT_PACKAGE);
+#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*/
+       
+       bind_textdomain_codeset (gettext_package, "UTF-8");
+       textdomain (gettext_package);
 }