diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
| commit | faf1c14c11f3e6026f786e9587715c10b13c723e (patch) | |
| tree | 3dbf5816532cbea2510b4438c7c40d91fc426d3a /calendar/gui/e-cal-list-view.c | |
| parent | 86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff) | |
| download | gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip | |
Manual conflict resolution
Diffstat (limited to 'calendar/gui/e-cal-list-view.c')
| -rw-r--r-- | calendar/gui/e-cal-list-view.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index ea583a6edb..cfb77f8066 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -358,9 +358,9 @@ e_cal_list_view_destroy (GtkObject *object) static void e_cal_list_view_show_popup_menu (ECalListView *cal_list_view, gint row, GdkEvent *gdk_event) { +#if 0 /* KILL-BONOBO */ GtkMenu *menu; -#if 0 /* KILL-BONOBO */ menu = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (cal_list_view)); gtk_menu_popup(menu, NULL, NULL, NULL, NULL, gdk_event?gdk_event->button.button:0, gdk_event?gdk_event->button.time:gtk_get_current_event_time()); #endif |