GNOME.org
 

evolution-data-server r9100 - in branches/EXCHANGE_MAPI_BRANCH: calendar/backends/mapi calendar/libecal servers/mapi

Author: msuman
Date: Wed Jul  9 06:21:20 2008
New Revision: 9100
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9100&view=rev

Log:
Remove useless linkages, headers, use dynamic linking wherever possible.

Modified:
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-factory.c
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.c
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.h
   branches/EXCHANGE_MAPI_BRANCH/calendar/libecal/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-cal-utils.h
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.c
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.h
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-folder.c
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-folder.h
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-utils.c
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-utils.h

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am	Wed Jul  9 06:21:20 2008
@@ -1,35 +1,30 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"libecalbackendmapi\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/libical/src			\
-	-I$(top_builddir)/libical/src			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/servers/mapi			\
-	-I$(top_builddir)/servers/mapi			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
+INCLUDES =					\
+	-DG_LOG_DOMAIN=\"libecalbackendmapi\"	\
+	$(E_DATA_SERVER_CFLAGS)			\
+	$(EVOLUTION_CALENDAR_CFLAGS)		\
+	$(LIBECAL_CFLAGS)			\
+	$(LIBEDATACAL_CFLAGS)			\
+	-I$(top_srcdir)/calendar		\
+	-I$(top_srcdir)/libical/src		\
+	-I$(top_srcdir)/servers/mapi		\
 	$(LIBMAPI_CFLAGS)
 
 extension_LTLIBRARIES = libecalbackendmapi.la
 
-libecalbackendmapi_la_SOURCES =		\
-	e-cal-backend-mapi-factory.c	\
-	e-cal-backend-mapi-factory.h	\
-	e-cal-backend-mapi.c		\
+libecalbackendmapi_la_SOURCES =			\
+	e-cal-backend-mapi-factory.c		\
+	e-cal-backend-mapi-factory.h		\
+	e-cal-backend-mapi.c			\
 	e-cal-backend-mapi.h
 
-libecalbackendmapi_la_LIBADD =						\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la			\
-	$(top_builddir)/servers/mapi/libexchangemapi-1.0.la		\
-	$(EVOLUTION_CALENDAR_LIBS)					\
+libecalbackendmapi_la_LIBADD =			\
+	$(E_DATA_SERVER_LIBS)			\
+	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(LIBECAL_LIBS)				\
+	$(LIBEDATACAL_LIBS)			\
+	$(top_builddir)/servers/mapi/libexchangemapi-1.0.la	\
 	$(LIBMAPI_LIBS)
 
-libecalbackendmapi_la_LDFLAGS =		\
+libecalbackendmapi_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
 

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-factory.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-factory.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-factory.c	Wed Jul  9 06:21:20 2008
@@ -23,12 +23,9 @@
 
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "e-cal-backend-mapi-factory.h"
 #include "e-cal-backend-mapi.h"
+#include <exchange-mapi-cal-tz-utils.h>
 
 #define d(x) 
 

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.c	Wed Jul  9 06:21:20 2008
@@ -23,11 +23,19 @@
 
 
 
-#include <libecal/e-cal-time-util.h>
+#include <glib/gi18n.h>
 #include <gio/gio.h>
 
 #include "e-cal-backend-mapi.h"
 
+#include <libedata-cal/e-cal-backend-cache.h>
+#include <libedataserver/e-xml-hash-utils.h>
+
+#include <exchange-mapi-connection.h>
+#include <exchange-mapi-cal-utils.h>
+#include <exchange-mapi-folder.h>
+#include <exchange-mapi-utils.h>
+
 #define d(x) x
 
 #ifdef G_OS_WIN32
@@ -300,7 +308,7 @@
 //				CAL_STATIC_CAPABILITY_DELEGATE_SUPPORTED ","
 //				CAL_STATIC_CAPABILITY_NO_ORGANIZER ","
 //				CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY ","
