Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1758
diff -u -r1.1758 ChangeLog
--- ChangeLog	17 Jun 2004 05:01:08 -0000	1.1758
+++ ChangeLog	17 Jun 2004 06:46:09 -0000
@@ -1,3 +1,9 @@
+2004-06-17  Sushma Rai <rsushma@novell.com>
+
+	* gui/widgets/e-addressbook-view.c (do_popup_menu): Not showing
+	up "New Contact List..." option in the pop up menu, if 
+	"no-contactlist-option" static capability is set. Fixes #57130
+ 
 2004-06-17  Sivaiah Nallagatla <snallagatla@novell.com>
 
         * gui/widgets/e-addressbook-view.etspec : update
Index: gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.144
diff -u -r1.144 e-addressbook-view.c
--- gui/widgets/e-addressbook-view.c	4 Jun 2004 03:28:28 -0000	1.144
+++ gui/widgets/e-addressbook-view.c	17 Jun 2004 06:47:03 -0000
@@ -1072,6 +1072,7 @@
 #define POPUP_READONLY_MASK 0x1
 #define POPUP_NOSELECTION_MASK 0x2
 #define POPUP_NOEMAIL_MASK 0x4
+#define POPUP_NO_CONTACTLIST_MASK 0x8
 
 static void
 do_popup_menu(EABView *view, GdkEvent *event)
@@ -1081,10 +1082,11 @@
 	EPopupMenu *submenu = NULL;
 	ESelectionModel *selection_model;
 	gboolean selection = FALSE;
+	gboolean no_contactlist_option = FALSE;
 
 	EPopupMenu menu[] = {
 		E_POPUP_ITEM (N_("New Contact..."), G_CALLBACK(new_card), POPUP_READONLY_MASK),
-		E_POPUP_ITEM (N_("New Contact List..."), G_CALLBACK(new_list), POPUP_READONLY_MASK),
+		E_POPUP_ITEM (N_("New Contact List..."), G_CALLBACK(new_list), POPUP_READONLY_MASK | POPUP_NO_CONTACTLIST_MASK),
 		E_POPUP_SEPARATOR,
 #if 0
 		E_POPUP_ITEM (N_("Go to Folder..."), G_CALLBACK (goto_folder), 0),
@@ -1131,11 +1133,14 @@
 	if (selection_model)
 		selection = e_selection_model_selected_count (selection_model) > 0;
 
+	no_contactlist_option = e_book_check_static_capability (contact_and_book->view->book,
+							"no-contactlist-option");	
 	popup = e_popup_menu_create (menu,
 				     0,
 				     (eab_model_editable (view->model) ? 0 : POPUP_READONLY_MASK) +
 				     (selection ? 0 : POPUP_NOSELECTION_MASK) +
-				     (get_has_email_address (contact_and_book) ? 0 : POPUP_NOEMAIL_MASK),
+				     (get_has_email_address (contact_and_book) ? 0 : POPUP_NOEMAIL_MASK) +
+				     (no_contactlist_option ? POPUP_NO_CONTACTLIST_MASK : 0),
 				     contact_and_book);
 
 	g_signal_connect (popup, "selection-done",
