Move EPopupMenu to /widgets/table.

ETableHeaderItem is the last user of EPopupMenu.  Move it to
/widgets/table to discourage further use and strip out unused features.

The functionality it provides has long since been superseded by
GtkUIManager and GtkAction.

4 files changed, 167 insertions, 1 deletions

diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 2764c96c81..0ae1e2b7e9 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -29,6 +29,7 @@ libetable_la_SOURCES = 				\
 	e-cell-tree.c				\
 	e-cell-vbox.c				\
 	e-cell-hbox.c				\
+	e-popup-menu.c				\
 	e-table-click-to-add.c			\
 	e-table-col.c				\
 	e-table-column-specification.c		\
@@ -104,6 +105,7 @@ libetableinclude_HEADERS = 			\
 	e-cell-tree.h				\
 	e-cell-vbox.h				\
 	e-cell-hbox.h				\
+	e-popup-menu.h				\
 	e-table-click-to-add.h			\
 	e-table-col-dnd.h			\
 	e-table-col.h				\
diff --git a/widgets/table/e-popup-menu.c b/widgets/table/e-popup-menu.c
new file mode 100644
index 0000000000..07589b1589
--- /dev/null
+++ b/widgets/table/e-popup-menu.c
@@ -0,0 +1,109 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Jody Goldberg (jgoldberg@home.com)
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <libintl.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include "e-popup-menu.h"
+
+/*
+ * Creates an item with an optional icon
+ */
+static void
+make_item (GtkMenu *menu, GtkMenuItem *item, const gchar *name)
+{
+	GtkWidget *label;
+
+	if (*name == '\0')
+		return;
+
+	/*
+	 * Ugh.  This needs to go into Gtk+
+	 */
+	label = gtk_label_new_with_mnemonic (name);
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_widget_show (label);
+
+	gtk_container_add (GTK_CONTAINER (item), label);
+}
+
+GtkMenu *
+e_popup_menu_create_with_domain (EPopupMenu *menu_list,
+				 guint32 disable_mask,
+				 guint32 hide_mask,
+				 gpointer default_closure,
+				 const gchar *domain)
+{
+	GtkMenu *menu = GTK_MENU (gtk_menu_new ());
+	gboolean last_item_separator = TRUE;
+	gint last_non_separator = -1;
+	gint i;
+
+	for (i = 0; menu_list[i].name; i++) {
+		if (strcmp ("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) {
+			last_non_separator = i;
+		}
+	}
+
+	for (i = 0; i <= last_non_separator; i++) {
+		gboolean separator;
+
+		separator = !strcmp ("", menu_list[i].name);
+
+		if ((!(separator && last_item_separator)) && !(menu_list[i].disable_mask & hide_mask)) {
+			GtkWidget *item = NULL;
+
+			if (!separator) {
+				item = gtk_menu_item_new ();
+
+				make_item (menu, GTK_MENU_ITEM (item), dgettext (domain, menu_list[i].name));
+			} else {
+				item = gtk_menu_item_new ();
+			}
+
+			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+			if (menu_list[i].fn)
+				g_signal_connect (item, "activate",
+						  G_CALLBACK (menu_list[i].fn),
+						  default_closure);
+
+			if (menu_list[i].disable_mask & disable_mask)
+				gtk_widget_set_sensitive (item, FALSE);
+
+			gtk_widget_show (item);
+
+			last_item_separator = separator;
+		}
+	}
+
+	return menu;
+}
diff --git a/widgets/table/e-popup-menu.h b/widgets/table/e-popup-menu.h
new file mode 100644
index 0000000000..9fd3616eb2
--- /dev/null
+++ b/widgets/table/e-popup-menu.h
@@ -0,0 +1,55 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Jody Goldberg (jgoldberg@home.com)
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef E_POPUP_MENU_H
+#define E_POPUP_MENU_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define E_POPUP_SEPARATOR  { (gchar *) "", NULL, (NULL), 0 }
+#define E_POPUP_TERMINATOR { NULL, NULL, (NULL), 0 }
+
+#define E_POPUP_ITEM(name,fn,disable_mask) \
+	{ (gchar *) (name), NULL, (fn), (disable_mask) }
+
+typedef struct _EPopupMenu EPopupMenu;
+
+struct _EPopupMenu {
+	gchar *name;
+	gchar *pixname;
+	GCallback fn;
+	guint32 disable_mask;
+};
+
+GtkMenu *	e_popup_menu_create_with_domain	(EPopupMenu *menu_list,
+						 guint32 disable_mask,
+						 guint32 hide_mask,
+						 gpointer default_closure,
+						 const gchar *domain);
+
+G_END_DECLS
+
+#endif /* E_POPUP_MENU_H */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 9215e7b2fb..d8a7d0d7a0 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -36,8 +36,8 @@
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
 #include "misc/e-canvas.h"
-#include "misc/e-popup-menu.h"
 
+#include "e-popup-menu.h"
 #include "e-table.h"
 #include "e-table-col-dnd.h"
 #include "e-table-config.h"