Update to use new EPopupMenu API.

2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>

	* gui/widgets/e-addressbook-view.c (table_right_click): Update to
	use new EPopupMenu API.

	* gui/widgets/e-addressbook-reflow-adapter.c
	(e_addressbook_reflow_adapter_right_click): Update to use new
	EPopupMenu API.

	* gui/component/select-names/e-select-names.c
	(section_right_click_cb): Update to match new EPopupMenu api.

svn path=/trunk/; revision=16183

3 files changed, 32 insertions, 31 deletions

diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index e0cc438209..1746171838 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -849,9 +849,8 @@ static void
 section_right_click_cb (EText *text, GdkEventButton *ev, gint pos, ESelectNamesChild *child)
 {
 	EPopupMenu right_click_menu[] = {
-		{ N_("Remove"), NULL,
-		  GTK_SIGNAL_FUNC (remove_cb), NULL, 0 },
-		{ NULL, NULL, NULL, 0 }
+		{ N_("Remove"), NULL, GTK_SIGNAL_FUNC (remove_cb), NULL, NULL, 0 },
+		E_POPUP_TERMINATOR
 	};
 	gint index;
 
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index ab99206eac..f38a42cc21 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -309,25 +309,27 @@ e_addressbook_reflow_adapter_right_click (EAddressbookReflowAdapter *adapter, Gd
 {
 	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
 	ModelAndSelection *mns = g_new(ModelAndSelection, 1);
-	EPopupMenu menu[] = { {N_("Open"), NULL, GTK_SIGNAL_FUNC(open_card), NULL, 0},
-			      {N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0},
-			      {N_("Forward Contact"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
-			      {N_("Send Message to Contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
-			      {N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
+	EPopupMenu menu[] = {
+		{ N_("Open"), NULL, GTK_SIGNAL_FUNC(open_card), NULL, NULL, 0 },
+		{ N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, NULL, 0 },
+		{ N_("Forward Contact"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, NULL, 0 },
+		{ N_("Send Message to Contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, NULL, 0 },
+		{ N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, NULL, 0 },
 #if 0 /* Envelope printing is disabled for Evolution 1.0. */
-			      {N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
+		{ N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, NULL, 0 },
 #endif
-			      E_POPUP_SEPARATOR,
-
-			      {N_("Copy to folder..."), NULL, GTK_SIGNAL_FUNC(copy_to_folder), NULL, 0}, 
-			      {N_("Move to folder..."), NULL, GTK_SIGNAL_FUNC(move_to_folder), NULL, POPUP_READONLY_MASK},
-			      E_POPUP_SEPARATOR,
-
-			      {N_("Cut"), NULL, GTK_SIGNAL_FUNC (cut), NULL, POPUP_READONLY_MASK},
-			      {N_("Copy"), NULL, GTK_SIGNAL_FUNC (copy), NULL, 0},
-			      {N_("Paste"), NULL, GTK_SIGNAL_FUNC (paste), NULL, POPUP_READONLY_MASK},
-			      {N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, POPUP_READONLY_MASK},
-			      E_POPUP_TERMINATOR};
+		E_POPUP_SEPARATOR,
+		
+		{ N_("Copy to folder..."), NULL, GTK_SIGNAL_FUNC(copy_to_folder), NULL, NULL, 0 }, 
+		{ N_("Move to folder..."), NULL, GTK_SIGNAL_FUNC(move_to_folder), NULL, NULL, POPUP_READONLY_MASK },
+		E_POPUP_SEPARATOR,
+		
+		{ N_("Cut"), NULL, GTK_SIGNAL_FUNC (cut), NULL, NULL, POPUP_READONLY_MASK },
+		{ N_("Copy"), NULL, GTK_SIGNAL_FUNC (copy), NULL, NULL, 0 },
+		{ N_("Paste"), NULL, GTK_SIGNAL_FUNC (paste), NULL, NULL, POPUP_READONLY_MASK },
+		{ N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, NULL, POPUP_READONLY_MASK},
+		E_POPUP_TERMINATOR
+	};
 
 	mns->adapter = adapter;
 	mns->selection = selection;
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 6a78cf13eb..2055f9c4cf 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1013,23 +1013,23 @@ table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EA
 		CardAndBook *card_and_book;
 
 		EPopupMenu menu[] = {
-			{N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, 
-			{N_("Forward Contact"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
-			{N_("Send Message to Contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
-			{N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
+			{ N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, NULL, 0 }, 
+			{ N_("Forward Contact"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, NULL, 0 },
+			{ N_("Send Message to Contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, NULL, 0 },
+			{ N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, NULL, 0 },
 #if 0 /* Envelope printing is disabled for Evolution 1.0. */
-			{N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
+			{ N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, NULL, 0 },
 #endif
 			E_POPUP_SEPARATOR,
 
-			{N_("Copy to folder..."), NULL, GTK_SIGNAL_FUNC(copy_to_folder), NULL, 0}, 
-			{N_("Move to folder..."), NULL, GTK_SIGNAL_FUNC(move_to_folder), NULL, POPUP_READONLY_MASK},
+			{ N_("Copy to folder..."), NULL, GTK_SIGNAL_FUNC(copy_to_folder), NULL, NULL, 0 }, 
+			{ N_("Move to folder..."), NULL, GTK_SIGNAL_FUNC(move_to_folder), NULL, NULL, POPUP_READONLY_MASK },
 			E_POPUP_SEPARATOR,
 
-			{N_("Cut"), NULL, GTK_SIGNAL_FUNC (cut), NULL, POPUP_READONLY_MASK},
-			{N_("Copy"), NULL, GTK_SIGNAL_FUNC (copy), NULL, 0},
-			{N_("Paste"), NULL, GTK_SIGNAL_FUNC (paste), NULL, POPUP_READONLY_MASK},
-			{N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, POPUP_READONLY_MASK},
+			{ N_("Cut"), NULL, GTK_SIGNAL_FUNC (cut), NULL, NULL, POPUP_READONLY_MASK },
+			{ N_("Copy"), NULL, GTK_SIGNAL_FUNC (copy), NULL, NULL, 0 },
+			{ N_("Paste"), NULL, GTK_SIGNAL_FUNC (paste), NULL, NULL, POPUP_READONLY_MASK },
+			{ N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, NULL, POPUP_READONLY_MASK },
 			E_POPUP_TERMINATOR
 		};