From 2c4e272aea0db8d08fdafe117824f5578d9aada8 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Tue, 27 Nov 2007 11:30:46 +0000 Subject: [PATCH 1/1] 2007-11-27 [wwp] 3.1.0cvs35 * src/addressbook.c Fix a drag-and-drop issue introduced with 3.1.0cvs33 (thanks to Colin) and revert disabling of cut/copy context menu entries upon selected groups. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/addressbook.c | 25 ++++--------------------- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index b19324ba9..c7905be4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-11-27 [wwp] 3.1.0cvs35 + + * src/addressbook.c + Fix a drag-and-drop issue introduced with 3.1.0cvs33 + (thanks to Colin) and revert disabling of cut/copy + context menu entries upon selected groups. + 2007-11-27 [holger] 3.1.0cvs34 * src/printing.c diff --git a/PATCHSETS b/PATCHSETS index ff65d5a80..aa8a4f270 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3092,3 +3092,4 @@ ( cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/addrclip.c; cvs diff -u -r 1.60.2.106 -r 1.60.2.107 src/addressbook.c; cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/addritem.c; ) > 3.1.0cvs32.patchset ( cvs diff -u -r 1.155.2.80 -r 1.155.2.81 src/Makefile.am; diff -u /dev/null src/addrcustomattr.c; diff -u /dev/null src/addrcustomattr.h; cvs diff -u -r 1.60.2.107 -r 1.60.2.108 src/addressbook.c; cvs diff -u -r 1.14.2.45 -r 1.14.2.46 src/editaddress.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/editaddress.h; cvs diff -u -r 1.204.2.155 -r 1.204.2.156 src/prefs_common.c; cvs diff -u -r 1.103.2.100 -r 1.103.2.101 src/prefs_common.h; cvs diff -u -r 1.9.2.43 -r 1.9.2.44 src/common/defs.h; ) > 3.1.0cvs33.patchset ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/printing.c; ) > 3.1.0cvs34.patchset +( cvs diff -u -r 1.60.2.108 -r 1.60.2.109 src/addressbook.c; ) > 3.1.0cvs35.patchset diff --git a/configure.ac b/configure.ac index e277e59d8..ea5c7ed8c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=1 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=34 +EXTRA_VERSION=35 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/addressbook.c b/src/addressbook.c index ebf887371..924176416 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -1952,21 +1952,6 @@ static void addressbook_list_menu_setup( void ) { canBrowse = FALSE; } - /* Forbid cut/copy when selection contains a group */ - list = addrselect_get_list( _addressSelect_ ); - node = list; - while( node ) { - item = node->data; - aio = ( AddrItemObject * ) item->addressItem; - if (aio && aio->type == ADDR_ITEM_GROUP) { - canCut = FALSE; - canCopy = FALSE; - break; - } - node = g_list_next( node ); - } - g_list_free( list ); - /* Forbid write changes when read-only */ if( iface && iface->readOnly ) { canCut = FALSE; @@ -2102,13 +2087,11 @@ static void addressbook_clip_paste_cb( void ) { /* Paste/Cut */ folderGroup = addrclip_paste_cut( _clipBoard_, abf, folder ); - if (folderGroup) { - /* Remove all groups and folders in clipboard from tree node */ - addressbook_treenode_remove_item(); + /* Remove all groups and folders in clipboard from tree node */ + addressbook_treenode_remove_item(); - /* Remove all "cut" items */ - addrclip_delete_item( _clipBoard_ ); - } + /* Remove all "cut" items */ + addrclip_delete_item( _clipBoard_ ); /* Clear clipboard - cut items??? */ addrclip_clear( _clipBoard_ ); -- 2.25.1