evolution-data-server r10043 - in trunk/servers/exchange: . storage

[mbarnes svn gnome org]

Author: mbarnes
Date: Tue Feb 10 23:41:37 2009
New Revision: 10043
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10043&view=rev

Log:
2009-02-10  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #570653

	* servers/exchange/storage/exchange-hierarchy-foreign.c:
	Kill n_std_folders and use G_N_ELEMENTS (std_folders) instead.



Modified:
   trunk/servers/exchange/ChangeLog
   trunk/servers/exchange/storage/exchange-hierarchy-foreign.c

Modified: trunk/servers/exchange/storage/exchange-hierarchy-foreign.c
==============================================================================
--- trunk/servers/exchange/storage/exchange-hierarchy-foreign.c	(original)
+++ trunk/servers/exchange/storage/exchange-hierarchy-foreign.c	Tue Feb 10 23:41:37 2009
@@ -268,7 +268,6 @@
 	{ N_("Sent Items"),	E2K_PR_STD_FOLDER_SENT_ITEMS },
 	{ N_("Tasks"),		E2K_PR_STD_FOLDER_TASKS }
 };
-const static int n_std_folders = sizeof (std_folders) / sizeof (std_folders[0]);
 static ExchangeAccountFolderResult
 create_internal (ExchangeHierarchy *hier, EFolder *parent,
 		 const char *name, const char *type, EFolder **folder_out)
@@ -293,7 +292,7 @@
 		return EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS;
 	}
 
-	for (i = 0; i < n_std_folders; i++) {
+	for (i = 0; i < G_N_ELEMENTS (std_folders); i++) {
 		if (g_ascii_strcasecmp (std_folders[i].name, name) != 0 &&
 		    g_utf8_collate (_(std_folders[i].name), name) != 0)
 			continue;