From f3ad82442dbab84d7c0863b1f2f3952478772f92 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Mon, 20 Dec 2010 14:49:20 -0500
Subject: [PATCH] Remove remaining references to EDS/ical

We can add this back using the Calendar.EventSource abstraction once
we are ready for it.

Signed-off-by: David Zeuthen <davidz@redhat.com>
---
 configure.ac       |  2 --
 js/ui/main.js      |  1 -
 js/ui/panel.js     |  4 ----
 src/shell-global.c | 12 ------------
 src/shell-global.h |  1 -
 5 files changed, 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index d06087eef..827920a1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,6 @@ GJS_MIN_VERSION=0.7
 MUTTER_MIN_VERSION=2.91.0
 GTK_MIN_VERSION=2.91.0
 GIO_MIN_VERSION=2.25.9
-LIBICAL_MIN_VERSION=0.43
 
 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
@@ -71,7 +70,6 @@ PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
                                  gtk+-3.0 >= $GTK_MIN_VERSION
                                  mutter-plugins >= $MUTTER_MIN_VERSION
                                  gjs-internals-1.0 >= $GJS_MIN_VERSION
-                                 libical >= $LIBICAL_MIN_VERSION
 				 libgnome-menu $recorder_modules gconf-2.0
                                  gdk-x11-3.0
 				 clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
diff --git a/js/ui/main.js b/js/ui/main.js
index db3a818f5..88ffa48ae 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -243,7 +243,6 @@ function _relayout() {
     // will be updated when it is next shown. We do the same for
     // the calendar popdown.
     overview.hide();
-    //panel.hideCalendar();
 }
 
 // metacity-clutter currently uses the same prefs as plain metacity,
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 0f23d716f..ba4791f55 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -864,10 +864,6 @@ Panel.prototype = {
         this._rightBox.add(this._statusmenu.actor);
     },
 
-    hideCalendar: function() {
-        this._clockButton.closeCalendar();
-    },
-
     startupAnimation: function() {
         this.actor.y = -this.actor.height;
         Tweener.addTween(this.actor,
diff --git a/src/shell-global.c b/src/shell-global.c
index 182f6611e..71eb72895 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -26,7 +26,6 @@
 #include <X11/extensions/Xfixes.h>
 #include <gjs/gjs-module.h>
 #include <canberra.h>
-#include <libical/ical.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@@ -467,17 +466,6 @@ shell_global_set_stage_input_mode (ShellGlobal         *global,
     }
 }
 
-/**
- * shell_global_icalcomponent_to_str:
- *
- * Wrap icalcomponent_as_ical_string_r
- */
-char*
-shell_global_icalcomponent_to_str (long icalcomp)
-{
-  return icalcomponent_as_ical_string_r ((icalcomponent*)icalcomp);
-}
-
 /**
  * shell_global_set_cursor:
  * @global: A #ShellGlobal
diff --git a/src/shell-global.h b/src/shell-global.h
index e15e223ea..91a82c454 100644
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -100,7 +100,6 @@ void shell_global_get_pointer (ShellGlobal         *global,
                                ClutterModifierType *mods);
 
 GSettings *shell_global_get_settings (ShellGlobal *global);
-char* shell_global_icalcomponent_to_str (long icalcomp);
 
 ClutterModifierType shell_get_event_state (ClutterEvent *event);