From 0b1cd2dd5b0b2b35a0c12032b54ac51b97b22110 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 26 May 2010 17:19:41 -0400 Subject: Coding style and whitespace cleanup. --- addressbook/gui/contact-editor/e-contact-editor.c | 8 +++++--- addressbook/gui/widgets/e-addressbook-view.c | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 2f885e4721..5b2834b46b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -3508,6 +3508,10 @@ e_contact_editor_init (EContactEditor *e_contact_editor) GtkWidget *widget, *label; GtkEntryCompletion *completion; + /* FIXME The shell should be obtained + * through a constructor property. */ + shell = e_shell_get_default (); + e_contact_editor->name = e_contact_name_new(); e_contact_editor->contact = NULL; @@ -3518,7 +3522,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) e_contact_editor->target_editable = TRUE; e_contact_editor->fullname_dialog = NULL; e_contact_editor->categories_dialog = NULL; - e_contact_editor->compress_ui = e_shell_get_express_mode (e_shell_get_default ()); + e_contact_editor->compress_ui = e_shell_get_express_mode (shell); e_contact_editor->load_source_id = 0; e_contact_editor->load_book = NULL; @@ -3587,8 +3591,6 @@ e_contact_editor_init (EContactEditor *e_contact_editor) /* show window */ gtk_widget_show (e_contact_editor->app); - /* FIXME Shell should be passed in. */ - shell = e_shell_get_default (); e_shell_watch_window (shell, GTK_WINDOW (e_contact_editor->app)); } diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 88255fc0a9..70c3c2334e 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1518,7 +1518,9 @@ view_transfer_contacts (EAddressbookView *view, e_book_query_unref (query); if (error) { - e_alert_run_dialog_for_args (parent, "addressbook:search-error", error->message, NULL); + e_alert_run_dialog_for_args ( + parent, "addressbook:search-error", + error->message, NULL); g_error_free (error); return; } -- cgit v1.2.3