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

2 files changed, 9 insertions, 4 deletions

diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog
index fecf14f5ee..ebd4d650bf 100644
--- a/plugins/import-ics-attachments/ChangeLog
+++ b/plugins/import-ics-attachments/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	* icsimporter.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/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c
index 4300c1216c..db5c96d1d0 100644
--- a/plugins/import-ics-attachments/icsimporter.c
+++ b/plugins/import-ics-attachments/icsimporter.c
@@ -198,6 +198,9 @@ init_widgets(char *path)
 	ESource *primary;
 	GtkWidget *scrolled;
 	ICalImporterData *icidata = g_malloc0(sizeof(*icidata));
+	GtkWidget *icon, *button;
+	char *label_str = NULL;
+	char *markup;
 
 	g_return_if_fail ( path != NULL);
 	dialog = gtk_dialog_new_with_buttons (_("Import ICS"), 
@@ -225,7 +228,6 @@ init_widgets(char *path)
 	subcomp = icalcomponent_get_inner(icidata->icalcomp);
 	kind = icalcomponent_isa (subcomp);
 
-	char *label_str = NULL;
 	if (kind == ICAL_VTODO_COMPONENT ) {
 		e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_TODO, NULL);
 		label_str = _("Select Task List");
@@ -236,7 +238,6 @@ init_widgets(char *path)
 		icidata->source_type = E_CAL_SOURCE_TYPE_EVENT;
 	}
 
-	char *markup;
 	markup = g_markup_printf_escaped ("<b>%s</b>", label_str);
 	gtk_label_set_markup (GTK_LABEL (label), markup);
 	hbox = gtk_hbox_new (FALSE, FALSE);
@@ -261,12 +262,12 @@ init_widgets(char *path)
 
 	g_object_unref (source_list);
 	hbox = gtk_hbox_new (FALSE, FALSE);
-	GtkWidget *icon = e_icon_factory_get_image ("stock_mail-import", E_ICON_SIZE_MENU);
+	icon = e_icon_factory_get_image ("stock_mail-import", E_ICON_SIZE_MENU);
 	gtk_box_pack_start (GTK_BOX(hbox), icon, FALSE, FALSE, 6);
 	label = gtk_label_new_with_mnemonic (_("_Import"));
 	gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 6);
 	gtk_widget_show(label);
-	GtkWidget *button = gtk_button_new ();
+	button = gtk_button_new ();
 	gtk_container_add (GTK_CONTAINER (button), hbox);
 	gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
 	gtk_widget_grab_focus (button);