projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix for 61408
[modest]
/
src
/
modest-main.c
diff --git
a/src/modest-main.c
b/src/modest-main.c
index
ca96b75
..
e0dc501
100644
(file)
--- a/
src/modest-main.c
+++ b/
src/modest-main.c
@@
-71,11
+71,20
@@
static gchar* check_account (const gchar *account);
static ModestErrorCode start_ui (const gchar *account,
const gchar* mailto, const gchar *cc,
static ModestErrorCode start_ui (const gchar *account,
const gchar* mailto, const gchar *cc,
- const gchar *bcc, const gchar* subject, const gchar *body);
+ const gchar *bcc, const gchar* subject, const gchar *body, GtkWidget **ui);
static ModestErrorCode send_mail (const gchar* account,
const gchar* mailto, const gchar *cc, const gchar *bcc,
const gchar* subject, const gchar *body);
static ModestErrorCode send_mail (const gchar* account,
const gchar* mailto, const gchar *cc, const gchar *bcc,
const gchar* subject, const gchar *body);
+
+static void
+on_show (GtkWidget *widget, gpointer user_data)
+{
+ if (modest_conf_get_bool (modest_runtime_get_conf(),
+ MODEST_CONF_CONNECT_AT_STARTUP, NULL))
+ modest_platform_connect_and_wait(NULL);
+}
+
int
main (int argc, char *argv[])
{
int
main (int argc, char *argv[])
{
@@
-106,6
+115,11
@@
main (int argc, char *argv[])
{ NULL, 0, 0, 0, NULL, NULL, NULL }
};
{ NULL, 0, 0, 0, NULL, NULL, NULL }
};
+ /* Enable threads before anything else, to prevent memory corruption */
+ if (!g_thread_supported())
+ g_thread_init(NULL);
+ gdk_threads_init ();
+
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, options, NULL);
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, options, NULL);
@@
-134,12
+148,11
@@
main (int argc, char *argv[])
retval = MODEST_ERR_UI;
goto cleanup;
} else {
retval = MODEST_ERR_UI;
goto cleanup;
} else {
- if (modest_conf_get_bool (modest_runtime_get_conf(),
- MODEST_CONF_CONNECT_AT_STARTUP, NULL))
- modest_platform_connect_and_wait(NULL);
-
+ GtkWidget *ui = NULL;
retval = start_ui (account_or_default,
retval = start_ui (account_or_default,
- mailto, cc, bcc, subject, body);
+ mailto, cc, bcc, subject, body, &ui);
+ if (ui)
+ g_signal_connect (G_OBJECT (ui), "show", G_CALLBACK(on_show), NULL);
}
} else {
if (!account_or_default) {
}
} else {
if (!account_or_default) {
@@
-168,7
+181,7
@@
cleanup:
static ModestErrorCode
start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const gchar *bcc,
static ModestErrorCode
start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const gchar *bcc,
- const gchar* subject, const gchar *body)
+ const gchar* subject, const gchar *body, GtkWidget **ui)
{
ModestWindow *win = NULL;
{
ModestWindow *win = NULL;
@@
-227,6
+240,8
@@
start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const
} else {
ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
modest_window_mgr_register_window (mgr, win);
} else {
ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
modest_window_mgr_register_window (mgr, win);
+ *ui = (GtkWidget*) win;
+ g_object_unref (win);
}
gtk_widget_show_all (GTK_WIDGET (win));
}
gtk_widget_show_all (GTK_WIDGET (win));
@@
-283,9
+298,10
@@
send_mail (const gchar* account_name,
from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
account_name);
from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
account_name);
- mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_SEND, NULL);
+ mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, NULL);
modest_mail_operation_send_new_mail (mail_operation, account,
modest_mail_operation_send_new_mail (mail_operation, account,
+ NULL,
from_string, mailto,
cc, bcc, subject, body, NULL /* html_body */,
NULL /* attachments */, 0 /* priority */);
from_string, mailto,
cc, bcc, subject, body, NULL /* html_body */,
NULL /* attachments */, 0 /* priority */);