projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add <p> to text-to-html stream, so that wrapping works better.
[modest]
/
src
/
maemo
/
modest-connection-specific-smtp-window.c
diff --git
a/src/maemo/modest-connection-specific-smtp-window.c
b/src/maemo/modest-connection-specific-smtp-window.c
index
8c31398
..
f1dbb95
100644
(file)
--- a/
src/maemo/modest-connection-specific-smtp-window.c
+++ b/
src/maemo/modest-connection-specific-smtp-window.c
@@
-208,8
+208,9
@@
modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp
MODEL_COL_NAME, connection_name,
MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
-1);
MODEL_COL_NAME, connection_name,
MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
-1);
-
- g_free (server_account_name);
+
+ if (server_account_name)
+ g_free (server_account_name);
}
iter = g_slist_next (iter);
}
iter = g_slist_next (iter);
@@
-252,7
+253,7
@@
on_button_edit (ModestConnectionSpecificSmtpWindow *self)
/* Get existing server account data if a server account is already specified: */
gboolean settings_were_retrieved = FALSE;
if (server_account_name && !server_settings) {
/* Get existing server account data if a server account is already specified: */
gboolean settings_were_retrieved = FALSE;
if (server_account_name && !server_settings) {
- server_settings = modest_account_mgr_load_server_settings(mgr, server_account_name);
+ server_settings = modest_account_mgr_load_server_settings(mgr, server_account_name, TRUE);
if (server_settings)
settings_were_retrieved = TRUE;
}
if (server_settings)
settings_were_retrieved = TRUE;
}
@@
-267,7
+268,9
@@
on_button_edit (ModestConnectionSpecificSmtpWindow *self)
server_settings = NULL;
}
server_settings = NULL;
}
- modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (window));
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+ GTK_WINDOW (window),
+ GTK_WINDOW (self));
gint response = gtk_dialog_run (GTK_DIALOG (window));
if (response == GTK_RESPONSE_OK) {
gint response = gtk_dialog_run (GTK_DIALOG (window));
if (response == GTK_RESPONSE_OK) {