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, 8 insertions, 15 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 8dab79c465..1f857e593a 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -606,12 +606,9 @@ sensitize_ok (EContactEditor *ce)
 {
 	GtkWidget *widget;
 	gboolean   allow_save;
-	GtkWidget *entry_fullname;
-	GtkWidget *entry_file_as;
-	GtkWidget *company_name;
-	entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" );
-	entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as");
-	company_name = glade_xml_get_widget (ce->gui, "entry-company");
+	GtkWidget *entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" );
+	GtkWidget *entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as");
+	GtkWidget *company_name = glade_xml_get_widget (ce->gui, "entry-company");
 	const char *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname));
 	const char *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as));
 	const char *company_name_string = gtk_entry_get_text (GTK_ENTRY (company_name));
@@ -3003,12 +3000,9 @@ save_contact (EContactEditor *ce, gboolean should_close)
 			return;
 	}
 
-	GtkWidget *entry_fullname;
-	GtkWidget *entry_file_as;
-	GtkWidget *company_name;
-	entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" );
-	entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as");
-	company_name = glade_xml_get_widget (ce->gui, "entry-company");
+	GtkWidget *entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" );
+	GtkWidget *entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as");
+	GtkWidget *company_name = glade_xml_get_widget (ce->gui, "entry-company");
 	const char *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname));
 	const char *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as));
 	const char *company_name_string = gtk_entry_get_text (GTK_ENTRY (company_name));
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 549b8ecb83..ea3e7b6f35 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -279,6 +279,8 @@ source_selected (GtkWidget *source_option_menu, ESource *source, QuickAdd *qa)
 static GtkWidget *
 build_quick_add_dialog (QuickAdd *qa)
 {
+	ESourceList *source_list;
+	GConfClient *gconf_client;
 	GtkWidget *dialog;
 	GtkWidget *label;
 	GtkTable *table;
@@ -312,9 +314,6 @@ build_quick_add_dialog (QuickAdd *qa)
 	if (qa->email)
 		gtk_entry_set_text (GTK_ENTRY (qa->email_entry), qa->email);
 
-	ESourceList *source_list;
-	GConfClient *gconf_client;
-
 	gconf_client = gconf_client_get_default ();
 	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
 	qa->option_menu = e_source_option_menu_new (source_list);