5 files changed, 20 insertions, 16 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 4ebbabbb4d..72601f8f11 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	* exchange-account-setup.c:
+	* exchange-calendar.c:
+	* exchange-config-listener.c:
+	* exchange-contacts.c:
+	Don't mix declarations and code (#405495).
+
 2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #419524
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 0ac6ffcd75..5806243fa8 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -710,10 +710,10 @@ void
 org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
-	target_account = (EMConfigTargetAccount *)data->config->target;
 	const char *source_url;
 	CamelURL *url;
 	
+	target_account = (EMConfigTargetAccount *)data->config->target;
 	source_url = e_account_get_string (target_account->account,  E_ACCOUNT_SOURCE_URL);
 	url = camel_url_new (source_url, NULL);
 	if (url == NULL
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index 3d47c6c636..bd19c50cef 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -309,6 +309,11 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	const char *base_uri;
 	const char *rel_uri;
 	gint offline_status;
+	ExchangeAccount *account;
+	EUri *euri;
+	int uri_len;
+	gchar *uri_text, *uri_string, *path, *folder_name;
+	gboolean is_personal;
 
 	rel_uri = e_source_peek_relative_uri (t->source);
 	group = e_source_peek_group (t->source);
@@ -330,12 +335,6 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
                 return TRUE;
         }
 
-	ExchangeAccount *account;
-	EUri *euri;
-	int uri_len;
-	gchar *uri_text, *uri_string, *path, *folder_name;
-	gboolean is_personal;
-
 	account = exchange_operations_get_exchange_account ();
 	uri_text = e_source_get_uri (t->source);
 	euri = e_uri_new (uri_text);
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 5466c9b82d..d7a2fc54c7 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -793,6 +793,10 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 	}
 	if (result == EXCHANGE_ACCOUNT_CONNECT_SUCCESS) {
 		int max_pwd_age_days;
+		GladeXML *xml;
+		GtkWidget *dialog;
+		GtkResponseType response;
+		gboolean oof;
 
 		/* check for password expiry warning */
 		max_pwd_age_days = exchange_account_check_password_expiry (account);
@@ -801,12 +805,6 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		}
 
 		/* check for oof state */
-
-		GladeXML *xml;
-		GtkWidget *dialog;
-		GtkResponseType response;
-		gboolean oof;
-
 		if (exchange_oof_get (account, &oof, NULL)) {
 			if (oof) {
 				/* OOF state is set, check if user wants to set it back to in-office */
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index a1ea6dab98..d33a2024a7 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -104,14 +104,13 @@ e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source)
 	GtkTreeIter       iter;
 	ExchangeAccount *account;
 	gchar *es_ruri;
+	gchar *ruri;
 
 	account = exchange_operations_get_exchange_account ();
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
 	gtk_tree_selection_get_selected(selection, &model, &iter);
 
-	gchar *ruri;
-	
 	gtk_tree_model_get (model, &iter, CONTACTSRURI_COL, &ruri, -1);
 	es_ruri = g_strconcat (account->account_filename, "/;", ruri, NULL);
 	e_source_set_relative_uri (source, es_ruri);
@@ -307,6 +306,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	const char *base_uri;
 	const char *rel_uri;
 	gint offline_status;
+	ExchangeAccount *account;
 
 	rel_uri = e_source_peek_relative_uri (t->source);
 	group = e_source_peek_group (t->source);
@@ -327,7 +327,6 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		return TRUE;
 	}
 
-	ExchangeAccount *account;
 	account = exchange_operations_get_exchange_account ();
 
 	if (!rel_uri) {