---
 src/dates_gtk.c      |    5 -----
 src/dates_main.c     |    5 +++++
 src/dates_platform.h |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

Upstream-Status: Inappropriate [enable feature]

Index: git/src/dates_gtk.c
===================================================================
--- git.orig/src/dates_gtk.c	2009-08-18 12:44:56.000000000 +0100
+++ git/src/dates_gtk.c	2009-09-03 22:28:50.000000000 +0100
@@ -33,10 +33,6 @@
 #endif
 
 #ifndef DATES_PLATFORM_create_main_window
-/* the default implementation assumes that menu is GtkMenuBar */
-#ifdef DATES_MENU_WITHOUT_BAR
-#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!!
-#endif
 static GtkWidget *
 create_main_window (DatesData * d, GtkWidget * toolbar,
 					GtkWidget * menu, GtkAccelGroup * accel_group)
@@ -59,7 +55,6 @@
 	gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
 
 	gtk_widget_show (menu);
-	gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0);
 
 	gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
Index: git/src/dates_main.c
===================================================================
--- git.orig/src/dates_main.c	2009-08-18 12:44:56.000000000 +0100
+++ git/src/dates_main.c	2009-09-03 22:29:21.000000000 +0100
@@ -26,6 +26,8 @@
 #include <libical/icaltime.h>
 #include <gconf/gconf-client.h>
 
+#include <gtk/gtkmenuitem.h>
+#include <libowl/owlwindowmenu.h>
 #include "dates_types.h"
 #include "dates_platform.h"
 #include "dates_callbacks.h"
@@ -582,6 +584,9 @@
 		g_free (url_uri);
 	}
 
+	owl_set_window_menu (GTK_WINDOW (data.main_window),
+			     GTK_MENU (data.main_menu));
+
 	gtk_main ();
 
 	return 0;
Index: git/src/dates_platform.h
===================================================================
--- git.orig/src/dates_platform.h	2009-08-18 12:44:56.000000000 +0100
+++ git/src/dates_platform.h	2009-09-03 22:28:50.000000000 +0100
@@ -20,7 +20,7 @@
 
 #include "dates_types.h"
 
-#ifdef WITH_HILDON
+#if 1
 #define DATES_MENU_WITHOUT_BAR 1
 #endif