Remove a bunch of unused functions.

2 files changed, 0 insertions, 131 deletions

diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 953d0c67dd..d47d91af99 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -144,89 +144,3 @@ e_popup_menu_create_with_domain (EPopupMenu *menu_list,
 
 	return menu;
 }
-
-void
-e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, gpointer default_closure)
-{
-	GtkMenu *menu;
-
-	g_return_if_fail (menu_list != NULL);
-	g_return_if_fail (event != NULL);
-
-	menu = e_popup_menu_create (menu_list, disable_mask, hide_mask, default_closure);
-
-	e_popup_menu (menu, event);
-}
-
-void
-e_popup_menu_copy_1 (EPopupMenu *destination,
-		     const EPopupMenu *source)
-{
-	destination->name = g_strdup (source->name);
-	destination->pixname = g_strdup (source->pixname);
-	destination->fn = source->fn;
-	destination->submenu = e_popup_menu_copy (source->submenu);
-	destination->disable_mask = source->disable_mask;
-
-	destination->pixmap_widget = source->pixmap_widget;
-	if (destination->pixmap_widget)
-		g_object_ref (destination->pixmap_widget);
-	destination->closure = source->closure;
-
-	destination->is_toggle = source->is_toggle;
-	destination->is_radio = source->is_radio;
-	destination->is_active = source->is_active;
-
-	destination->use_custom_closure = source->use_custom_closure;
-}
-
-void
-e_popup_menu_free_1 (EPopupMenu *menu_item)
-{
-	g_free (menu_item->name);
-	g_free (menu_item->pixname);
-	e_popup_menu_free (menu_item->submenu);
-
-	if (menu_item->pixmap_widget)
-		g_object_unref (menu_item->pixmap_widget);
-}
-
-EPopupMenu *
-e_popup_menu_copy (const EPopupMenu *menu_list)
-{
-	gint i;
-	EPopupMenu *ret_val;
-
-	if (menu_list == NULL)
-		return NULL;
-
-	for (i = 0; menu_list[i].name; i++) {
-		/* Intentionally empty */
-	}
-
-	ret_val = g_new (EPopupMenu, i + 1);
-
-	for (i = 0; menu_list[i].name; i++) {
-		e_popup_menu_copy_1 (ret_val + i, menu_list + i);
-	}
-
-	/* Copy the terminator */
-	e_popup_menu_copy_1 (ret_val + i, menu_list + i);
-
-	return ret_val;
-}
-
-void
-e_popup_menu_free (EPopupMenu *menu_list)
-{
-	gint i;
-
-	if (menu_list == NULL)
-		return;
-
-	for (i = 0; menu_list[i].name; i++) {
-		e_popup_menu_free_1 (menu_list + i);
-	}
-	g_free (menu_list);
-}
-
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
index 627ed611a6..2af3183933 100644
--- a/widgets/misc/e-popup-menu.h
+++ b/widgets/misc/e-popup-menu.h
@@ -32,38 +32,7 @@ G_BEGIN_DECLS
 #define E_POPUP_SEPARATOR  { (gchar *) "", NULL, (NULL), NULL, 0 }
 #define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, 0 }
 
-/* In the following, CC = custom closure */
-
 #define E_POPUP_ITEM(name,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 }
-#define E_POPUP_ITEM_CC(name,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 }
-#define E_POPUP_SUBMENU(name,submenu,disable_mask) { (gchar *) (name), NULL, NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 }
-
-#define E_POPUP_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 }
-#define E_POPUP_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 }
-#define E_POPUP_PIXMAP_SUBMENU(name,pixmap,submenu,disable_mask) { (gchar *) (name), (pixmap), NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 }
-
-#define E_POPUP_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 }
-#define E_POPUP_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 0, 0, 1 }
-#define E_POPUP_PIXMAP_WIDGET_SUBMENU(name,pixmap_widget,submenu,disable_mask) { (gchar *) (name), NULL, NULL, (submenu), (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 }
-
-#define E_POPUP_TOGGLE_ITEM(name,fn,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 }
-#define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 }
-#define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 }
-
-#define E_POPUP_TOGGLE_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 }
-#define E_POPUP_TOGGLE_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 }
-
-#define E_POPUP_TOGGLE_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 1, 0, value, 0 }
-#define E_POPUP_TOGGLE_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 1, 0, value, 1 }
-
-#define E_POPUP_RADIO_ITEM(name,fn,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 1, value, 0 }
-#define E_POPUP_RADIO_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 1, value, 1 }
-
-#define E_POPUP_RADIO_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 1, value, 0 }
-#define E_POPUP_RADIO_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 1, value, 1 }
-
-#define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 1, value, 0 }
-#define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 1, value, 1 }
 
 typedef struct _EPopupMenu EPopupMenu;
 
@@ -95,20 +64,6 @@ GtkMenu    *e_popup_menu_create_with_domain  (EPopupMenu       *menu_list,
 					      guint32           hide_mask,
 					      void             *default_closure,
 					      const gchar       *domain);
-void        e_popup_menu_run                 (EPopupMenu       *menu_list,
-					      GdkEvent         *event,
-					      guint32           disable_mask,
-					      guint32           hide_mask,
-					      void             *default_closure);
-
-/* Doesn't copy or free the memory.  Just the contents. */
-void        e_popup_menu_copy_1              (EPopupMenu       *destination,
-					      const EPopupMenu *menu_item);
-void        e_popup_menu_free_1              (EPopupMenu       *menu_item);
-
-/* Copies or frees the entire structure. */
-EPopupMenu *e_popup_menu_copy                (const EPopupMenu *menu_item);
-void        e_popup_menu_free                (EPopupMenu       *menu_item);
 
 G_END_DECLS