aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-10-13 17:57:17 +0800
committerMilan Crha <mcrha@redhat.com>2011-10-13 17:57:17 +0800
commitee5ca188d56abc91ca9fce034322466d5b0f4b9f (patch)
tree442dc7ace010391487e898e46858d2f1c7837892
parent2a384708440fb3adc32beaf0ae640208efe95476 (diff)
downloadgsoc2013-evolution-ee5ca188d56abc91ca9fce034322466d5b0f4b9f.tar
gsoc2013-evolution-ee5ca188d56abc91ca9fce034322466d5b0f4b9f.tar.gz
gsoc2013-evolution-ee5ca188d56abc91ca9fce034322466d5b0f4b9f.tar.bz2
gsoc2013-evolution-ee5ca188d56abc91ca9fce034322466d5b0f4b9f.tar.lz
gsoc2013-evolution-ee5ca188d56abc91ca9fce034322466d5b0f4b9f.tar.xz
gsoc2013-evolution-ee5ca188d56abc91ca9fce034322466d5b0f4b9f.tar.zst
gsoc2013-evolution-ee5ca188d56abc91ca9fce034322466d5b0f4b9f.zip
Bug #455271 - A moved/renamed mail folder loses focus
-rw-r--r--mail/em-folder-tree.c38
1 files changed, 37 insertions, 1 deletions
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 1d831cc4e4..973051324f 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -612,6 +612,7 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
gchar *old_name = NULL;
gchar *old_full_name = NULL;
gchar *new_full_name = NULL;
+ gchar *folder_uri;
gchar **strv;
gpointer parent;
guint index;
@@ -681,7 +682,11 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
goto exit;
}
-exit:
+ folder_uri = e_mail_folder_uri_build (store, new_full_name);
+ em_folder_tree_set_selected (folder_tree, folder_uri, FALSE);
+ g_free (folder_uri);
+
+ exit:
g_free (old_name);
g_free (old_full_name);
@@ -2004,9 +2009,11 @@ struct _DragDataReceivedAsync {
/* Only selection->data and selection->length are valid */
GtkSelectionData *selection;
+ EMFolderTree *folder_tree;
EMailSession *session;
CamelStore *store;
gchar *full_name;
+ gchar *dest_folder_uri;
guint32 action;
guint info;
@@ -2021,6 +2028,7 @@ folder_tree_drop_folder (struct _DragDataReceivedAsync *m)
CamelFolder *folder;
CamelStore *parent_store;
GCancellable *cancellable;
+ const gchar *folder_name;
const gchar *full_name;
const guchar *data;
@@ -2043,6 +2051,22 @@ folder_tree_drop_folder (struct _DragDataReceivedAsync *m)
parent_store, full_name, m->store,
m->full_name ? m->full_name : "", m->move);
+ folder_name = strrchr (full_name, '/');
+ if (folder_name)
+ folder_name++;
+ else
+ folder_name = full_name;
+
+ if (m->full_name) {
+ gchar *dest_root_name;
+
+ dest_root_name = g_strconcat (m->full_name, "/", folder_name, NULL);
+ m->dest_folder_uri = e_mail_folder_uri_build (m->store, dest_root_name);
+ g_free (dest_root_name);
+ } else {
+ m->dest_folder_uri = e_mail_folder_uri_build (m->store, folder_name);
+ }
+
g_object_unref (folder);
}
@@ -2127,10 +2151,20 @@ folder_tree_drop_async__exec (struct _DragDataReceivedAsync *m,
static void
folder_tree_drop_async__free (struct _DragDataReceivedAsync *m)
{
+ if (m->move && m->dest_folder_uri) {
+ GList *selected_list;
+
+ selected_list = g_list_append (NULL, m->dest_folder_uri);
+ em_folder_tree_set_selected_list (m->folder_tree, selected_list, FALSE);
+ g_list_free (selected_list);
+ }
+
+ g_object_unref (m->folder_tree);
g_object_unref (m->session);
g_object_unref (m->context);
g_object_unref (m->store);
g_free (m->full_name);
+ g_free (m->dest_folder_uri);
gtk_selection_data_free (m->selection);
}
@@ -2213,10 +2247,12 @@ tree_drag_data_received (GtkWidget *widget,
}
m = mail_msg_new (&folder_tree_drop_async_info);
+ m->folder_tree = g_object_ref (folder_tree);
m->session = g_object_ref (session);
m->context = g_object_ref (context);
m->store = g_object_ref (store);
m->full_name = full_name;
+ m->dest_folder_uri = NULL;
m->action = gdk_drag_context_get_selected_action (context);
m->info = info;