callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug #417797 and #424055

Browse Source 
svn path=/trunk/; revision=33525
This commit is contained in:
Srinivasa Ragavan
2007-05-14 03:30:18 +00:00
parent 6d8bd4aadd
commit 5046efdb05
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addressbook/ChangeLog
+13
View File
@@ -1,3 +1,16 @@
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/component/addressbook-view.c
+7 -3
View File
@@ -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;
}
addressbook/gui/contact-list-editor/contact-list-editor.glade
+1 -1
View File
@@ -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>