X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=8f81f3d8fdee1db57bebce4216821b0094593d0e;hp=308c5822a70edd0210257e91ad1fff24a3227dbd;hb=8e19c556da818a0075fd676b1b951f601a4e5e15;hpb=82db6696192ac4f9319952f1aaa650b979df3870 diff --git a/src/modest-init.c b/src/modest-init.c index 308c582..8f81f3d 100644 --- 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 -#else -#include +#include "modest-hildon-includes.h" #endif +#include static gboolean init_header_columns (ModestConf *conf, gboolean overwrite); static gboolean init_default_account_maybe (ModestAccountMgr *acc_mgr); @@ -72,6 +71,9 @@ typedef struct { gint sort; } FolderCols; + +static const guint MODEST_MAIN_PANED_POS = 280; + static const FolderCols INBOX_COLUMNS_DETAILS[] = { {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0}, {MODEST_HEADER_VIEW_COLUMN_ATTACH, 40, 0}, @@ -95,8 +97,8 @@ static const FolderCols OUTBOX_COLUMNS_DETAILS[] = { }; static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = { - {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0}, - {MODEST_HEADER_VIEW_COLUMN_STATUS, 240, 0} + {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0} +// {MODEST_HEADER_VIEW_COLUMN_STATUS, 240, 0} }; static const FolderCols SENT_COLUMNS_TWOLINES[] = { @@ -119,6 +121,55 @@ 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) @@ -136,11 +187,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 (); @@ -158,7 +204,6 @@ modest_init_init_core (void) return FALSE; } - /* based on the debug settings, we decide whether to overwrite old settings */ reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS; if (!init_header_columns(modest_runtime_get_conf(), reset)) { modest_init_uninit (); @@ -200,7 +245,9 @@ modest_init_init_ui (gint argc, gchar** argv) init_stock_icons (); /* Init notification system */ + #ifdef MODEST_HAVE_HILDON_NOTIFY notify_init ("Basics"); + #endif return TRUE; } @@ -229,6 +276,8 @@ save_header_settings (ModestConf *conf, TnyFolderType type, { int i; gchar *key; + gchar *sort_key; + gchar *sort_value; GString *str; g_return_val_if_fail (cols, FALSE); @@ -236,6 +285,9 @@ save_header_settings (ModestConf *conf, TnyFolderType type, key = _modest_widget_memory_get_keyname_with_double_type ("header-view", type, style, MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH); + sort_key = _modest_widget_memory_get_keyname_with_double_type ("header-view", + type, style, + MODEST_WIDGET_MEMORY_PARAM_COLUMN_SORT); /* if we're not in overwrite mode, only write stuff it * there was nothing before */ if (!overwrite && modest_conf_key_exists(conf, key, NULL)) { @@ -252,6 +304,18 @@ save_header_settings (ModestConf *conf, TnyFolderType type, modest_conf_set_string (conf, key, str->str, NULL); g_free (key); g_string_free (str, TRUE); + + if ( col_num > 0 ) { + gint sort_col_id; + if (cols[i].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT) + sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN; + else + sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN; + sort_value = g_strdup_printf("%d:%d:%d", sort_col_id, GTK_SORT_DESCENDING, 0); + modest_conf_set_string (conf, sort_key, sort_value, NULL); + g_free (sort_value); + } + g_free (sort_key); return TRUE; } @@ -269,6 +333,7 @@ static gboolean init_header_columns (ModestConf *conf, gboolean overwrite) { int folder_type; + gchar *key; for (folder_type = TNY_FOLDER_TYPE_UNKNOWN; folder_type <= TNY_FOLDER_TYPE_CALENDAR; ++folder_type) { @@ -308,6 +373,14 @@ init_header_columns (ModestConf *conf, gboolean overwrite) overwrite); }; } + + key = _modest_widget_memory_get_keyname (MODEST_CONF_MAIN_PANED_KEY, MODEST_WIDGET_MEMORY_PARAM_POS); + /* if we're not in overwrite mode, only write stuff it + * there was nothing before */ + if (overwrite || !modest_conf_key_exists(conf, key, NULL)) + modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS, NULL); + + g_free (key); return TRUE; } @@ -440,16 +513,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, ""); } @@ -598,7 +675,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) {