[tasks] Remove libowl support

[Ross Burton <rburton src gnome org>]

commit 01bdd461af5f1fec3c23e375e912f5394cfbf490
Author: Ross Burton <ross burton intel com>
Date:   Thu Feb 23 13:16:38 2012 +0000

    Remove libowl support

 TODO                |    1 -
 configure.ac        |    9 ---------
 src/gtk/Makefile.am |    6 ++----
 src/gtk/main.c      |    9 ---------
 src/gtk/ui.h        |   20 --------------------
 5 files changed, 2 insertions(+), 43 deletions(-)
---
diff --git a/TODO b/TODO
index 2f797ae..38e45d6 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
 port to gtkapplication
-remove libowl?
 remove handle_libical_memory?
 remove cell renderer?
diff --git a/configure.ac b/configure.ac
index 83ae875..c8474d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,15 +31,6 @@ AC_ARG_ENABLE(gtk,
         ,enable_gtk=yes)
 AM_CONDITIONAL(WITH_GTK, test "x$enable_gtk" = "xyes")
 
-AC_ARG_WITH(owl,
-        AS_HELP_STRING([--with-owl],[Use the OWL menu]),
-        ,with_owl=no)
-AS_IF([test "x$with_owl" = "xyes"], [
-        PKG_CHECK_MODULES(OWL, libowl)
-        AC_DEFINE(WITH_OWL, 1, [libowl present])
-        ])
-AM_CONDITIONAL(WITH_OWL, test "x$with_owl" = "xyes")
-
 AC_OUTPUT([
 Makefile
 data/Makefile
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 7023d1c..c8f22e1 100644
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -6,13 +6,11 @@ tasks_CPPFLAGS = -I$(top_srcdir)/
 tasks_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(ECAL_CFLAGS) \
-	$(OWL_CFLAGS)
+	$(ECAL_CFLAGS)
 tasks_LDADD = \
 	$(top_builddir)/libkoto/libkoto.a \
 	$(GTK_LIBS) \
-	$(ECAL_LIBS) \
-	$(OWL_LIBS)
+	$(ECAL_LIBS)
 
 tasks_SOURCES = \
 	main.c \
diff --git a/src/gtk/main.c b/src/gtk/main.c
index 715a537..9585b2f 100644
--- a/src/gtk/main.c
+++ b/src/gtk/main.c
@@ -41,10 +41,6 @@
 #include <libkoto/koto-undo-action.h>
 #include <libkoto/koto-undo-manager.h>
 
-#if WITH_OWL
-#include <owlwindowmenu.h>
-#endif
-
 #include "ui.h"
 #include "window-util.h"
 
@@ -695,13 +691,8 @@ main (int argc, char **argv)
   gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
   gtk_ui_manager_ensure_update (ui_manager);
 
-#if WITH_OWL
-  menu = gtk_ui_manager_get_widget (ui_manager, "/OwlMenu/Menu");
-  owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu));
-#else
   menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
   gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0);
-#endif
 
   box = gtk_vbox_new (FALSE, 4);
   gtk_container_set_border_width (GTK_CONTAINER (box), 4);
diff --git a/src/gtk/ui.h b/src/gtk/ui.h
index 0c5fcbd..88e05e9 100644
--- a/src/gtk/ui.h
+++ b/src/gtk/ui.h
@@ -1,7 +1,6 @@
 #include <config.h>
 
 static const char ui_xml[] = {
-#if ! WITH_OWL
   /* This is the menu bar used normally */
   "<menubar name='MenuBar'>"
     "<menu action='TasksMenu'>"
@@ -22,23 +21,4 @@ static const char ui_xml[] = {
       "<menuitem action='About'/>"
     "</menu>"
   "</menubar>"
-#else
-  /* This is the OWL menu bar */
-  "<popup name='OwlMenu'>"
-    "<menu action='Menu'>"
-      "<menuitem action='NewTask'/>"
-      "<menuitem action='EditTask'/>"
-      "<menuitem action='CompleteTask'/>"
-      "<separator/>"
-      "<menuitem action='Undo'/>"
-      "<menuitem action='Redo'/>"
-      "<separator/>"
-      "<menuitem action='DeleteTask'/>"
-      "<menuitem action='PurgeTasks'/>"
-      "<separator/>"
-      "<menuitem action='About'/>"
-      "<menuitem action='Quit'/>"
-    "</menu>"
-  "</popup>"
-#endif
 };