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_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 }, */
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_SPLIT_VIEW,
MODEST_TOOLBAR_ICON_MAIL_SEND,
MODEST_TOOLBAR_ICON_NEW_MAIL,
/* MODEST_TOOLBAR_ICON_SEND_RECEIVE, */
modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);
if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL))
- modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL);
+ modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL);
if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL))
modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);
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);
+
+ if (!modest_conf_key_exists (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, NULL))
+ modest_conf_set_bool (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, FALSE, NULL);
}
static void
init_device_name (ModestConf *conf)
{
- unsigned int len = 255; /* max len */
+ gsize len = 255; /* max len */
gchar *devname = NULL;
if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {