GNOME.org
 

evolution-data-server r8953 - in branches/camel-db-summary: . addressbook/backends/groupwise addressbook/backends/ldap calendar/libecal calendar/libedata-cal camel camel/providers/imap libdb/env libedataserver libedataserverui po servers/exchange/lib servers/exchange/storage servers/exchange/xntlm servers/groupwise

Author: sragavan
Date: Mon Jun  9 06:29:25 2008
New Revision: 8953
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8953&view=rev

Log:
Merge branch 'master' into disk-summary

Conflicts:

	camel/Makefile.am


Modified:
   branches/camel-db-summary/ChangeLog
   branches/camel-db-summary/addressbook/backends/groupwise/create-account.c
   branches/camel-db-summary/addressbook/backends/ldap/e-book-backend-ldap.c
   branches/camel-db-summary/calendar/libecal/e-cal-component.h
   branches/camel-db-summary/calendar/libedata-cal/e-data-cal-common.h
   branches/camel-db-summary/camel/ChangeLog
   branches/camel-db-summary/camel/Makefile.am
   branches/camel-db-summary/camel/camel-private.h
   branches/camel-db-summary/camel/camel-tcp-stream.h
   branches/camel-db-summary/camel/camel-win32.c
   branches/camel-db-summary/camel/providers/imap/ChangeLog
   branches/camel-db-summary/camel/providers/imap/camel-imap-folder.c
   branches/camel-db-summary/configure.in
   branches/camel-db-summary/libdb/env/env_open.c
   branches/camel-db-summary/libedataserver/e-categories.h
   branches/camel-db-summary/libedataserver/e-data-server-util.h
   branches/camel-db-summary/libedataserver/e-proxy.c
   branches/camel-db-summary/libedataserverui/ChangeLog
   branches/camel-db-summary/libedataserverui/e-book-auth-util.c
   branches/camel-db-summary/libedataserverui/e-categories-dialog.c
   branches/camel-db-summary/libedataserverui/e-categories-dialog.h
   branches/camel-db-summary/libedataserverui/e-cell-renderer-color.h
   branches/camel-db-summary/libedataserverui/e-contact-store.c
   branches/camel-db-summary/libedataserverui/e-contact-store.h
   branches/camel-db-summary/libedataserverui/e-destination-store.c
   branches/camel-db-summary/libedataserverui/e-destination-store.h
   branches/camel-db-summary/libedataserverui/e-name-selector-dialog.c
   branches/camel-db-summary/libedataserverui/e-name-selector-dialog.h
   branches/camel-db-summary/libedataserverui/e-name-selector-entry.c
   branches/camel-db-summary/libedataserverui/e-name-selector-entry.h
   branches/camel-db-summary/libedataserverui/e-name-selector-list.c
   branches/camel-db-summary/libedataserverui/e-name-selector-list.h
   branches/camel-db-summary/libedataserverui/e-name-selector.c
   branches/camel-db-summary/libedataserverui/e-passwords.h
   branches/camel-db-summary/libedataserverui/e-source-option-menu.c
   branches/camel-db-summary/libedataserverui/e-source-option-menu.h
   branches/camel-db-summary/libedataserverui/e-source-selector-dialog.c
   branches/camel-db-summary/libedataserverui/e-source-selector-dialog.h
   branches/camel-db-summary/libedataserverui/e-source-selector.c
   branches/camel-db-summary/libedataserverui/e-source-selector.h
   branches/camel-db-summary/libedataserverui/e-tree-model-generator.c
   branches/camel-db-summary/libedataserverui/e-tree-model-generator.h
   branches/camel-db-summary/libedataserverui/test-source-combo-box.c
   branches/camel-db-summary/libedataserverui/test-source-selector.c
   branches/camel-db-summary/po/ChangeLog
   branches/camel-db-summary/po/fa.po
   branches/camel-db-summary/servers/exchange/lib/e2k-validate.h
   branches/camel-db-summary/servers/exchange/storage/e-folder.h
   branches/camel-db-summary/servers/exchange/storage/exchange-account.c
   branches/camel-db-summary/servers/exchange/storage/exchange-account.h
   branches/camel-db-summary/servers/exchange/storage/exchange-folder-size.c
   branches/camel-db-summary/servers/exchange/storage/exchange-folder-size.h
   branches/camel-db-summary/servers/exchange/storage/exchange-oof.h
   branches/camel-db-summary/servers/exchange/xntlm/xntlm-des.h
   branches/camel-db-summary/servers/exchange/xntlm/xntlm-md4.c
   branches/camel-db-summary/servers/groupwise/create-account.c
   branches/camel-db-summary/servers/groupwise/soap-test.c

