2008-10-08 [colin] 3.6.0cvs16

[claws.git] / src / addressbook.c

diff --git a/src/addressbook.c b/src/addressbook.c
index d7771e8f4346b6c6fe910a6cf7b478be9b2eb91c..8a60266cb4ee409950b201f89bef1ff86ffb91c0 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -408,7 +408,7 @@ static GtkActionEntry addressbook_entries[] =
 {
        {"Menu",                                NULL, "Menu" },
 /* menus */
-       {"Book",                        NULL, N_("_Message") },
+       {"Book",                        NULL, N_("_Book") },
        {"Address",                     NULL, N_("_Edit") },
        {"Tools",                       NULL, N_("_Tools") },
        {"Help",                        NULL, N_("_Help") },
@@ -951,7 +951,7 @@ static void addressbook_create(void)
 #ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-       MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 
        MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Book", "Book", GTK_UI_MANAGER_MENU)
@@ -3383,8 +3383,12 @@ static void addressbook_edit_address_post_cb( ItemPerson *person )
 {
        if( person ) {
 #ifdef USE_LDAP
-               if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
-                       addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
+               AddressBookFile *abf = addressbook_get_book_file();
+
+               if (abf && abf->type == ADDR_IF_LDAP) {
+                       if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
+                               addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
+               }
 #endif
                addressbook_folder_refresh_one_person( GTK_CMCTREE(addrbook.clist), person );
                invalidate_address_completion();