Add KP_Enter as accepted shortcut for sending (fixes NB#100845)

[modest] / src / widgets / modest-window-mgr.c

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 5913806..212f908 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -475,15 +475,16 @@ modest_window_mgr_find_registered_header_default (ModestWindowMgr *self, TnyHead
 
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
        g_return_val_if_fail (TNY_IS_HEADER(header), FALSE);
-       
+
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
        uid = modest_tny_folder_get_header_unique_id (header);
-       
+
        if (win)
                *win = NULL;
 
        has_header = has_uid (priv->preregistered_uids, uid);
+       g_free (uid);
 
        return has_header;
 }
@@ -1090,7 +1091,7 @@ modest_window_mgr_has_progress_operation_on_account (ModestWindowMgr *self,
                if (account != NULL) {
                        const gchar *current_name;
 
-                       current_name = tny_account_get_name (account);
+                       current_name = tny_account_get_id (account);
                        if (current_name && strcmp (current_name, account_name) == 0)
                                account_ops ++;
                        g_object_unref (account);