if (prev_row_reference != NULL)
gtk_tree_row_reference_free (prev_row_reference);
if (prev_path != NULL)
- gtk_tree_path_free (prev_path);
+ gtk_tree_path_free (prev_path);
}
/* Update toolbar dimming state */
} else {
/* Show the list of accounts */
GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ());
- gtk_window_set_transient_for (account_win, GTK_WINDOW (win));
/* The accounts dialog must be modal */
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), account_win);
}
}
-#ifdef MODEST_PLATFORM_MAEMO
-static void
-on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data)
-{
- /* Save any changes. */
- modest_connection_specific_smtp_window_save_server_accounts (
- MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window));
- gtk_widget_destroy (GTK_WIDGET (window));
-}
-#endif
-
-
void
modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
{
MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (specific_window),
modest_runtime_get_account_mgr());
- /* Show the window: */
- gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win));
- gtk_window_set_modal (GTK_WINDOW (specific_window), TRUE);
+ /* Show the window: */
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+ GTK_WINDOW (specific_window));
gtk_widget_show (specific_window);
-
- /* Save changes when the window is hidden: */
- g_signal_connect (specific_window, "hide",
- G_CALLBACK (on_smtp_servers_window_hide), win);
#endif /* MODEST_PLATFORM_MAEMO */
}
gdk_threads_enter ();
banner_info->idle_handler = 0;
banner_info->banner = modest_platform_animation_banner (NULL, NULL, banner_info->message);
- g_object_ref (banner_info->banner);
+ if (banner_info)
+ g_object_ref (banner_info->banner);
gdk_threads_leave ();
if (from_header) {
GSList *accounts = modest_account_mgr_account_names (mgr, TRUE);
GSList *node = NULL;
+ gchar *from_header_email;
+
+ from_header_email = modest_text_utils_get_email_address ((const gchar *) from_header);
+
for (node = accounts; node != NULL; node = g_slist_next (node)) {
- gchar *from = modest_account_mgr_get_from_string (mgr, node->data);
+ gchar *from, *from_email;
- if (from && (strcmp (from_header, from) == 0)) {
- g_free (account);
- account = g_strdup (node->data);
+ from = modest_account_mgr_get_from_string (mgr, node->data);
+ if (from) {
+ from_email = modest_text_utils_get_email_address ((const gchar *) from);
+ if (strcmp (from_header_email, from_email) == 0) {
+ g_free (account);
+ account = g_strdup (node->data);
+ g_free (from_email);
+ g_free (from);
+ break;
+ }
+ g_free (from_email);
g_free (from);
- break;
}
- g_free (from);
}
+ g_free (from_header_email);
g_free (from_header);
g_slist_foreach (accounts, (GFunc) g_free, NULL);
g_slist_free (accounts);
modest_mail_operation_get_msg (mail_op,
header,
+ TRUE,
reply_forward_cb,
rf_helper);
/* Clean */
/* If the window was closed when renaming a folder this could
happen */
- if (MODEST_IS_FOLDER_VIEW (user_data))
+ if (!MODEST_IS_FOLDER_VIEW (user_data))
return;
folder_view = MODEST_FOLDER_VIEW (user_data);
} else {
modest_folder_view_select_first_inbox_or_local (folder_view);
}
+ gtk_widget_grab_focus (GTK_WIDGET (folder_view));
}
static void
gtk_entry_set_text (GTK_ENTRY (entry_username), initial_username);
/* Dim this if a connection has ever succeeded with this username,
* as per the UI spec: */
- const gboolean username_known =
- modest_account_mgr_get_server_account_username_has_succeeded(
- modest_runtime_get_account_mgr(), server_account_name);
- gtk_widget_set_sensitive (entry_username, !username_known);
+ /* const gboolean username_known = */
+ /* modest_account_mgr_get_server_account_username_has_succeeded( */
+ /* modest_runtime_get_account_mgr(), server_account_name); */
+ /* gtk_widget_set_sensitive (entry_username, !username_known); */
+
+ /* We drop the username sensitive code and disallow changing it here
+ * as tinymail does not support really changing the username in the callback
+ */
+ gtk_widget_set_sensitive (entry_username, FALSE);
#ifdef MODEST_PLATFORM_MAEMO
/* Auto-capitalization is the default, so let's turn it off: */
{
PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) data;
- gtk_widget_destroy (helper->banner);
- g_object_unref (helper->banner);
+ if (helper->banner) {
+ gtk_widget_destroy (helper->banner);
+ g_object_unref (helper->banner);
+ }
g_free (helper);
}
mail_op = modest_mail_operation_new (G_OBJECT (window));
if (helper->banner != NULL) {
g_object_ref (G_OBJECT (helper->banner));
- gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE);
gtk_widget_show (GTK_WIDGET (helper->banner));
}
}
/* Close the "Pasting" information banner */
- gtk_widget_destroy (GTK_WIDGET(helper->banner));
- g_object_unref (helper->banner);
+ if (helper->banner) {
+ gtk_widget_destroy (GTK_WIDGET(helper->banner));
+ g_object_unref (helper->banner);
+ }
if (helper->reference != NULL)
gtk_tree_row_reference_free (helper->reference);
g_free (helper);
modest_ui_actions_disk_operations_error_handler,
NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
- modest_mail_operation_get_msg (mail_op, header, open_msg_for_purge_cb, win);
+ modest_mail_operation_get_msg (mail_op, header, FALSE, open_msg_for_purge_cb, win);
g_object_unref (mail_op);
}
_CS("ckct_nw_pasting"));
if (helper->banner != NULL) {
g_object_ref (helper->banner);
- gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
gtk_widget_show (GTK_WIDGET(helper->banner));
}
_CS("ckct_nw_pasting"));
if (helper->banner != NULL) {
g_object_ref (helper->banner);
- gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
gtk_widget_show (GTK_WIDGET(helper->banner));
}
/* Clean folder on header view before moving it */
projects / modest / blobdiff