-//				CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING
+				CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING
 				  );
 
 	return GNOME_Evolution_Calendar_Success;
@@ -1204,7 +1212,7 @@
 	struct mapi_SRestriction res;
 	struct SPropValue sprop;
 	struct SBinary sb;
-	uint32_t proptag = 0x00000000;
+	uint32_t proptag = 0x0;
 	struct SPropTagArray *array;
 
 	uid = icalcomponent_get_uid (comp);
@@ -1353,8 +1361,6 @@
 	ECalComponent *comp, *cache_comp = NULL;
 	gboolean status;
 	mapi_id_t mid;
-//	EGwConnectionStatus status;
-//	EGwItem *item, *cache_item;
 	const char *uid = NULL, *rid = NULL;
 	GSList *recipients = NULL;
 	GSList *attachments = NULL;
@@ -1652,7 +1658,8 @@
 								    e_cal_backend_get_kind (E_CAL_BACKEND (backend)));
 		}
 	}
-
+	/* We need another static capability to say the backend has already sent the requests. */
+#if 0
 	if (status == GNOME_Evolution_Calendar_Success) {
 		ECalComponent *comp;
 
@@ -1673,7 +1680,7 @@
 		}
 		*modified_calobj = g_strdup (calobj);
 	}
-
+#endif
 	icalcomponent_free (icalcomp);
 
 	return GNOME_Evolution_Calendar_Success;

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.h
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.h	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.h	Wed Jul  9 06:21:20 2008
@@ -26,34 +26,9 @@
 #ifndef E_CAL_BACKEND_MAPI_H
 #define E_CAL_BACKEND_MAPI_H
 
-#include <libedata-cal/e-cal-backend.h>
-#include <libedata-cal/e-cal-backend-sync.h>
-#include <libedata-cal/e-cal-backend-cache.h>
-#include <libedata-cal/e-cal-backend-util.h>
-#include <libedata-cal/e-cal-backend-factory.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal-util.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-xml-hash-utils.h>
-#include <libedataserver/e-url.h>
-
 #include <glib.h>
-#include <glib/gi18n.h>
 
-#include <exchange-mapi-connection.h>
-#include <exchange-mapi-defs.h>
-#include <exchange-mapi-cal-utils.h>
-#include <exchange-mapi-folder.h>
-#include <exchange-mapi-utils.h>
-
-#if 0
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#endif
+#include <libedata-cal/e-cal-backend-sync.h>
 
 G_BEGIN_DECLS
 
@@ -95,4 +70,5 @@
 
 G_END_DECLS
 
-#endif
+#endif /* E_CAL_BACKEND_MAPI_H */
+

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/libecal/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/libecal/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/libecal/Makefile.am	Wed Jul  9 06:21:20 2008
@@ -6,7 +6,7 @@
 	-I.. 						\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/calendar/libecal		\
-	-I$(top_srcdir)/calendar/libical/src		\
+	-I$(top_srcdir)/libical/src			\
 	-I$(top_builddir)/libical/src			\
 	-I$(top_srcdir)/libical/src/libical		\
 	-I$(top_builddir)/libical/src/libical		\

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/Makefile.am	Wed Jul  9 06:21:20 2008
@@ -1,17 +1,12 @@
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"libexchangemapi\"	\
+	-DMAPI_DATADIR=\""$(mapidatadir)"\"	\
+	$(E_DATA_SERVER_CFLAGS)			\
 	-I$(top_srcdir)				\
-	-I$(top_builddir)			\
+	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	-I$(top_srcdir)/calendar		\
-	-I$(top_builddir)/calendar		\
 	-I$(top_srcdir)/libical/src		\
-	-I$(top_builddir)/libical/src		\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	$(LIBMAPI_CFLAGS)			\
-	$(E_DATA_SERVER_CFLAGS)			\
-	-DMAPI_DATADIR=\""$(mapidatadir)"\"	\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(LIBMAPI_CFLAGS)
 
 
 lib_LTLIBRARIES = libexchangemapi-1.0.la
