evolution-data-server r9549 - in trunk: . addressbook addressbook/backends/webdav calendar calendar/libecal camel camel/providers/imap camel/providers/local docs/reference/calendar/libedata-cal/tmpl docs/reference/camel/tmpl libedataserver

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Sep 15 01:35:50 2008
New Revision: 9549
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9549&view=rev

Log:
2008-09-14  Matthew Barnes  <mbarnes redhat com>

	* camel/camel-db.c (camel_db_count_junk_message_info),
	(camel_db_count_unread_message_info),
	(camel_db_count_visible_unread_message_info),
	(camel_db_count_visible_message_info),
	(camel_db_count_junk_not_deleted_message_info),
	(camel_db_count_deleted_message_info), (read_fir_callback):
	* camel/camel-folder-summary.c (camel_folder_summary_migrate_infos):
	* camel/camel-search-sql.c (camel_sexp_to_sql):
	* camel/providers/imap/camel-imap-folder.c (imap_update_summary):
	* camel/providers/local/camel-local-store.c
	(camel_local_store_finalize):
	* addressbook/backends/webdav/e-book-backend-webdav.c
	(e_book_backend_webdav_modify_contact), (download_contacts):
	* calendar/libecal/e-cal-check-timezones.c (e_cal_check_timezones):
	* libedataserver/e-sexp.c (term_eval_and), (term_eval_or):
	Don't mix declarations and code.



Modified:
   trunk/ChangeLog
   trunk/addressbook/ChangeLog
   trunk/addressbook/backends/webdav/e-book-backend-webdav.c
   trunk/calendar/ChangeLog
   trunk/calendar/libecal/e-cal-check-timezones.c
   trunk/camel/ChangeLog
   trunk/camel/camel-db.c
   trunk/camel/camel-folder-summary.c
   trunk/camel/camel-search-sql.c
   trunk/camel/camel-vee-folder.c
   trunk/camel/providers/imap/ChangeLog
   trunk/camel/providers/imap/camel-imap-folder.c
   trunk/camel/providers/local/ChangeLog
   trunk/camel/providers/local/camel-local-store.c
   trunk/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
   trunk/docs/reference/camel/tmpl/camel-vee-folder.sgml
   trunk/docs/reference/camel/tmpl/camel-vee-summary.sgml
   trunk/libedataserver/e-sexp.c

Modified: trunk/addressbook/backends/webdav/e-book-backend-webdav.c
==============================================================================
--- trunk/addressbook/backends/webdav/e-book-backend-webdav.c	(original)
+++ trunk/addressbook/backends/webdav/e-book-backend-webdav.c	Mon Sep 15 01:35:50 2008
@@ -376,6 +376,7 @@
 	EContact                  *contact = e_contact_new_from_vcard(vcard);
 	const char                *uid;
 	const char                *etag;
