X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-init.c;h=5d3189a723ec9cfd7b67db897c6a12e65e4e7fd1;hb=06f5e97427e373347d187a59d14e8b814eda0419;hp=09f3e4f82eda271582a97b628c7b5e4ab8cbdc3c;hpb=1046188c1febcdf1a34637a7400de3d3162e0302;p=modest diff --git a/src/modest-init.c b/src/modest-init.c index 09f3e4f..5d3189a 100644 --- a/src/modest-init.c +++ b/src/modest-init.c @@ -480,7 +480,7 @@ gboolean modest_init_one_local_folder (gchar *maildir_path) */ gboolean modest_init_local_folders (const gchar* location_filepath) -{ +{ gboolean retval = TRUE; gchar *maildir_path = modest_local_folder_info_get_maildir_path (location_filepath); @@ -495,18 +495,10 @@ modest_init_local_folders (const gchar* location_filepath) NULL); const gboolean created = modest_init_one_local_folder (dir); g_free(dir); - - if (!created) { - retval = FALSE; - } - #if 0 - /* Do this if we only create the top-level dir: */ - if (g_mkdir_with_parents (maildir_path, 0755) < 0) { - g_printerr ("modest: %s: failed to create %s\n", __FUNCTION__, location_filepath); + if (!created) { retval = FALSE; } - #endif } else { /* Create each of the standard on-disk folders. @@ -515,16 +507,16 @@ modest_init_local_folders (const gchar* location_filepath) for (i = 0; i != G_N_ELEMENTS(LOCAL_FOLDERS); ++i) { gchar *dir = g_build_filename (maildir_path, modest_local_folder_info_get_type_name(LOCAL_FOLDERS[i]), - NULL); + NULL); const gboolean created = modest_init_one_local_folder (dir); g_free(dir); - + if (!created) { retval = FALSE; } } } - + g_free (maildir_path); return retval; } @@ -588,22 +580,12 @@ init_debug_logging (void) static void init_i18n (void) { - /* little trick make en_GB the fallback language, instead - * of the logical IDs - * we need the ugly ifdefs, because modest_platform_init is - * too late. - */ const gchar *lc_messages = getenv ("LC_MESSAGES"); if (!lc_messages) { setenv ("LANGUAGE", "en_GB", 1); setenv ("LC_MESSAGES", "en_GB", 1); - } else { - gchar *language = g_strdup_printf ("%s:en_GB", lc_messages); - setenv ("LANGUAGE", language, 1); - g_free (language); } - /* end of little trick */ bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -619,7 +601,7 @@ static void init_stock_icons (void) { static gboolean registered = FALSE; - + if (!registered) { GtkIconTheme *current_theme; GdkPixbuf *pixbuf; @@ -634,16 +616,12 @@ init_stock_icons (void) { 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 }, -/* { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL }, */ { MODEST_STOCK_REPLY, "reply", 0, 0, NULL }, { MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL }, { MODEST_STOCK_FORWARD, "forward", 0, 0, NULL }, - { MODEST_STOCK_DELETE, "delete", 0, 0, NULL }, -/* { MODEST_STOCK_NEXT, "next", 0, 0, NULL }, */ -/* { MODEST_STOCK_PREV, "prev", 0, 0, NULL }, */ -/* { MODEST_STOCK_STOP, "stop", 0, 0, NULL } */ + { MODEST_STOCK_DELETE, "delete", 0, 0, NULL }, }; - + static gchar *items_names [] = { #ifndef MODEST_TOOLKIT_GTK MODEST_TOOLBAR_ICON_SORT, @@ -652,22 +630,17 @@ init_stock_icons (void) MODEST_TOOLBAR_ICON_SPLIT_VIEW, MODEST_TOOLBAR_ICON_MAIL_SEND, MODEST_TOOLBAR_ICON_NEW_MAIL, -/* MODEST_TOOLBAR_ICON_SEND_RECEIVE, */ - MODEST_TOOLBAR_ICON_REPLY, + MODEST_TOOLBAR_ICON_REPLY, MODEST_TOOLBAR_ICON_REPLY_ALL, MODEST_TOOLBAR_ICON_FORWARD, - MODEST_TOOLBAR_ICON_DELETE, -/* MODEST_TOOLBAR_ICON_NEXT, */ -/* MODEST_TOOLBAR_ICON_PREV, */ -/* MODEST_TOOLBAR_ICON_STOP */ -/* MODEST_TOOLBAR_ICON_FORMAT_BULLETS, */ + MODEST_TOOLBAR_ICON_DELETE, }; registered = TRUE; /* Register our stock items */ gtk_stock_add (items, G_N_ELEMENTS (items)); - + /* Add our custom icon factory to the list of defaults */ factory = gtk_icon_factory_new (); gtk_icon_factory_add_default (factory); @@ -677,13 +650,13 @@ init_stock_icons (void) /* Register icons to accompany stock items */ for (i = 0; i < G_N_ELEMENTS (items); i++) { -#ifndef MODEST_PLATFORM_GTK +#ifndef MODEST_PLATFORM_GTK pixbuf = gtk_icon_theme_load_icon (current_theme, items_names[i], #ifdef MODEST_TOOLKIT_HILDON2 - 48, + MODEST_ICON_SIZE_BIG, #else - 26, + MODEST_ICON_SIZE_SMALL, #endif GTK_ICON_LOOKUP_NO_SVG, NULL); @@ -693,14 +666,18 @@ init_stock_icons (void) if (pixbuf != NULL) { GtkIconSet *icon_set; - GdkPixbuf *transparent; +#ifndef MODEST_TOOLKIT_HILDON2 + GdkPixbuf *transparent; transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff); icon_set = gtk_icon_set_new_from_pixbuf (transparent); + g_object_unref (transparent); +#else + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); +#endif gtk_icon_factory_add (factory, items[i].stock_id, icon_set); gtk_icon_set_unref (icon_set); g_object_unref (pixbuf); - g_object_unref (transparent); } else g_warning ("Modest: %s: failed to load %s icon", __FUNCTION__, items_names[i]); @@ -740,6 +717,14 @@ init_default_settings (ModestConf *conf) if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL)) modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL); + /* File chooser keys */ + if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL)) + modest_conf_set_string (conf, MODEST_CONF_LATEST_ATTACH_FILE_PATH, "", NULL); + if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_INSERT_IMAGE_PATH, NULL)) + modest_conf_set_string (conf, MODEST_CONF_LATEST_INSERT_IMAGE_PATH, "", NULL); + if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, NULL)) + modest_conf_set_string (conf, MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, "", NULL); + /* Global settings */ if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_UPDATE, NULL)) modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL); @@ -756,8 +741,13 @@ init_default_settings (ModestConf *conf) if (!modest_conf_key_exists (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, NULL)) modest_conf_set_bool (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, FALSE, NULL); +#ifdef MODEST_TOOLKIT_GTK + /* In Gnome port, we only allow editting plain text */ + modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, FALSE, NULL); +#else if (!modest_conf_key_exists (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, TRUE, NULL); +#endif if (!modest_conf_key_exists (conf, MODEST_CONF_REPLY_TYPE, NULL)) modest_conf_set_int (conf, MODEST_CONF_REPLY_TYPE, MODEST_TNY_MSG_REPLY_TYPE_QUOTE, NULL);