Modified: branches/camel-db-summary/addressbook/backends/groupwise/create-account.c
==============================================================================
--- branches/camel-db-summary/addressbook/backends/groupwise/create-account.c	(original)
+++ branches/camel-db-summary/addressbook/backends/groupwise/create-account.c	Mon Jun  9 06:29:25 2008
@@ -1,7 +1,7 @@
 
 #include <config.h>
 #include <gconf/gconf-client.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include "libedataserver/e-source-list.h"
 
 static GConfClient *conf_client;

Modified: branches/camel-db-summary/addressbook/backends/ldap/e-book-backend-ldap.c
==============================================================================
--- branches/camel-db-summary/addressbook/backends/ldap/e-book-backend-ldap.c	(original)
+++ branches/camel-db-summary/addressbook/backends/ldap/e-book-backend-ldap.c	Mon Jun  9 06:29:25 2008
@@ -2104,14 +2104,13 @@
 	msg_type = ldap_msgtype (res);
 	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
 		LDAPMessage *e;
+		EContact *contact;
+		char *vcard;
 
 		g_static_rec_mutex_lock (&eds_ldap_handler_lock);
 		e = ldap_first_entry (bl->priv->ldap, res);
 		g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
-		EContact *contact;
-		char *vcard;
-
 		if (!e) {
 			g_warning ("uh, this shouldn't happen");
 			e_data_book_respond_get_contact (op->book,

Modified: branches/camel-db-summary/calendar/libecal/e-cal-component.h
==============================================================================
--- branches/camel-db-summary/calendar/libecal/e-cal-component.h	(original)
+++ branches/camel-db-summary/calendar/libecal/e-cal-component.h	Mon Jun  9 06:29:25 2008
@@ -22,7 +22,6 @@
 #ifndef E_CAL_COMPONENT_H
 #define E_CAL_COMPONENT_H
 
-#include <glib/gmacros.h>
 #include <time.h>
 #include <glib-object.h>
 #include <libical/ical.h>

Modified: branches/camel-db-summary/calendar/libedata-cal/e-data-cal-common.h
==============================================================================
--- branches/camel-db-summary/calendar/libedata-cal/e-data-cal-common.h	(original)
+++ branches/camel-db-summary/calendar/libedata-cal/e-data-cal-common.h	Mon Jun  9 06:29:25 2008
@@ -22,7 +22,7 @@
 #ifndef CAL_COMMON_H
 #define CAL_COMMON_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: branches/camel-db-summary/camel/Makefile.am
==============================================================================
--- branches/camel-db-summary/camel/Makefile.am	(original)
+++ branches/camel-db-summary/camel/Makefile.am	Mon Jun  9 06:29:25 2008
@@ -300,6 +300,7 @@
 	$(CAMEL_LIBS)							\
 	$(SOCKET_LIBS)							\
 	-lsqlite3							\
+	$(ICONV_LIBS)							\
 	$(REGEX_LIBS)
 
 

Modified: branches/camel-db-summary/camel/camel-private.h
==============================================================================
--- branches/camel-db-summary/camel/camel-private.h	(original)
+++ branches/camel-db-summary/camel/camel-private.h	Mon Jun  9 06:29:25 2008
@@ -190,7 +190,7 @@
 	(g_mutex_unlock (((CamelCertDB *) (db))->priv->l))
 
 #ifdef G_OS_WIN32
-int fsync (int fd);
+#define fsync(fd) _commit(fd)
 
 const char *_camel_get_localedir (void) G_GNUC_CONST;
 const char *_camel_get_libexecdir (void) G_GNUC_CONST;

Modified: branches/camel-db-summary/camel/camel-tcp-stream.h
==============================================================================
--- branches/camel-db-summary/camel/camel-tcp-stream.h	(original)
+++ branches/camel-db-summary/camel/camel-tcp-stream.h	Mon Jun  9 06:29:25 2008
@@ -24,7 +24,7 @@
 #ifndef CAMEL_TCP_STREAM_H
 #define CAMEL_TCP_STREAM_H
 
-#include <glibconfig.h>
+#include <glib.h>
 
 #ifndef G_OS_WIN32
 #include <sys/types.h>

Modified: branches/camel-db-summary/camel/camel-win32.c
==============================================================================
--- branches/camel-db-summary/camel/camel-win32.c	(original)
+++ branches/camel-db-summary/camel/camel-win32.c	Mon Jun  9 06:29:25 2008
@@ -76,31 +76,3 @@
 GETTER(localedir)
 GETTER(libexecdir)
 GETTER(providerdir)
-
-int
-fsync (int fd)
-{
-	int handle;
-	struct stat st;
-
-	handle = _get_osfhandle (fd);
-	if (handle == -1)
-		return -1;
-
-	fstat (fd, &st);
-
-	/* FlushFileBuffers() fails if called on a handle to the
-	 * console output. As we cannot know whether fd refers to the
-	 * console output or not, punt, and call FlushFileBuffers()
-	 * only for regular files and pipes.
-	 */
-	if (!(S_ISREG (st.st_mode) || S_ISFIFO (st.st_mode)))
-		return 0;
-
-	if (FlushFileBuffers ((HANDLE) handle))
-		return 0;
-
-	errno = EIO;
-	return -1;
-}
-

Modified: branches/camel-db-summary/camel/providers/imap/camel-imap-folder.c
==============================================================================
--- branches/camel-db-summary/camel/providers/imap/camel-imap-folder.c	(original)
+++ branches/camel-db-summary/camel/providers/imap/camel-imap-folder.c	Mon Jun  9 06:29:25 2008
@@ -1124,12 +1124,10 @@
 imap_sync_online (CamelFolder *folder, CamelException *ex)
 {
 	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapResponse *response = NULL;
 	CamelImapMessageInfo *info;
 	CamelException local_ex;
 	GPtrArray *matches;
 	char *set, *flaglist;
-	gboolean unset;
 	int i, j, max;
 	
 	if (folder->permanent_flags == 0) {
@@ -1146,6 +1144,9 @@
 	 */
 	max = camel_folder_summary_count (folder->summary);
 	for (i = 0; i < max; i++) {
+		gboolean unset = FALSE;
+		CamelImapResponse *response = NULL;
+
 		if (!(info = (CamelImapMessageInfo *)camel_folder_summary_index (folder->summary, i)))
 			continue;
 		
@@ -1154,11 +1155,6 @@
 			continue;
 		}
 
-		/* Note: Cyrus is broken and will not accept an
-		   empty-set of flags so... if this is true then we
-		   want to unset the previously set flags.*/
-		unset = !(info->info.flags & folder->permanent_flags);
-		
 		/* Note: get_matching() uses UID_SET_LIMIT to limit
 		   the size of the uid-set string. We don't have to
 		   loop here to flush all the matching uids because
@@ -1176,15 +1172,32 @@
 			break;
 		}
 
-		/* FIXME: since we don't know the previously set flags,
-		   if unset is TRUE then just unset all the flags? */
-		/* FIXME: Sankar: What about custom flags ? */
-		flaglist = imap_create_flag_list (unset ? folder->permanent_flags : info->info.flags & folder->permanent_flags, (CamelMessageInfo *)info, folder->permanent_flags);
+		flaglist = imap_create_flag_list (info->info.flags & folder->permanent_flags, (CamelMessageInfo *)info, folder->permanent_flags);
+
+		if (strcmp (flaglist, "()") == 0) {
+			/* Note: Cyrus is broken and will not accept an
+			   empty-set of flags so... if this is true then we
+			   set and unset \Seen flag. It's necessary because
+			   we do not know the previously set user flags. */
+			unset = TRUE;
+			g_free (flaglist);
+			flaglist = strdup ("(\\Seen)");
+
+			response = camel_imap_command (store, folder, &local_ex,
+					       "UID STORE %s FLAGS.SILENT %s",
+					       set, flaglist);
+			if (response)
+				camel_imap_response_free (store, response);
+
+			response = NULL;
+		}
 
 		/* Note: to 'unset' flags, use -FLAGS.SILENT (<flag list>) */
-		response = camel_imap_command (store, folder, &local_ex,
+		if (!camel_exception_is_set (&local_ex))
+			response = camel_imap_command (store, folder, &local_ex,
 					       "UID STORE %s %sFLAGS.SILENT %s",
 					       set, unset ? "-" : "", flaglist);
+
 		g_free (set);
 		g_free (flaglist);
 
@@ -1728,7 +1741,7 @@
 
 	changes = camel_folder_change_info_new ();
 
-	for (i = 0; i < uids->len; i++) {
+	for (i = 0; i < uids->len && !camel_exception_is_set (ex); i++) {
 		uid = uids->pdata[i];
 
 		destuid = get_temp_uid ();
@@ -1753,7 +1766,7 @@
 		else
 			g_free (destuid);
 
-		if (delete_originals)
+		if (delete_originals && !camel_exception_is_set (ex))
 			camel_folder_delete_message (source, uid);
 	}
 
@@ -2026,7 +2039,7 @@
 	realuids = g_ptr_array_new ();
 
 	i = 0;
-	while (i < uids->len) {
+	while (i < uids->len && !camel_exception_is_set (ex)) {
 		/* Skip past real UIDs */
 		for (first = i; i < uids->len; i++) {
 			uid = uids->pdata[i];
@@ -2063,7 +2076,7 @@
 			imap_append_online (dest, message, info, NULL, ex);
 			camel_folder_free_message_info (source, info);
 			camel_object_unref (CAMEL_OBJECT (message));
-			if (delete_originals)
+			if (delete_originals && !camel_exception_is_set (ex))
 				camel_folder_delete_message (source, uid);
 			i++;
 		}

Modified: branches/camel-db-summary/configure.in
==============================================================================
--- branches/camel-db-summary/configure.in	(original)
+++ branches/camel-db-summary/configure.in	Mon Jun  9 06:29:25 2008
@@ -204,9 +204,8 @@
     DL_LIB=''
     SOFTOKN3_LIB=''
     LIBEXECDIR_IN_SERVER_FILE='../../../libexec'
-    # No, don't use Windows XP -only API
-    # AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes])
-    # AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
+    AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes])
+    AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
     ;;
 *)  os_win32=no
     NO_UNDEFINED=''
@@ -277,6 +276,11 @@
 else
         DB_CFLAGS="-I\$(top_builddir)/libdb/dist"
         DB_LIBS="\$(top_builddir)/libdb/dist/libdb-4.1.la"
+	if test $os_win32 = yes; then
+		# Don't pointlessly auto-export the global symbols
+		# from the static libdb
+		DB_LIBS="$DB_LIBS -Wl,--exclude-libs=libdb-4.1.a"
+	fi
         AC_MSG_NOTICE(Using local libdb)
         msg_libdb="statically linked to local copy"
 fi
@@ -316,6 +320,11 @@
 ], ac_cv_libiconv=yes, ac_cv_libiconv=no, ac_cv_libiconv=no))
 if test $ac_cv_libiconv = yes; then
 	ICONV_LIBS="$ICONV_LIBS -liconv"
+	if test $os_win32 = yes; then
+		# Don't pointlessly auto-export the global symbols
+		# from a potentially static libiconv.a
+		ICONV_LIBS="$ICONV_LIBS -Wl,--exclude-libs=libiconv.a"
+	fi
 	have_iconv=yes
 else
 	CFLAGS="$save_CFLAGS"

Modified: branches/camel-db-summary/libdb/env/env_open.c
==============================================================================
--- branches/camel-db-summary/libdb/env/env_open.c	(original)
+++ branches/camel-db-summary/libdb/env/env_open.c	Mon Jun  9 06:29:25 2008
@@ -34,6 +34,10 @@
 #include "dbinc/txn.h"
 #include "dbinc/fop.h"
 
+#ifdef _WIN32
+#define strcasecmp _stricmp
+#endif
+
 static int __db_parse __P((DB_ENV *, char *));
 static int __db_tmp_open __P((DB_ENV *, u_int32_t, char *, DB_FH *));
 static int __dbenv_config __P((DB_ENV *, const char *, u_int32_t));

Modified: branches/camel-db-summary/libedataserver/e-categories.h
==============================================================================
--- branches/camel-db-summary/libedataserver/e-categories.h	(original)
+++ branches/camel-db-summary/libedataserver/e-categories.h	Mon Jun  9 06:29:25 2008
@@ -21,8 +21,6 @@
 #define __E_CATEGORIES__
 
 #include <glib-object.h>
-#include <glib/glist.h>
-#include <glib/gmacros.h>
 
 G_BEGIN_DECLS
 

Modified: branches/camel-db-summary/libedataserver/e-data-server-util.h
==============================================================================
--- branches/camel-db-summary/libedataserver/e-data-server-util.h	(original)
+++ branches/camel-db-summary/libedataserver/e-data-server-util.h	Mon Jun  9 06:29:25 2008
@@ -24,9 +24,7 @@
 
 #include <pthread.h>
 #include <sys/types.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: branches/camel-db-summary/libedataserver/e-proxy.c
==============================================================================
--- branches/camel-db-summary/libedataserver/e-proxy.c	(original)
+++ branches/camel-db-summary/libedataserver/e-proxy.c	Mon Jun  9 06:29:25 2008
@@ -162,11 +162,12 @@
 e_proxy_dispose (GObject *object)
 {
 	EProxy *proxy = (EProxy *)object;
+	EProxyPrivate *priv;
 	
 	if (!E_IS_PROXY (proxy))
 		return;
 
-	EProxyPrivate *priv = proxy->priv;
+	priv = proxy->priv;
 
 	if (priv) {
 		GConfClient* client = NULL;

Modified: branches/camel-db-summary/libedataserverui/e-book-auth-util.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-book-auth-util.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-book-auth-util.c	Mon Jun  9 06:29:25 2008
@@ -25,7 +25,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <libebook/e-book.h>
 #include <libedataserverui/e-passwords.h>

Modified: branches/camel-db-summary/libedataserverui/e-categories-dialog.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-categories-dialog.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-categories-dialog.c	Mon Jun  9 06:29:25 2008
@@ -23,20 +23,7 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 #include "libedataserver/e-categories.h"
 #include "libedataserver/libedataserver-private.h"

Modified: branches/camel-db-summary/libedataserverui/e-categories-dialog.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-categories-dialog.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-categories-dialog.h	Mon Jun  9 06:29:25 2008
@@ -20,7 +20,7 @@
 #ifndef __E_CATEGORIES_DIALOG__
 #define __E_CATEGORIES_DIALOG__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: branches/camel-db-summary/libedataserverui/e-cell-renderer-color.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-cell-renderer-color.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-cell-renderer-color.h	Mon Jun  9 06:29:25 2008
@@ -23,7 +23,7 @@
 
 
 #include <glib.h>
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #define E_TYPE_CELL_RENDERER_COLOR \
 	(e_cell_renderer_color_get_type ())

Modified: branches/camel-db-summary/libedataserverui/e-contact-store.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-contact-store.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-contact-store.c	Mon Jun  9 06:29:25 2008
@@ -25,9 +25,6 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreednd.h>
 #include <glib/gi18n-lib.h>
 #include "e-contact-store.h"
 

Modified: branches/camel-db-summary/libedataserverui/e-contact-store.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-contact-store.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-contact-store.h	Mon Jun  9 06:29:25 2008
@@ -23,7 +23,7 @@
 #ifndef E_CONTACT_STORE_H
 #define E_CONTACT_STORE_H
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <libebook/e-contact.h>
 #include <libebook/e-book.h>
 #include <libebook/e-book-query.h>

Modified: branches/camel-db-summary/libedataserverui/e-destination-store.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-destination-store.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-destination-store.c	Mon Jun  9 06:29:25 2008
@@ -25,9 +25,6 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreednd.h>
 #include <glib/gi18n-lib.h>
 #include "e-destination-store.h"
 

Modified: branches/camel-db-summary/libedataserverui/e-destination-store.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-destination-store.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-destination-store.h	Mon Jun  9 06:29:25 2008
@@ -23,7 +23,7 @@
 #ifndef E_DESTINATION_STORE_H
 #define E_DESTINATION_STORE_H
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <libebook/e-destination.h>
 
 G_BEGIN_DECLS

Modified: branches/camel-db-summary/libedataserverui/e-name-selector-dialog.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-name-selector-dialog.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-name-selector-dialog.c	Mon Jun  9 06:29:25 2008
@@ -23,16 +23,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <glib/gstrfuncs.h>
 #include <glib/gi18n-lib.h>
 #include <libedataserverui/e-source-combo-box.h>
 #include <libedataserverui/e-destination-store.h>

Modified: branches/camel-db-summary/libedataserverui/e-name-selector-dialog.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-name-selector-dialog.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-name-selector-dialog.h	Mon Jun  9 06:29:25 2008
@@ -24,13 +24,7 @@
 #ifndef E_NAME_SELECTOR_DIALOG_H
 #define E_NAME_SELECTOR_DIALOG_H
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtksizegroup.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <libebook/e-book.h>
 #include <libedataserverui/e-contact-store.h>

Modified: branches/camel-db-summary/libedataserverui/e-name-selector-entry.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-name-selector-entry.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-name-selector-entry.c	Mon Jun  9 06:29:25 2008
@@ -23,15 +23,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkclipboard.h>
 
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>

Modified: branches/camel-db-summary/libedataserverui/e-name-selector-entry.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-name-selector-entry.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-name-selector-entry.h	Mon Jun  9 06:29:25 2008
@@ -24,7 +24,7 @@
 #ifndef E_NAME_SELECTOR_ENTRY_H
 #define E_NAME_SELECTOR_ENTRY_H
 
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 #include <libebook/e-contact.h>
 #include <libedataserverui/e-contact-store.h>
 #include <libedataserverui/e-destination-store.h>

Modified: branches/camel-db-summary/libedataserverui/e-name-selector-list.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-name-selector-list.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-name-selector-list.c	Mon Jun  9 06:29:25 2008
@@ -25,19 +25,6 @@
 #include <config.h>
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkvbox.h>
 #include <glib/gi18n-lib.h>
 
 #include <libebook/e-book.h>

Modified: branches/camel-db-summary/libedataserverui/e-name-selector-list.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-name-selector-list.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-name-selector-list.h	Mon Jun  9 06:29:25 2008
@@ -24,8 +24,7 @@
 #ifndef E_NAME_SELECTOR_LIST_H
 #define E_NAME_SELECTOR_LIST_H
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libebook/e-contact.h>
 #include <libedataserverui/e-contact-store.h>
 #include <libedataserverui/e-destination-store.h>

Modified: branches/camel-db-summary/libedataserverui/e-name-selector.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-name-selector.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-name-selector.c	Mon Jun  9 06:29:25 2008
@@ -26,10 +26,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>

Modified: branches/camel-db-summary/libedataserverui/e-passwords.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-passwords.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-passwords.h	Mon Jun  9 06:29:25 2008
@@ -24,7 +24,7 @@
 #define _E_PASSWORD_H_
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: branches/camel-db-summary/libedataserverui/e-source-option-menu.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-source-option-menu.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-source-option-menu.c	Mon Jun  9 06:29:25 2008
@@ -24,10 +24,6 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-
 #include "e-source-option-menu.h"
 
 /* We set data on each menu item specifying the corresponding ESource using this key.  */
@@ -61,7 +57,7 @@
 select_source_foreach_menu_item (GtkWidget *menu_item,
 				 ForeachMenuItemData *data)
 {
-	ESource *source = gtk_object_get_data (GTK_OBJECT (menu_item), MENU_ITEM_SOURCE_DATA_ID);
+	ESource *source = g_object_get_data (G_OBJECT (menu_item), MENU_ITEM_SOURCE_DATA_ID);
 
 	if (data->found_source)
 		return;
@@ -102,7 +98,7 @@
 menu_item_activate_callback (GtkMenuItem *menu_item,
 			     ESourceOptionMenu *option_menu)
 {
-	ESource *source = gtk_object_get_data (GTK_OBJECT (menu_item), MENU_ITEM_SOURCE_DATA_ID);
+	ESource *source = g_object_get_data (G_OBJECT (menu_item), MENU_ITEM_SOURCE_DATA_ID);
 
 	if (source != NULL)
 		select_source (option_menu, source);
@@ -158,14 +154,14 @@
 				gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item2), gtk_image_new_from_pixmap (pixmap, NULL));
 			}
 
-			gtk_object_set_data_full (GTK_OBJECT (item2), MENU_ITEM_SOURCE_DATA_ID, source,
-						  (GtkDestroyNotify) g_object_unref);
+			g_object_set_data_full (G_OBJECT (item2), MENU_ITEM_SOURCE_DATA_ID, source,
+						(GDestroyNotify) g_object_unref);
 			g_object_ref (source);
 
 			g_signal_connect (item2, "activate", G_CALLBACK (menu_item_activate_callback), option_menu);
 
 			gtk_widget_show (item2);
-			gtk_menu_append (GTK_MENU (menu), item2);
+			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item2);
 
 			if (first_source_item == -1) {
 				first_source_item = i;

Modified: branches/camel-db-summary/libedataserverui/e-source-option-menu.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-source-option-menu.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-source-option-menu.h	Mon Jun  9 06:29:25 2008
@@ -27,7 +27,7 @@
 
 #include "libedataserver/e-source-list.h"
 
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
 
 #define E_TYPE_SOURCE_OPTION_MENU			(e_source_option_menu_get_type ())
 #define E_SOURCE_OPTION_MENU(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SOURCE_OPTION_MENU, ESourceOptionMenu))

Modified: branches/camel-db-summary/libedataserverui/e-source-selector-dialog.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-source-selector-dialog.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-source-selector-dialog.c	Mon Jun  9 06:29:25 2008
@@ -27,12 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <glib-object.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
 #include "e-source-selector.h"
 #include "e-source-selector-dialog.h"
 

Modified: branches/camel-db-summary/libedataserverui/e-source-selector-dialog.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-source-selector-dialog.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-source-selector-dialog.h	Mon Jun  9 06:29:25 2008
@@ -24,7 +24,7 @@
 #ifndef _E_SOURCE_SELECTOR_DIALOG_H_
 #define _E_SOURCE_SELECTOR_DIALOG_H_
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "libedataserver/e-source-list.h"
 
 G_BEGIN_DECLS

Modified: branches/camel-db-summary/libedataserverui/e-source-selector.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-source-selector.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-source-selector.c	Mon Jun  9 06:29:25 2008
@@ -26,12 +26,6 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
 
 #include "e-data-server-ui-marshal.h"
 #include "e-source-selector.h"

Modified: branches/camel-db-summary/libedataserverui/e-source-selector.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-source-selector.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-source-selector.h	Mon Jun  9 06:29:25 2008
@@ -24,8 +24,7 @@
 #ifndef _E_SOURCE_SELECTOR_H_
 #define _E_SOURCE_SELECTOR_H_
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "libedataserver/e-source-list.h"
 
 G_BEGIN_DECLS

Modified: branches/camel-db-summary/libedataserverui/e-tree-model-generator.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-tree-model-generator.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-tree-model-generator.c	Mon Jun  9 06:29:25 2008
@@ -26,8 +26,6 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
 #include "e-tree-model-generator.h"
 
 #define ETMG_DEBUG(x)

Modified: branches/camel-db-summary/libedataserverui/e-tree-model-generator.h
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-tree-model-generator.h	(original)
+++ branches/camel-db-summary/libedataserverui/e-tree-model-generator.h	Mon Jun  9 06:29:25 2008
@@ -23,7 +23,7 @@
 #ifndef E_TREE_MODEL_GENERATOR_H
 #define E_TREE_MODEL_GENERATOR_H
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: branches/camel-db-summary/libedataserverui/test-source-combo-box.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/test-source-combo-box.c	(original)
+++ branches/camel-db-summary/libedataserverui/test-source-combo-box.c	Mon Jun  9 06:29:25 2008
@@ -26,8 +26,7 @@
 
 #include "e-source-combo-box.h"
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 static void
 source_changed_cb (ESourceComboBox *combo_box)

Modified: branches/camel-db-summary/libedataserverui/test-source-selector.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/test-source-selector.c	(original)
+++ branches/camel-db-summary/libedataserverui/test-source-selector.c	Mon Jun  9 06:29:25 2008
@@ -27,11 +27,7 @@
 
 #include "e-source-selector.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 static void
 dump_selection (ESourceSelector *selector)

Modified: branches/camel-db-summary/servers/exchange/lib/e2k-validate.h
==============================================================================
--- branches/camel-db-summary/servers/exchange/lib/e2k-validate.h	(original)
+++ branches/camel-db-summary/servers/exchange/lib/e2k-validate.h	Mon Jun  9 06:29:25 2008
@@ -4,7 +4,7 @@
 #ifndef __E2K_VALIDATE_H_
 #define __E2K_VALIDATE_H_
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: branches/camel-db-summary/servers/exchange/storage/e-folder.h
==============================================================================
--- branches/camel-db-summary/servers/exchange/storage/e-folder.h	(original)
+++ branches/camel-db-summary/servers/exchange/storage/e-folder.h	Mon Jun  9 06:29:25 2008
@@ -24,7 +24,7 @@
 #define _E_FOLDER_H_
 
 #include <glib-object.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: branches/camel-db-summary/servers/exchange/storage/exchange-account.c
==============================================================================
--- branches/camel-db-summary/servers/exchange/storage/exchange-account.c	(original)
+++ branches/camel-db-summary/servers/exchange/storage/exchange-account.c	Mon Jun  9 06:29:25 2008
@@ -46,8 +46,7 @@
 #include <libgnome/gnome-util.h>
 
 #include <glade/glade-xml.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include <stdlib.h>
 #include <string.h>

Modified: branches/camel-db-summary/servers/exchange/storage/exchange-account.h
==============================================================================
--- branches/camel-db-summary/servers/exchange/storage/exchange-account.h	(original)
+++ branches/camel-db-summary/servers/exchange/storage/exchange-account.h	Mon Jun  9 06:29:25 2008
@@ -12,7 +12,7 @@
 #include "e2k-security-descriptor.h"
 #include "e-folder.h"
 #include <libedataserver/e-account-list.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: branches/camel-db-summary/servers/exchange/storage/exchange-folder-size.c
==============================================================================
--- branches/camel-db-summary/servers/exchange/storage/exchange-folder-size.c	(original)
+++ branches/camel-db-summary/servers/exchange/storage/exchange-folder-size.c	Mon Jun  9 06:29:25 2008
@@ -26,12 +26,7 @@
 #include <string.h>
 
 #include <glade/glade-xml.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "exchange-hierarchy-webdav.h"
 #include "e-folder-exchange.h"

Modified: branches/camel-db-summary/servers/exchange/storage/exchange-folder-size.h
==============================================================================
--- branches/camel-db-summary/servers/exchange/storage/exchange-folder-size.h	(original)
+++ branches/camel-db-summary/servers/exchange/storage/exchange-folder-size.h	Mon Jun  9 06:29:25 2008
@@ -6,8 +6,7 @@
 
 #include "exchange-types.h"
 #include "e2k-security-descriptor.h"
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: branches/camel-db-summary/servers/exchange/storage/exchange-oof.h
==============================================================================
--- branches/camel-db-summary/servers/exchange/storage/exchange-oof.h	(original)
+++ branches/camel-db-summary/servers/exchange/storage/exchange-oof.h	Mon Jun  9 06:29:25 2008
@@ -5,7 +5,7 @@
 #define __EXCHANGE_OOF_H__
 
 #include "exchange-types.h"
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: branches/camel-db-summary/servers/exchange/xntlm/xntlm-des.h
==============================================================================
--- branches/camel-db-summary/servers/exchange/xntlm/xntlm-des.h	(original)
+++ branches/camel-db-summary/servers/exchange/xntlm/xntlm-des.h	Mon Jun  9 06:29:25 2008
@@ -4,7 +4,7 @@
 #ifndef _XNTLM_DES_H
 #define _XNTLM_DES_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 typedef guint32 XNTLM_DES_KS[16][2];
 

Modified: branches/camel-db-summary/servers/exchange/xntlm/xntlm-md4.c
==============================================================================
--- branches/camel-db-summary/servers/exchange/xntlm/xntlm-md4.c	(original)
+++ branches/camel-db-summary/servers/exchange/xntlm/xntlm-md4.c	Mon Jun  9 06:29:25 2008
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "xntlm-md4.h"
 
 #include <string.h>

Modified: branches/camel-db-summary/servers/groupwise/create-account.c
==============================================================================
--- branches/camel-db-summary/servers/groupwise/create-account.c	(original)
+++ branches/camel-db-summary/servers/groupwise/create-account.c	Mon Jun  9 06:29:25 2008
@@ -1,7 +1,7 @@
 
 #include <config.h>
 #include <gconf/gconf-client.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include <libedataserver/e-source-list.h>
 
 static GConfClient *conf_client;

Modified: branches/camel-db-summary/servers/groupwise/soap-test.c
==============================================================================
--- branches/camel-db-summary/servers/groupwise/soap-test.c	(original)
+++ branches/camel-db-summary/servers/groupwise/soap-test.c	Mon Jun  9 06:29:25 2008
@@ -1,5 +1,5 @@
 #include <config.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include "e-gw-connection.h"
 
 static GMainLoop *main_loop;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]