Kill e_popup_menu().

The function is trivial and was only used from ETableHeaderItem.
This also eliminates widgets/misc/e-gui-utils.[ch].

17 files changed, 9 insertions, 109 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 71de495f13..1906f665a2 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -25,7 +25,6 @@
 #include <glib/gi18n.h>
 #include "e-addressbook-model.h"
 #include <e-util/e-util.h>
-#include <misc/e-gui-utils.h>
 #include "eab-gui-util.h"
 
 #define E_ADDRESSBOOK_MODEL_GET_PRIVATE(obj) \
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 500b045077..5928f51a74 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -26,7 +26,6 @@
 
 #include "e-minicard.h"
 #include <e-util/e-util.h>
-#include <misc/e-gui-utils.h>
 #include "addressbook/printing/e-contact-print.h"
 
 struct _EAddressbookReflowAdapterPrivate {
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 43df184598..37d1376340 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -27,7 +27,6 @@
 #include <table/e-table.h>
 #include <table/e-table-model.h>
 #include <table/e-cell-date.h>
-#include <misc/e-gui-utils.h>
 #include <misc/e-selectable.h>
 #include <widgets/menus/gal-view-factory-etable.h>
 #include <filter/e-rule-editor.h>
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 64a3ca2ac4..1097749ffd 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -34,7 +34,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
-#include <misc/e-gui-utils.h>
 #include <e-util/e-binding.h>
 #include <table/e-table-memory-store.h>
 #include <table/e-cell-checkbox.h>
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 0e7fdfb304..94f2327185 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <misc/e-gui-utils.h>
 #include "e-day-view-time-item.h"
 #include "calendar-config.h"
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 46a37ddc46..3df4e6943e 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -34,7 +34,6 @@
 #include <text/e-text.h>
 #include <misc/e-canvas-utils.h>
 #include <misc/e-popup-menu.h>
-#include <misc/e-gui-utils.h>
 #include <e-util/e-unicode.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <glib/gi18n.h>
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 94174efc3b..ee67baa9ae 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -35,7 +35,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <e-util/e-binding.h>
-#include <misc/e-gui-utils.h>
 #include <misc/e-selectable.h>
 #include <table/e-cell-checkbox.h>
 #include <table/e-cell-toggle.h>
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 77e50c6ae6..009d47daec 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -35,7 +35,6 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <misc/e-gui-utils.h>
 #include <misc/e-selectable.h>
 #include <table/e-cell-checkbox.h>
 #include <table/e-cell-toggle.h>
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 584410b4ce..222bdba465 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -38,7 +38,6 @@
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <text/e-text.h>
 #include <misc/e-canvas-utils.h>
-#include <misc/e-gui-utils.h>
 #include <e-util/e-binding.h>
 #include <e-util/e-unicode.h>
 #include <e-util/e-categories-config.h>
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 693c0969f1..1a9123a34a 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
-#include <misc/e-gui-utils.h>
 
 #include <camel/camel-url.h>
 #include <camel/camel-store.h>
diff --git a/mail/message-list.c b/mail/message-list.c
index 6a674bec82..014e60c7a8 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -51,7 +51,6 @@
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
 
-#include "misc/e-gui-utils.h"
 #include "misc/e-selectable.h"
 
 #include "shell/e-shell.h"
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index ba7e2296c9..96192eaa77 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -39,8 +39,6 @@
 
 #include <camel/camel-iconv.h>
 
-#include <misc/e-gui-utils.h>
-
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 26fb25f657..0ab566c19d 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -47,7 +47,6 @@ widgetsinclude_HEADERS =			\
 	e-combo-cell-editable.h			\
 	e-dateedit.h				\
 	e-focus-tracker.h			\
-	e-gui-utils.h				\
 	e-hinted-entry.h			\
 	e-hsv-utils.h				\
 	e-image-chooser.h			\
@@ -124,7 +123,6 @@ libemiscwidgets_la_SOURCES =			\
 	e-combo-cell-editable.c			\
 	e-dateedit.c				\
 	e-focus-tracker.c			\
-	e-gui-utils.c				\
 	e-hinted-entry.c			\
 	e-hsv-utils.c				\
 	e-image-chooser.c			\
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
deleted file mode 100644
index 0974081f78..0000000000
--- a/widgets/misc/e-gui-utils.c
+++ /dev/null
@@ -1,55 +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>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtk.h>
-#include <libgnomecanvas/gnome-canvas-pixbuf.h>
-
-#include "e-gui-utils.h"
-
-void
-e_popup_menu (GtkMenu *menu, GdkEvent *event)
-{
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	g_signal_connect (
-		menu, "selection-done",
-		G_CALLBACK (gtk_widget_destroy), NULL);
-
-	if (event) {
-		if (event->type == GDK_KEY_PRESS)
-			gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0,
-					event->key.time);
-		else if ((event->type == GDK_BUTTON_PRESS) ||
-			 (event->type == GDK_BUTTON_RELEASE) ||
-			 (event->type == GDK_2BUTTON_PRESS) ||
-			 (event->type == GDK_3BUTTON_PRESS)) {
-			gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
-					event->button.button,
-					event->button.time);
-		}
-	} else
-		gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0,
-				GDK_CURRENT_TIME);
-}
diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h
deleted file mode 100644
index ff05d57725..0000000000
--- a/widgets/misc/e-gui-utils.h
+++ /dev/null
@@ -1,35 +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>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef E_GUI_UTILS_H
-#define E_GUI_UTILS_H
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-void  e_popup_menu                              (GtkMenu  *menu,
-						 GdkEvent *event);
-
-G_END_DECLS
-
-#endif /* E_GUI_UTILS_H */
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index d47d91af99..422fd47e60 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -30,7 +30,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "e-gui-utils.h"
 #include "e-popup-menu.h"
 
 /*
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 2b601c44b6..ed468b3c58 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -38,7 +38,6 @@
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
 #include "misc/e-canvas.h"
-#include "misc/e-gui-utils.h"
 #include "misc/e-popup-menu.h"
 
 #include "e-table.h"
@@ -1596,7 +1595,11 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 	g_object_ref_sink (popup);
 	g_signal_connect (popup, "selection-done",
 			  G_CALLBACK (free_popup_info), info);
-	e_popup_menu (popup, (GdkEvent *) event);
+
+	gtk_menu_popup (
+		GTK_MENU (popup),
+		NULL, NULL, NULL, NULL,
+		event->button, event->time);
 }
 
 static void
@@ -1828,7 +1831,10 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			g_object_ref_sink (popup);
 			g_signal_connect (popup, "selection-done",
 					  G_CALLBACK (free_popup_info), info);
-			e_popup_menu (popup, NULL);
+			gtk_menu_popup (
+				GTK_MENU (popup),
+				NULL, NULL, NULL, NULL,
+				0, GDK_CURRENT_TIME);
 		} else if (e->key.keyval == GDK_space) {
 			ETableCol *ecol;