[evolution/kill-bonobo] Kill EMenu.



commit 5d498956659bfe5016aa46190507203fee694ddd
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Aug 11 22:19:16 2009 -0400

    Kill EMenu.

 calendar/gui/Makefile.am  |    2 -
 calendar/gui/e-cal-menu.c |  293 --------------
 calendar/gui/e-cal-menu.h |  121 ------
 calendar/gui/gnome-cal.c  |   19 -
 calendar/gui/gnome-cal.h  |    3 -
 e-util/Makefile.am        |    2 -
 e-util/e-menu.c           |  925 ---------------------------------------------
 e-util/e-menu.h           |  319 ----------------
 8 files changed, 0 insertions(+), 1684 deletions(-)
---
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 0c9b252..a8993bc 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -105,8 +105,6 @@ libevolution_calendar_la_SOURCES = \
 	e-cal-config.h				\
 	e-cal-event.c				\
 	e-cal-event.h				\
-	e-cal-menu.c				\
-	e-cal-menu.h				\
 	e-cal-model-calendar.c			\
 	e-cal-model-calendar.h			\
 	e-cal-model.c				\
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 4944630..bec7a59 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -68,7 +68,6 @@
 /*#include "a11y/ea-calendar.h"  KILL-BONOBO */
 #include "common/authentication.h"
 #include "e-cal-popup.h"
-#include "e-cal-menu.h"
 
 #define d(x)
 
@@ -97,9 +96,6 @@ struct _GnomeCalendarPrivate {
 
 	ECalendar   *date_navigator;
 
-	/* plugin menu managers */
-	ECalMenu    *calendar_menu;
-
 	/* Calendar query for the date navigator */
 	GList       *dn_queries; /* list of CalQueries */
 	gchar        *sexp;
@@ -1383,8 +1379,6 @@ gnome_calendar_init (GnomeCalendar *gcal)
 
 	setup_widgets (gcal);
 
-	priv->calendar_menu = e_cal_menu_new("org.gnome.evolution.calendar.view");
-
 	priv->dn_queries = NULL;
 	priv->sexp = g_strdup ("#t"); /* Match all */
 	priv->todo_sexp = g_strdup ("#t");
@@ -1475,11 +1469,6 @@ gnome_calendar_destroy (GtkObject *object)
 			priv->update_marcus_bains_line_timeout = 0;
 		}
 
-		if (priv->calendar_menu) {
-			g_object_unref (priv->calendar_menu);
-			priv->calendar_menu = NULL;
-		}
-
 		/* Disconnect all handlers */
 		view = gnome_calendar_get_calendar_view (
 			gcal, GNOME_CAL_WEEK_VIEW);
@@ -3008,14 +2997,6 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 
 }
 
-ECalMenu *
-gnome_calendar_get_calendar_menu (GnomeCalendar *gcal)
-{
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	return gcal->priv->calendar_menu;
-}
-
 void
 gnome_calendar_edit_appointment (GnomeCalendar *gcal,
 				 const gchar * src_uid,
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 9340633..bb696d4 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -34,7 +34,6 @@
 #include <e-util/e-popup.h>
 #include <shell/e-shell-settings.h>
 
-#include "e-cal-menu.h"
 #include "e-calendar-table.h"
 
 #define GNOME_TYPE_CALENDAR            (gnome_calendar_get_type ())
@@ -143,8 +142,6 @@ void gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_ty
 struct _ECalendarView *gnome_calendar_get_calendar_view (GnomeCalendar *gcal,
 							 GnomeCalendarViewType view_type);
 
-ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal);
-
 void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
 						   time_t	  start_time);
 void	   gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 558d899..80b8d94 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -57,7 +57,6 @@ eutilinclude_HEADERS = 				\
 	e-import.h				\
 	e-logger.h				\
 	e-marshal.h				\
-	e-menu.h				\
 	e-mktemp.h				\
 	e-module.h				\
 	e-non-intrusive-error-dialog.h		\
@@ -101,7 +100,6 @@ libeutil_la_SOURCES =				\
 	e-import.c				\
 	e-logger.c				\
 	e-marshal.c				\
-	e-menu.c				\
 	e-mktemp.c				\
 	e-module.c				\
 	e-non-intrusive-error-dialog.c		\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]