projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixed an invalid free in the easysetup dialog
[modest]
/
src
/
modest-init.c
diff --git
a/src/modest-init.c
b/src/modest-init.c
index
8a3b868
..
983cd3d
100644
(file)
--- a/
src/modest-init.c
+++ b/
src/modest-init.c
@@
-27,6
+27,7
@@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/utsname.h>
#include <config.h>
#include <glib.h>
#include <glib-object.h>
#include <config.h>
#include <glib.h>
#include <glib-object.h>
@@
-50,8
+51,9
@@
#include "modest-tny-msg.h"
#include <libgnomevfs/gnome-vfs.h>
#include <string.h>
#include "modest-tny-msg.h"
#include <libgnomevfs/gnome-vfs.h>
#include <string.h>
+#include "modest-text-utils.h"
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
#include "modest-hildon-includes.h"
#endif
#include <locale.h>
#include "modest-hildon-includes.h"
#endif
#include <locale.h>
@@
-83,7
+85,6
@@
static const guint MODEST_MAIN_PANED_POS_PERCENTAGE = 30;
static const guint MODEST_MSG_PANED_POS_PERCENTAGE = 50;
static const FolderCols INBOX_COLUMNS_DETAILS[] = {
static const guint MODEST_MSG_PANED_POS_PERCENTAGE = 50;
static const FolderCols INBOX_COLUMNS_DETAILS[] = {
- {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
{MODEST_HEADER_VIEW_COLUMN_ATTACH, 40, 0},
{MODEST_HEADER_VIEW_COLUMN_FROM, 80, 0},
{MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
{MODEST_HEADER_VIEW_COLUMN_ATTACH, 40, 0},
{MODEST_HEADER_VIEW_COLUMN_FROM, 80, 0},
{MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
@@
-96,7
+97,6
@@
static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
};
static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
};
static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
- {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
{MODEST_HEADER_VIEW_COLUMN_ATTACH, 40, 0},
{MODEST_HEADER_VIEW_COLUMN_TO, 80, 0},
{MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
{MODEST_HEADER_VIEW_COLUMN_ATTACH, 40, 0},
{MODEST_HEADER_VIEW_COLUMN_TO, 80, 0},
{MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
@@
-113,7
+113,7
@@
static const FolderCols SENT_COLUMNS_TWOLINES[] = {
{MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
};
{MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
};
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
static const TnyFolderType LOCAL_FOLDERS[] = {
/* TNY_FOLDER_TYPE_OUTBOX, */
TNY_FOLDER_TYPE_DRAFTS,
static const TnyFolderType LOCAL_FOLDERS[] = {
/* TNY_FOLDER_TYPE_OUTBOX, */
TNY_FOLDER_TYPE_DRAFTS,
@@
-127,7
+127,7
@@
static const TnyFolderType LOCAL_FOLDERS[] = {
TNY_FOLDER_TYPE_TRASH,
TNY_FOLDER_TYPE_ARCHIVE
};
TNY_FOLDER_TYPE_TRASH,
TNY_FOLDER_TYPE_ARCHIVE
};
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_TOOLKIT_GTK */
static GList*
new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num)
static GList*
new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num)
@@
-185,7
+185,7
@@
static gboolean
force_ke_recv_load (void)
{
if (strcmp ("cerm_device_memory_full",
force_ke_recv_load (void)
{
if (strcmp ("cerm_device_memory_full",
- dgettext("ke-recv", "cerm_device_memory_full")) == 0) {
+ _KR("cerm_device_memory_full")) == 0) {
g_warning ("%s: cannot get translation for cerm_device_memory_full",
__FUNCTION__);
return FALSE;
g_warning ("%s: cannot get translation for cerm_device_memory_full",
__FUNCTION__);
return FALSE;
@@
-234,6
+234,8
@@
modest_init (int argc, char *argv[])
return FALSE;
}
return FALSE;
}
+ modest_plugin_factory_load_all (modest_runtime_get_plugin_factory ());
+
/* do an initial guess for the device name */
init_device_name (modest_runtime_get_conf());
/* do an initial guess for the device name */
init_device_name (modest_runtime_get_conf());
@@
-306,7
+308,7
@@
modest_init_uninit (void)
if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */
gnome_vfs_shutdown ();
if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */
gnome_vfs_shutdown ();
-
+
_is_initialized = FALSE;
return TRUE;
}
_is_initialized = FALSE;
return TRUE;
}
@@
-386,7
+388,7
@@
init_header_columns (ModestConf *conf, gboolean overwrite)
gchar *key;
for (folder_type = TNY_FOLDER_TYPE_UNKNOWN;
gchar *key;
for (folder_type = TNY_FOLDER_TYPE_UNKNOWN;
- folder_type <= TNY_FOLDER_TYPE_CALENDAR; ++folder_type) {
+ folder_type < TNY_FOLDER_TYPE_NUM; ++folder_type) {
switch (folder_type) {
case TNY_FOLDER_TYPE_SENT:
switch (folder_type) {
case TNY_FOLDER_TYPE_SENT:
@@
-429,7
+431,7
@@
init_header_columns (ModestConf *conf, gboolean overwrite)
/* if we're not in overwrite mode, only write stuff it
* there was nothing before */
if (overwrite || !modest_conf_key_exists(conf, key, NULL))
/* 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_PERCENTAGE, NULL);
+ modest_conf_set_float (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
g_free (key);
g_free (key);
@@
-438,7
+440,7
@@
init_header_columns (ModestConf *conf, gboolean overwrite)
/* if we're not in overwrite mode, only write stuff it
* there was nothing before */
if (overwrite || !modest_conf_key_exists(conf, key, NULL))
/* 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_MSG_PANED_POS_PERCENTAGE, NULL);
+ modest_conf_set_float (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL);
g_free (key);
return TRUE;
g_free (key);
return TRUE;
@@
-617,7
+619,7
@@
static void
init_stock_icons (void)
{
static gboolean registered = FALSE;
init_stock_icons (void)
{
static gboolean registered = FALSE;
-
+
if (!registered) {
GtkIconTheme *current_theme;
GdkPixbuf *pixbuf;
if (!registered) {
GtkIconTheme *current_theme;
GdkPixbuf *pixbuf;
@@
-625,47
+627,38
@@
init_stock_icons (void)
gint i;
static GtkStockItem items[] = {
gint i;
static GtkStockItem items[] = {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
{ MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
{ MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
{ MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
{ MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*MODEST_TOOLKIT_GTK*/
{ 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_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_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 [] = {
static gchar *items_names [] = {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
MODEST_TOOLBAR_ICON_SORT,
MODEST_TOOLBAR_ICON_REFRESH,
MODEST_TOOLBAR_ICON_SORT,
MODEST_TOOLBAR_ICON_REFRESH,
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*MODEST_TOOLKIT_GTK*/
MODEST_TOOLBAR_ICON_SPLIT_VIEW,
MODEST_TOOLBAR_ICON_MAIL_SEND,
MODEST_TOOLBAR_ICON_NEW_MAIL,
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_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));
};
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);
/* Add our custom icon factory to the list of defaults */
factory = gtk_icon_factory_new ();
gtk_icon_factory_add_default (factory);
@@
-675,10
+668,14
@@
init_stock_icons (void)
/* Register icons to accompany stock items */
for (i = 0; i < G_N_ELEMENTS (items); i++) {
/* Register icons to accompany stock items */
for (i = 0; i < G_N_ELEMENTS (items); i++) {
-#ifdef MODEST_PLATFORM_MAEMO /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */
+#ifndef MODEST_PLATFORM_GTK
pixbuf = gtk_icon_theme_load_icon (current_theme,
items_names[i],
pixbuf = gtk_icon_theme_load_icon (current_theme,
items_names[i],
- 26,
+#ifdef MODEST_TOOLKIT_HILDON2
+ MODEST_ICON_SIZE_BIG,
+#else
+ MODEST_ICON_SIZE_SMALL,
+#endif
GTK_ICON_LOOKUP_NO_SVG,
NULL);
#else
GTK_ICON_LOOKUP_NO_SVG,
NULL);
#else
@@
-687,14
+684,18
@@
init_stock_icons (void)
if (pixbuf != NULL) {
GtkIconSet *icon_set;
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);
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);
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]);
}
else
g_warning ("Modest: %s: failed to load %s icon", __FUNCTION__, items_names[i]);
@@
-729,7
+730,7
@@
init_default_settings (ModestConf *conf)
/* Editor keys */
if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
/* Editor keys */
if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
- modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);
+ modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, FALSE, NULL);
if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);
if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);
@@
-768,28
+769,16
@@
init_default_settings (ModestConf *conf)
static void
init_device_name (ModestConf *conf)
{
static void
init_device_name (ModestConf *conf)
{
- gsize len = 255; /* max len */
- gchar *devname = NULL;
-
- if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {
- g_printerr ("modest: failed to read hostname\n");
- modest_conf_set_string (conf, MODEST_CONF_DEVICE_NAME,
- MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME,
+ struct utsname name;
+
+ if (uname (&name) == 0) {
+ modest_conf_set_string (modest_runtime_get_conf(),
+ MODEST_CONF_DEVICE_NAME, name.nodename,
NULL);
} else {
NULL);
} else {
- /* remove the \n at the end */
- if (devname[len-1] == '\n')
- devname[len-1] = '\0';
- else
- devname[len] = '\0';
-
- GError *err = NULL;
- if (!modest_conf_set_string (conf, MODEST_CONF_DEVICE_NAME,devname, &err)) {
- g_printerr ("modest: error setting device name '%s': %s",
- devname, err ? err->message: "?");
- g_error_free (err);
- }
+ modest_conf_set_string (modest_runtime_get_conf(),
+ MODEST_CONF_DEVICE_NAME,
+ MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME,
+ NULL);
}
}
-
- g_free (devname);
}
}