@@ -34,9 +29,9 @@
 	exchange-mapi-cal-tz-utils.h
 
 libexchangemapi_1_0_la_LIBADD =			\
-	$(LIBMAPI_LIBS)				\
 	$(E_DATA_SERVER_LIBS)			\
-	$(EVOLUTION_CALENDAR_LIBS)
+	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(LIBMAPI_LIBS)
 
 libexchangemapiincludedir = $(privincludedir)/mapi
 

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-cal-utils.h
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-cal-utils.h	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-cal-utils.h	Wed Jul  9 06:21:20 2008
@@ -26,11 +26,13 @@
 #define EXCHANGE_MAPI_CAL_UTILS_H
 
 #include <libecal/e-cal-component.h>
+
 #include "exchange-mapi-connection.h"
+#include "exchange-mapi-defs.h"
 #include "exchange-mapi-utils.h"
+
 #include "exchange-mapi-cal-tz-utils.h"
 #include "exchange-mapi-cal-recur-utils.h"
-#include "exchange-mapi-cal-tz-utils.h"
 
 G_BEGIN_DECLS
 

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.c	Wed Jul  9 06:21:20 2008
@@ -22,11 +22,8 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
-#include <glib.h>
+
 #include "exchange-mapi-connection.h"
 #include "exchange-mapi-folder.h"
 #include "exchange-mapi-utils.h"

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.h
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.h	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.h	Wed Jul  9 06:21:20 2008
@@ -25,8 +25,9 @@
 #ifndef EXCHANGE_MAPI_CONNECTION_H
 #define EXCHANGE_MAPI_CONNECTION_H 
 
+#include <glib.h>
+
 #include <libmapi/libmapi.h>
-#include "exchange-mapi-defs.h"
 
 typedef enum _ExchangeMapiOptions {
 	MAPI_OPTIONS_FETCH_ATTACHMENTS = 1<<0,

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-folder.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-folder.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-folder.c	Wed Jul  9 06:21:20 2008
@@ -22,7 +22,6 @@
  */
 
 
-#include <glib.h>
 #include "exchange-mapi-connection.h"
 #include "exchange-mapi-folder.h"
 

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-folder.h
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-folder.h	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-folder.h	Wed Jul  9 06:21:20 2008
@@ -24,6 +24,8 @@
 #ifndef EXCHANGE_MAPI_FOLDER_H
 #define EXCHANGE_MAPI_FOLDER_H
 
+#include <glib.h>
+
 typedef enum  {
 	MAPI_FOLDER_TYPE_MAIL=1,
 	MAPI_FOLDER_TYPE_APPOINTMENT,

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-utils.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-utils.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-utils.c	Wed Jul  9 06:21:20 2008
@@ -23,9 +23,7 @@
 
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "exchange-mapi-utils.h"
 
 #ifdef G_OS_WIN32
 /* Undef the similar macro from pthread.h, it doesn't check if
@@ -37,10 +35,6 @@
 #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
 #endif
 
-#include "exchange-mapi-utils.h"
-#include <stdint.h>
-
-
 /* Converts a string from Windows-UTF8 to classic-UTF8.
  * NOTE: If the returned value is non-NULL, the caller has to free the newly
  * allocated string using g_free()

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-utils.h
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-utils.h	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-utils.h	Wed Jul  9 06:21:20 2008
@@ -26,8 +26,6 @@
 #ifndef EXCHANGE_MAPI_UTILS_H
 #define EXCHANGE_MAPI_UTILS_H 
 
-#include <libmapi/libmapi.h>
-#include <glib.h>
 #include "exchange-mapi-connection.h"
 
 gchar *
@@ -72,3 +70,4 @@
 exchange_mapi_util_entryid_generate_local (TALLOC_CTX *mem_ctx, const char *exchange_dn);
 
 #endif
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]