+	guint status;
 
 	if (priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL) {
 		e_data_book_respond_create(book, opid,
@@ -385,7 +386,7 @@
 	}
 
 	/* modify contact */
-	guint status = upload_contact(webdav, contact);
+	status = upload_contact(webdav, contact);
 	if (status != 201 && status != 204) {
 		g_object_unref(contact);
 		if (status == 401 || status == 407) {
@@ -684,6 +685,7 @@
 		const char  *uri;
 		const gchar *etag;
 		EContact    *contact;
+		gchar *complete_uri;
 
 		/* stop downloading if search was aborted */
 		if (running != NULL && !e_flag_is_set(running))
@@ -702,7 +704,6 @@
 			continue;
 
 		/* uri might be relative, construct complete one */
-		gchar *complete_uri;
 		if (uri[0] == '/') {
 			SoupURI *soup_uri = soup_uri_new(priv->uri);
 			soup_uri->path    = g_strdup(uri);

Modified: trunk/calendar/libecal/e-cal-check-timezones.c
==============================================================================
--- trunk/calendar/libecal/e-cal-check-timezones.c	(original)
+++ trunk/calendar/libecal/e-cal-check-timezones.c	Mon Sep 15 01:35:50 2008
@@ -296,10 +296,11 @@
                     key =
                         value = NULL;
                 } else {
+                    int counter;
+
                     zonestr = ical_strdup(icalcomponent_as_ical_string(subcomp));
 
                     /* check for collisions with existing timezones */
-                    int counter;
                     for (counter = 0;
                          counter < 100 /* sanity limit */;
                          counter++) {

Modified: trunk/camel/camel-db.c
==============================================================================
--- trunk/camel/camel-db.c	(original)
+++ trunk/camel/camel-db.c	Mon Sep 15 01:35:50 2008
@@ -333,11 +333,11 @@
 camel_db_count_junk_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex)
 {
 	int ret;
+	char *query;
 
 	if (!cdb)
 		return -1;
 
-	char *query;
 	query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE junk = 1", table_name);
 
 	ret = camel_db_count_message_info (cdb, query, count, ex);
@@ -350,11 +350,11 @@
 camel_db_count_unread_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex)
 {
 	int ret;
+	char *query;
 
 	if (!cdb)
 		return -1;
 
-	char *query;
 	query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE read = 0", table_name);
 
 	ret = camel_db_count_message_info (cdb, query, count, ex);
@@ -367,11 +367,11 @@
 camel_db_count_visible_unread_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex)
 {
 	int ret;
+	char *query;
 
 	if (!cdb)
 		return -1;
 
-	char *query;
 	query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE read = 0 AND junk = 0 AND deleted = 0", table_name);
 
 	ret = camel_db_count_message_info (cdb, query, count, ex);
@@ -384,11 +384,11 @@
 camel_db_count_visible_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex)
 {
 	int ret;
+	char *query;
 
 	if (!cdb)
 		return -1;
 
-	char *query;
 	query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE junk = 0 AND deleted = 0", table_name);
 
 	ret = camel_db_count_message_info (cdb, query, count, ex);
@@ -401,11 +401,11 @@
 camel_db_count_junk_not_deleted_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex)
 {
 	int ret;
+	char *query;
 
 	if (!cdb)
 		return -1;
 
-	char *query ;
 	query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE junk = 1 AND deleted = 0", table_name);
 
 	ret = camel_db_count_message_info (cdb, query, count, ex);
@@ -418,11 +418,11 @@
 camel_db_count_deleted_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex)
 {
 	int ret;
+	char *query;
 
 	if (!cdb)
 		return -1;
 
-	char *query ;
 	query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE deleted = 1", table_name);
 
 	ret = camel_db_count_message_info (cdb, query, count, ex);
@@ -826,6 +826,7 @@
 read_fir_callback (void * ref, int ncol, char ** cols, char ** name)
 {
 	CamelFIRecord *record = *(CamelFIRecord **) ref;
+	int i;
 
 	d(g_print ("\nread_fir_callback called \n"));
 #if 0
@@ -834,7 +835,6 @@
 	/* Just a sequential mapping of struct members to columns is enough I guess. 
 	Needs some checking */
 #else
-	int i;
 	
 	for (i = 0; i < ncol; ++i) {
 		if (!strcmp (name [i], "folder_name"))

Modified: trunk/camel/camel-folder-summary.c
==============================================================================
--- trunk/camel/camel-folder-summary.c	(original)
+++ trunk/camel/camel-folder-summary.c	Mon Sep 15 01:35:50 2008
@@ -1147,6 +1147,8 @@
 
 	/* now read in each message ... */
 	for (i=0;i<s->saved_count;i++) {
+		CamelTag *tag;
+
 		mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_load(s, in);
 
 		if (mi == NULL)
@@ -1161,7 +1163,6 @@
 			}
 		}
 
-		CamelTag *tag;
 		info = (CamelMessageInfoBase *)mi;
 		tag = info->user_tags;
 		while (tag) {

Modified: trunk/camel/camel-search-sql.c
==============================================================================
--- trunk/camel/camel-search-sql.c	(original)
+++ trunk/camel/camel-search-sql.c	Mon Sep 15 01:35:50 2008
@@ -266,11 +266,13 @@
 						 
 						if (!*elements[i].exact_token) /* Skip match-all */ {
 							if (g_ascii_strcasecmp (elements[i].token, "match-threads") == 0) {
+								Node *node;
+
 								/* remove next node also. We dont support it*/
 								g_scanner_get_next_token (scanner);
 								/* Put a 'or' so that everything comes up. It hardly matter. It is just to start loading  
 								   operator */
-								Node *node = g_new0 (Node, 1);
+								node = g_new0 (Node, 1);
 								
 								node->token = g_strdup ("or");
 								node->exact_token =  g_strdup ("or");

Modified: trunk/camel/camel-vee-folder.c
==============================================================================
--- trunk/camel/camel-vee-folder.c	(original)
+++ trunk/camel/camel-vee-folder.c	Mon Sep 15 01:35:50 2008
@@ -569,7 +569,6 @@
 	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
 	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
 	GList *node;
-	CamelFIRecord * record;
 	
 	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
 

Modified: trunk/camel/providers/imap/camel-imap-folder.c
==============================================================================
--- trunk/camel/providers/imap/camel-imap-folder.c	(original)
+++ trunk/camel/providers/imap/camel-imap-folder.c	Mon Sep 15 01:35:50 2008
@@ -3139,6 +3139,7 @@
 	char *uid, *resp, *tempuid;
 	GData *data;
 	extern int camel_application_is_exiting;
+	int k = 0, ct;
 
 	if (store->server_level >= IMAP_LEVEL_IMAP4REV1) {
 		if (store->headers == IMAP_FETCH_ALL_HEADERS)
@@ -3197,7 +3198,6 @@
 	 */
 	fetch_data = g_ptr_array_new ();
 	messages = g_ptr_array_new ();
-	int k = 0, ct;
 	ct = exists - seq;
 	while ((type = camel_imap_command_response (store, &resp, ex)) ==
 	       CAMEL_IMAP_RESPONSE_UNTAGGED && !camel_application_is_exiting) {

Modified: trunk/camel/providers/local/camel-local-store.c
==============================================================================
--- trunk/camel/providers/local/camel-local-store.c	(original)
+++ trunk/camel/providers/local/camel-local-store.c	Mon Sep 15 01:35:50 2008
@@ -98,11 +98,11 @@
 static void
 camel_local_store_finalize (CamelLocalStore *local_store)
 {
+	CamelStore *store;
+
 	if (local_store->toplevel_dir)
 		g_free (local_store->toplevel_dir);
 
-	CamelStore *store;
-
 	store = ((CamelStore *)local_store); 
 	d(printf ("\n\aLocal Store Finalize \n\a"));
 

Modified: trunk/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
==============================================================================
--- trunk/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml	(original)
+++ trunk/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml	Mon Sep 15 01:35:50 2008
@@ -377,14 +377,6 @@
 @Returns: 
 
 
-<!-- ##### FUNCTION e_cal_backend_last_client_gone ##### -->
-<para>
-
-</para>
-
- backend: 
-
-
 <!-- ##### FUNCTION e_cal_backend_set_notification_proxy ##### -->
 <para>
 

Modified: trunk/docs/reference/camel/tmpl/camel-vee-folder.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-vee-folder.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-vee-folder.sgml	Mon Sep 15 01:35:50 2008
@@ -31,6 +31,7 @@
 @parent_vee_store: 
 @hashes: 
 @loaded: 
+ deleted: 
 
 <!-- ##### MACRO CAMEL_UNMATCHED_NAME ##### -->
 <para>

Modified: trunk/docs/reference/camel/tmpl/camel-vee-summary.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-vee-summary.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-vee-summary.sgml	Mon Sep 15 01:35:50 2008
@@ -23,6 +23,7 @@
 </para>
 
 @summary: 
+ force_counts: 
 
 <!-- ##### STRUCT CamelVeeMessageInfo ##### -->
 <para>

Modified: trunk/libedataserver/e-sexp.c
==============================================================================
--- trunk/libedataserver/e-sexp.c	(original)
+++ trunk/libedataserver/e-sexp.c	Mon Sep 15 01:35:50 2008
@@ -246,12 +246,13 @@
 	int type=-1;
 	int bool = TRUE;
 	int i;
+	char *oper;
 
 	r(printf("( and\n"));
 
 	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
 
-	char *oper = "AND";
+	oper = "AND";
 	f->operators = g_slist_prepend (f->operators, oper);
 
 	for (i=0;bool && i<argc;i++) {
@@ -308,10 +309,11 @@
 	int type = -1;
 	int bool = FALSE;
 	int i;
+	char *oper;
 
 	r(printf("(or \n"));
 
-	char *oper = "OR";
+	oper = "OR";
 	f->operators = g_slist_prepend (f->operators, oper);
 
 	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);