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.

3 files changed, 0 insertions, 221 deletions

diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 4076249f19..05a5967b7f 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -46,7 +46,6 @@ widgetsinclude_HEADERS =			\
 	e-paned.h				\
 	e-picture-gallery.h			\
 	e-popup-action.h			\
-	e-popup-menu.h				\
 	e-port-entry.h				\
 	e-preferences-window.h			\
 	e-preview-pane.h			\
@@ -126,7 +125,6 @@ libemiscwidgets_la_SOURCES =			\
 	e-paned.c				\
 	e-picture-gallery.c			\
 	e-popup-action.c			\
-	e-popup-menu.c				\
 	e-port-entry.c				\
 	e-preferences-window.c			\
 	e-preview-pane.c			\
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
deleted file mode 100644
index d166ac01b4..0000000000
--- a/widgets/misc/e-popup-menu.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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 *pixmap)
-{
-	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);
-
-	if (pixmap && GTK_IS_IMAGE_MENU_ITEM (item)) {
-		gtk_widget_show (pixmap);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), pixmap);
-	}
-}
-
-GtkMenu *
-e_popup_menu_create (EPopupMenu *menu_list,
-		     guint32 disable_mask,
-		     guint32 hide_mask,
-		     gpointer default_closure)
-{
-	return e_popup_menu_create_with_domain (menu_list,
-						disable_mask,
-						hide_mask,
-						default_closure,
-						NULL);
-}
-
-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 ());
-	GSList *group = NULL;
-	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) {
-				if (menu_list[i].is_toggle)
-					item = gtk_check_menu_item_new ();
-				else if (menu_list[i].is_radio)
-					item = gtk_radio_menu_item_new (group);
-				else
-					item = menu_list[i].pixmap_widget ? gtk_image_menu_item_new () : gtk_menu_item_new ();
-				if (menu_list[i].is_toggle || menu_list[i].is_radio)
-					gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), menu_list[i].is_active);
-				if (menu_list[i].is_radio)
-					group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
-
-				make_item (menu, GTK_MENU_ITEM (item), dgettext (domain, menu_list[i].name), menu_list[i].pixmap_widget);
-			} else {
-				item = gtk_menu_item_new ();
-			}
-
-			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-			if (!menu_list[i].submenu) {
-				if (menu_list[i].fn)
-					g_signal_connect (item, "activate",
-							  G_CALLBACK (menu_list[i].fn),
-							  menu_list[i].use_custom_closure ? menu_list[i].closure : default_closure);
-			} else {
-				/* submenu */
-				GtkMenu *submenu;
-
-				submenu = e_popup_menu_create (menu_list[i].submenu, disable_mask, hide_mask,
-							       default_closure);
-
-				gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), GTK_WIDGET (submenu));
-			}
-
-			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/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
deleted file mode 100644
index 24a8fa6022..0000000000
--- a/widgets/misc/e-popup-menu.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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), NULL, 0 }
-#define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, 0 }
-
-#define E_POPUP_ITEM(name,fn,disable_mask) \
-	{ (gchar *) (name), NULL, (fn), NULL, \
-	  (disable_mask), NULL, NULL, 0, 0, 0, 0 }
-
-typedef struct _EPopupMenu EPopupMenu;
-
-struct _EPopupMenu {
-	gchar *name;
-	gchar *pixname;
-	GCallback fn;
-
-	EPopupMenu *submenu;
-	guint32 disable_mask;
-
-	/* Added post 0.19 */
-	GtkWidget *pixmap_widget;
-	gpointer closure;
-
-	guint is_toggle : 1;
-	guint is_radio : 1;
-	guint is_active : 1;
-
-	guint use_custom_closure : 1;
-};
-
-GtkMenu *	e_popup_menu_create		(EPopupMenu *menu_list,
-						 guint32 disable_mask,
-						 guint32 hide_mask,
-						 gpointer default_closure);
-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 */