Fix sensitivity of "Delete book" menu entries in addressbook.

[claws.git] / src / addressbook.c

diff --git a/src/addressbook.c b/src/addressbook.c
index 60c5f02ba51c215b5a50aa709f9c6622c21243cd..59cbce457488480dc69fb9e9a3c8b0f4a887a3c7 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1109,7 +1109,7 @@ static void addressbook_create(void)
        hbox = gtk_hbox_new(FALSE, 4);
        gtk_box_pack_start(GTK_BOX(clist_vbox), hbox, FALSE, FALSE, 0);
 
-       label = gtk_label_new(_("Lookup name:"));
+       label = gtk_label_new(_("Search"));
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
        entry = gtk_entry_new();
@@ -2504,7 +2504,8 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
                        if( obj == NULL )
                                return FALSE;
 
-                       if (obj->type == ADDR_ITEM_GROUP) {
+                       if (obj->type == ADDR_ITEM_GROUP ||
+                                       obj->type == ADDR_DATASOURCE) {
                                /* edit group */
                                addressbook_treenode_edit_cb(NULL, NULL);
                        } else {
@@ -2554,11 +2555,11 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
                if( !iface )
                        goto just_set_sens;
                if( !iface->readOnly ) {
-                       canDelete = TRUE;
                        cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewFolder", TRUE );
                        cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewGroup", TRUE );
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
                }
+               canDelete = TRUE;
                canEdit = TRUE;
                canTreeCopy = TRUE;
        }
@@ -2613,7 +2614,6 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
                canTreeCut = FALSE;
                canTreePaste = FALSE;
                canCut = FALSE;
-               canDelete = FALSE;
                canPaste = FALSE;
        }
 
@@ -2626,7 +2626,7 @@ just_set_sens:
        cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/Paste",  canTreePaste );
 
        cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/EditBook",          canEdit );
-       cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/DeleteBook",        canEdit );
+       cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/DeleteBook",        canDelete );
        cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Cut",           canCut );
        cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Copy",          canCopy );
        cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Paste",         canPaste );
@@ -4854,17 +4854,17 @@ static void addrbookctl_build_icons( GtkWidget *window ) {
                g_object_unref(ldapxpm);
        if (addrsearchxpm)
                g_object_unref(addrsearchxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_INTERFACE, &interfacexpm );
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_GROUP, &groupxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_VCARD, &vcardxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_BOOK, &bookxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS, &addressxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_CATEGORY, &categoryxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_LDAP, &ldapxpm);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_INTERFACE, &interfacexpm );
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_GROUP, &groupxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_VCARD, &vcardxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_BOOK, &bookxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_ADDRESS, &addressxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_JPILOT, &jpilotxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_CATEGORY, &categoryxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_LDAP, &ldapxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm);
        
        UPDATE_ICON_ATCI(ADDR_INTERFACE,folderxpm,folderopenxpm);
        UPDATE_ICON_ATCI(ADDR_BOOK,bookxpm,bookxpm);
@@ -4908,7 +4908,7 @@ static void addrbookctl_build_map( GtkWidget *window ) {
        atci->showInTree = TRUE;
        atci->treeExpand = TRUE;
        atci->treeLeaf = FALSE;
-       atci->displayName = _( "Address Book" );
+       atci->displayName = _("Address Books");
        atci->menuCommand = "Menu/Book/NewBook";
        g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
        _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );