* Added some missing signal disconnections

[modest] / src / dbus_api / modest-dbus-callbacks.c

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index c0cfc11..619a706 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -378,7 +378,7 @@ on_idle_compose_mail(gpointer user_data)
 
                                        list = g_strsplit(idle_data->attachments, ",", 0);
                                        for (i=0; list[i] != NULL; i++) {
-                                               modest_msg_edit_window_attach_file_noninteractive(
+                                               modest_msg_edit_window_attach_file_one(
                                                                (ModestMsgEditWindow *)win, list[i]);
                                        }
                                        g_strfreev(list);
@@ -545,9 +545,11 @@ on_idle_open_message (gpointer user_data)
        folder = tny_msg_get_folder (msg);
        
        /* Drafts will be opened in the editor, instead of the viewer, as per the UI spec: */
+       /* FIXME: same should happen for Outbox; not enabling that, as the handling
+        * of edited messages is not clear in that case */
        gboolean is_draft = FALSE;
        if (folder && modest_tny_folder_is_local_folder (folder) &&
-               (modest_tny_folder_get_local_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
+               (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
                is_draft = TRUE;
        }
 
@@ -805,6 +807,11 @@ on_idle_send_receive(gpointer user_data)
        /* Pick the main window if it exists */
        win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
 
+       /* This seems to be necessary to show new messages in the current window.
+        * I would expect this to be after the send_receive, but maybe 
+        * this makes a connection too. murrayc. */
+       modest_do_refresh_current_folder (win);
+
        /* Send & receive all if "Update automatically" is set */
        /* TODO: check the auto-update parameter in the configuration */
        modest_ui_actions_do_send_receive_all (win);
@@ -816,6 +823,7 @@ on_idle_send_receive(gpointer user_data)
 
 static gint on_send_receive(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {      
+       printf("DEBUG: modest: %s\n", __FUNCTION__);
     /* Use g_idle to context-switch into the application's thread: */
 
     /* This method has no arguments. */
@@ -1349,8 +1357,7 @@ on_dbus_method_get_folders (DBusConnection *con, DBusMessage *message)
         * TODO: This is not working. It seems to get only the Merged Folder (with an ID of "" (not NULL)).
         */
        TnyAccount *account_local = 
-               modest_tny_account_store_get_local_folders_account (
-                       TNY_ACCOUNT_STORE (modest_runtime_get_account_store()));
+               modest_tny_account_store_get_local_folders_account (modest_runtime_get_account_store());
        add_folders_to_list (TNY_FOLDER_STORE (account_local), &folder_names);
 
        g_object_unref (account_local);
@@ -1388,7 +1395,6 @@ modest_dbus_req_filter (DBusConnection *con,
                        DBusMessage    *message,
                        void           *user_data)
 {
-       printf ("DEBUG: %s\n", __FUNCTION__);
        gboolean handled = FALSE;
 
        if (dbus_message_is_method_call (message,
@@ -1405,7 +1411,10 @@ modest_dbus_req_filter (DBusConnection *con,
                handled = TRUE;                         
        }
        else {
-               g_debug ("  debug: %s: Unexpected D-Bus method\n", __FUNCTION__);
+               /* Note that this mentions methods that were already handled in modest_dbus_req_handler(). */
+               g_debug ("  debug: %s: Unexpected (maybe already handled) D-Bus method:\n   Interface=%s, Member=%s\n", 
+                       __FUNCTION__, dbus_message_get_interface (message),
+                       dbus_message_get_member(message));
        }
        
        return (handled ?