Don't mix declarations and code (#405495).

2007-03-27  Matthew Barnes  <mbarnes@redhat.com>

	* a11y/e-table/gal-a11y-e-cell-text.c:
	* a11y/e-table/gal-a11y-e-cell-vbox.c:
	* addressbook/gui/component/addressbook-component.c:
	* addressbook/gui/component/addressbook-view.c:
	* addressbook/gui/contact-editor/e-contact-editor.c:
	* addressbook/gui/contact-editor/e-contact-quick-add.c:
	* addressbook/gui/widgets/e-addressbook-view.c:
	* addressbook/gui/widgets/eab-contact-display.c:
	* addressbook/gui/widgets/gal-view-minicard.c:
	* calendar/gui/alarm-notify/alarm-queue.c:
	* calendar/gui/dialogs/comp-editor.c:
	* calendar/gui/dialogs/event-page.c:
	* calendar/gui/dialogs/memo-page.c:
	* calendar/gui/dialogs/task-page.c:
	* calendar/gui/e-cal-popup.c:
	* calendar/gui/e-meeting-list-view.c:
	* calendar/gui/e-tasks.c:
	* calendar/gui/gnome-cal.c:
	* composer/e-msg-composer.c:
	* mail/em-folder-browser.c:
	* mail/em-format.c:
	* mail/em-popup.c:
	* plugins/exchange-operations/exchange-account-setup.c:
	* plugins/exchange-operations/exchange-calendar.c:
	* plugins/exchange-operations/exchange-config-listener.c:
	* plugins/exchange-operations/exchange-contacts.c:
	* plugins/import-ics-attachments/icsimporter.c:
	* widgets/misc/e-filter-bar.c:
	* widgets/misc/e-multi-config-dialog.c:
	* widgets/table/e-cell-checkbox.c:
	* widgets/table/e-table-header-item.c:
	Don't mix declarations and code (#405495).


svn path=/trunk/; revision=33324

10 files changed, 32 insertions, 12 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 6e8897152e..c689008374 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,16 @@
+2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/alarm-notify/alarm-queue.c:
+	* gui/dialogs/comp-editor.c:
+	* gui/dialogs/event-page.c:
+	* gui/dialogs/memo-page.c:
+	* gui/dialogs/task-page.c:
+	* gui/e-cal-popup.c:
+	* gui/e-meeting-list-view.c:
+	* gui/e-tasks.c:
+	* gui/gnome-cal.c:
+	Don't mix declarations and code (#405495).
+
 2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #419524
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index cd25ada5d5..5f5060e8e8 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1082,8 +1082,10 @@ tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data)
 		} else {
 			GtkTreeIter iter;
 			GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
+			GtkTreeSelection *sel;
+
 			gtk_tree_model_get_iter_first (model, &iter);
-			GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
+			sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
 			gtk_tree_selection_select_iter (sel, &iter);
 		}
 	}
@@ -1579,6 +1581,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 	char *str, *start_str, *end_str, *alarm_str, *time_str;
 	icaltimezone *current_zone;
 	ECalComponentOrganizer organiser;
+	NotifyNotification *n;
 	char *body;
 
 	d(printf("%s:%d (popup_notification)\n",__FILE__, __LINE__));
@@ -1627,7 +1630,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 			body = g_strdup_printf ("%s %s", start_str, time_str);			
 	}
 
-	NotifyNotification *n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
+	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
 	if (!notify_notification_show(n, NULL))
 	    g_warning ("Could not send notification to daemon\n");	
 
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 71e31e0515..d74c23daef 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2340,6 +2340,7 @@ set_attachment_list (CompEditor *editor, GSList *attach_list)
 		CamelStream *stream;
 		struct stat statbuf;
 		char *mime_type, *file_name;		
+		char *ptr;
 
 		attach_filename = (char *) p->data;
 		/* should we assert if g_str_has_prefix (attach_filename, "file://")) 
@@ -2394,7 +2395,7 @@ set_attachment_list (CompEditor *editor, GSList *attach_list)
 	
 		camel_mime_part_set_disposition (part, "attachment");
 
-		char *ptr = strstr (file_name, comp_uid);
+		ptr = strstr (file_name, comp_uid);
 		if (ptr) {
 			ptr += strlen(comp_uid);
 			if (*ptr++ == '-')
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index c8be07a0a9..74cd4d2144 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -3058,9 +3058,9 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client)
 	for (it = e_list_get_iterator((EList *)priv->accounts);
 	     e_iterator_is_valid(it);
 	     e_iterator_next(it)) {
-		a = (EAccount *)e_iterator_get(it);
 		char *full;
 		
+		a = (EAccount *)e_iterator_get(it);
 		full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 		address_strings = g_list_append(address_strings, full);
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 15cf4ab83f..c0cade5155 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -1072,9 +1072,9 @@ memo_page_construct (MemoPage *mpage)
 		for (it = e_list_get_iterator((EList *)priv->accounts);
 				e_iterator_is_valid(it);
 				e_iterator_next(it)) {
-			a = (EAccount *)e_iterator_get(it);
 			char *full;
 
+			a = (EAccount *)e_iterator_get(it);
 			full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 			address_strings = g_list_append(address_strings, full);
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index c40a7e6f9f..79b07d012b 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1856,9 +1856,9 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
 	for (it = e_list_get_iterator((EList *)priv->accounts);
 	     e_iterator_is_valid(it);
 	     e_iterator_next(it)) {
-		a = (EAccount *)e_iterator_get(it);
 		char *full;
 		
+		a = (EAccount *)e_iterator_get(it);
 		full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 		address_strings = g_list_append(address_strings, full);
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index ab12a51ab2..a0c3ce2c3b 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -574,9 +574,10 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr
 		if (t->events->len == 1)
 			mask &= ~E_CAL_POPUP_SELECT_ONE;
 		else {
+			int i=0;
+
 			mask &= ~E_CAL_POPUP_SELECT_MANY;
 			/* Now check for any incomplete tasks and set the flags*/
-			int i=0;
 			for (; i < t->events->len; i++) {
 				ECalModelComponent *comp_data = (ECalModelComponent *)t->events->pdata[i];
 				if (!icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY)) 
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index ff794f1048..c3ea4e8d89 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -877,9 +877,7 @@ e_meeting_list_view_invite_others_dialog (EMeetingListView *view)
 void 
 e_meeting_list_view_set_editable (EMeetingListView *lview, gboolean set)
 {
-	EMeetingListViewPrivate *priv;
-
-	priv = lview->priv;
+	EMeetingListViewPrivate *priv = lview->priv;
 
 	gint edit_level = set;
 
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 14a2a80ffc..fec3839ddc 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -1430,8 +1430,10 @@ e_tasks_open_task_id (ETasks *tasks,
 		return;
 	
 	for (l = tasks->priv->clients_list; l != NULL; l = l->next) {
+		ESource *client_src;
+
 		client = l->data;
-		ESource *client_src = e_cal_get_source (client);
+		client_src = e_cal_get_source (client);
 
 		if (!strcmp (src_uid, e_source_peek_uid (client_src)))
 			break;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 6a00e4f37c..fb361ea7fa 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -3795,8 +3795,10 @@ gnome_calendar_edit_appointment (GnomeCalendar *gcal,
 		return;
 	
 	for (l = gcal->priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) {
+		ESource *client_src;
+
 		client = l->data;
-		ESource *client_src = e_cal_get_source (client);
+		client_src = e_cal_get_source (client);
 
 		if (!strcmp (src_uid, e_source_peek_uid (client_src)))
 			break;