aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-05-14 11:30:18 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-05-14 11:30:18 +0800
commit5046efdb05725e43742ea23fdd3f16a61bbd08ff (patch)
treecd82350fd4dbf3532efe16cc764d6321d05ee48c
parent6d8bd4aadd88a15550a2f288054f84569fdb4e3f (diff)
downloadgsoc2013-evolution-5046efdb05725e43742ea23fdd3f16a61bbd08ff.tar
gsoc2013-evolution-5046efdb05725e43742ea23fdd3f16a61bbd08ff.tar.gz
gsoc2013-evolution-5046efdb05725e43742ea23fdd3f16a61bbd08ff.tar.bz2
gsoc2013-evolution-5046efdb05725e43742ea23fdd3f16a61bbd08ff.tar.lz
gsoc2013-evolution-5046efdb05725e43742ea23fdd3f16a61bbd08ff.tar.xz
gsoc2013-evolution-5046efdb05725e43742ea23fdd3f16a61bbd08ff.tar.zst
gsoc2013-evolution-5046efdb05725e43742ea23fdd3f16a61bbd08ff.zip
Fix for bug #417797 and #424055
svn path=/trunk/; revision=33525
-rw-r--r--addressbook/ChangeLog13
-rw-r--r--addressbook/gui/component/addressbook-view.c10
-rw-r--r--addressbook/gui/contact-list-editor/contact-list-editor.glade2
3 files changed, 21 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 28ce9431c6..c6eaca88f4 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,18 @@
2007-05-14 Srinivasa Ragavan <sragavan@novell.com>
+ ** Fix for bug #424055 from Øystein Gisnås
+
+ * gui/contact-list-editor/contact-list-editor.glade:
+
+2007-05-14 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #417797 from Øystein Gisnås
+
+ * gui/component/addressbook-view.c: (selector_tree_drag_motion),
+ (selector_tree_drag_data_received):
+
+2007-05-14 Srinivasa Ragavan <sragavan@novell.com>
+
** Fix for bug #404239 from Øystein Gisnås
* /addressbook/gui/widgets/e-minicard.c:
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 53a5453e1c..9a399a066f 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -1065,7 +1065,11 @@ selector_tree_drag_motion (GtkWidget *widget,
goto finish;
gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
- action = context->suggested_action;
+ /* Make default action move, not copy */
+ if (context->actions & GDK_ACTION_MOVE)
+ action = GDK_ACTION_MOVE;
+ else
+ action = context->suggested_action;
finish:
if (path)
@@ -1209,7 +1213,7 @@ selector_tree_drag_data_received (GtkWidget *widget,
merge_context->current_contact = contactlist->data;
merge_context->remaining_contacts = g_list_delete_link (contactlist, contactlist);
- merge_context->remove_from_source = context->suggested_action == GDK_ACTION_MOVE ? FALSE : TRUE;
+ merge_context->remove_from_source = context->action == GDK_ACTION_MOVE ? TRUE : FALSE;
/* Start merge */
@@ -1222,7 +1226,7 @@ selector_tree_drag_data_received (GtkWidget *widget,
if (target)
g_object_unref (target);
- gtk_drag_finish (context, success, context->action == GDK_ACTION_MOVE, time);
+ gtk_drag_finish (context, success, merge_context->remove_from_source, time);
return TRUE;
}
diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
index 241e32f10e..f97e7df944 100644
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ b/addressbook/gui/contact-list-editor/contact-list-editor.glade
@@ -258,7 +258,7 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>