From c8d411ce2bc362cc76ad6d820e7397b3e8a01c3d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 27 Mar 2007 11:28:14 +0000 Subject: Don't mix declarations and code (#405495). 2007-03-27 Matthew Barnes * 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 --- plugins/exchange-operations/exchange-contacts.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'plugins/exchange-operations/exchange-contacts.c') 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) { -- cgit v1.2.3