GNOME.org
 

[evolution] Kill e_popup_menu().

commit 1501b8588c33f96310cf30b39b8a75f5a55afab0
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jan 4 16:43:53 2010 -0500

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

 addressbook/gui/widgets/e-addressbook-model.c      |    1 -
 .../gui/widgets/e-addressbook-reflow-adapter.c     |    1 -
 addressbook/gui/widgets/e-addressbook-view.c       |    1 -
 calendar/gui/e-cal-list-view.c                     |    1 -
 calendar/gui/e-day-view-time-item.c                |    1 -
 calendar/gui/e-day-view.c                          |    1 -
 calendar/gui/e-memo-table.c                        |    1 -
 calendar/gui/e-task-table.c                        |    1 -
 calendar/gui/e-week-view.c                         |    1 -
 mail/em-folder-selector.c                          |    1 -
 mail/message-list.c                                |    1 -
 modules/mail/em-composer-prefs.c                   |    2 -
 widgets/misc/Makefile.am                           |    2 -
 widgets/misc/e-gui-utils.c                         |   55 --------------------
 widgets/misc/e-gui-utils.h                         |   35 ------------
 widgets/misc/e-popup-menu.c                        |    1 -
 widgets/table/e-table-header-item.c                |   12 +++-
 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 71de495..1906f66 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 500b045..5928f51 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 43df184..37d1376 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 64a3ca2..1097749 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 0e7fdfb..94f2327 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 46a37dd..3df4e69 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 94174ef..ee67baa 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 77e50c6..009d47d 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 584410b..222bdba 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 693c096..1a9123a 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 6a674be..014e60c 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 ba7e229..96192ea 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 26fb25f..0ab566c 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-popup-menu.c b/widgets/misc/e-popup-menu.c
index d47d91a..422fd47 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 2b601c4..ed468b3 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;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]