swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints

1 files changed, 0 insertions, 35 deletions

diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
deleted file mode 100644
index c73f11673c..0000000000
--- a/calendar/gui/itip-utils.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#ifndef ITIP_UTILS_HEADER
-#define ITIP_UTILS_HEADER
-
-#include <ical.h>
-#include <string.h>
-#include <glib.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/cal-component.h>
-#include <e-util/e-account-list.h>
-
-typedef enum {
-	CAL_COMPONENT_METHOD_PUBLISH,
-	CAL_COMPONENT_METHOD_REQUEST,
-	CAL_COMPONENT_METHOD_REPLY,
-	CAL_COMPONENT_METHOD_ADD,
-	CAL_COMPONENT_METHOD_CANCEL,
-	CAL_COMPONENT_METHOD_REFRESH,
-	CAL_COMPONENT_METHOD_COUNTER,
-	CAL_COMPONENT_METHOD_DECLINECOUNTER
-} CalComponentItipMethod;
-
-EAccountList *itip_addresses_get (void);
-EAccount *itip_addresses_get_default (void);
-
-gboolean itip_organizer_is_user (CalComponent *comp, CalClient *client);
-gboolean itip_sentby_is_user (CalComponent *comp);
-
-const gchar *itip_strip_mailto (const gchar *address);
-
-gboolean itip_send_comp (CalComponentItipMethod method, CalComponent *comp,
-			 CalClient *client, icalcomponent *zones);
-
-
-#endif