From 81e5428a59194dd38cf2a07b2d3f9b4b6f81f6ef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Jul 2010 00:30:38 -0400 Subject: Coding style and whitespace cleanup. --- modules/mail/e-mail-shell-content.c | 21 ++++++++++----------- modules/mail/e-mail-shell-view-private.c | 2 +- modules/mail/e-mail-shell-view.c | 3 +-- modules/mail/evolution-module-mail.c | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) (limited to 'modules') diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index 9c73c74c8e..6e5168c8a4 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -51,7 +51,7 @@ ((obj), E_TYPE_MAIL_SHELL_CONTENT, EMailShellContentPrivate)) struct _EMailShellContentPrivate { - int temp; + gint temp; }; enum { @@ -121,7 +121,7 @@ mail_shell_content_constructed (GObject *object) /* Build content widgets. */ container = GTK_WIDGET (object); - + if (e_shell_get_express_mode(e_shell_get_default ())) { widget = e_mail_notebook_view_new (E_SHELL_CONTENT(object)); g_signal_connect (widget, "view-changed", G_CALLBACK(msc_view_changed), object); @@ -155,10 +155,10 @@ mail_shell_content_focus_search_results (EShellContent *shell_content) gtk_widget_grab_focus (e_mail_reader_get_message_list(E_MAIL_READER (E_MAIL_SHELL_CONTENT(shell_content)->view))); } -static void +static guint mail_shell_content_open_selected_mail (EMailReader *reader) { - e_mail_reader_open_selected_mail (E_MAIL_READER(E_MAIL_SHELL_CONTENT(reader)->view)); + return e_mail_reader_open_selected_mail (E_MAIL_READER(E_MAIL_SHELL_CONTENT(reader)->view)); } static GtkActionGroup * @@ -172,7 +172,7 @@ mail_shell_content_get_action_group (EMailReader *reader) shell_view = e_shell_content_get_shell_view (shell_content); shell_window = e_shell_view_get_shell_window (shell_view); - return E_SHELL_WINDOW_ACTION_GROUP_MAIL (shell_window); + return E_SHELL_WINDOW_ACTION_GROUP_MAIL (shell_window); } static EMFormatHTML * @@ -216,7 +216,7 @@ mail_shell_content_set_folder (EMailReader *reader, CamelFolder *folder, const gchar *folder_uri) { - return e_mail_reader_set_folder (E_MAIL_READER(E_MAIL_SHELL_CONTENT(reader)->view), + return e_mail_reader_set_folder (E_MAIL_READER(E_MAIL_SHELL_CONTENT(reader)->view), folder, folder_uri); } @@ -320,7 +320,6 @@ mail_shell_content_class_init (EMailShellContentClass *class) object_class->set_property = mail_shell_content_set_property; object_class->get_property = mail_shell_content_get_property; - shell_content_class = E_SHELL_CONTENT_CLASS (class); shell_content_class->check_state = mail_shell_content_check_state; shell_content_class->focus_search_results = mail_shell_content_focus_search_results; @@ -351,7 +350,7 @@ mail_shell_content_class_init (EMailShellContentClass *class) G_PARAM_READWRITE)); g_object_class_override_property ( - object_class, PROP_ORIENTATION, "orientation"); + object_class, PROP_ORIENTATION, "orientation"); } static void @@ -411,19 +410,19 @@ e_mail_shell_content_register_type (GTypeModule *type_module) (GInterfaceFinalizeFunc) NULL, NULL /* interface_data */ }; - + mail_shell_content_type = g_type_module_register_type ( type_module, E_TYPE_SHELL_CONTENT, "EMailShellContent", &type_info, 0); g_type_module_add_interface ( type_module, mail_shell_content_type, - E_TYPE_MAIL_READER, &reader_info); + E_TYPE_MAIL_READER, &reader_info); g_type_module_add_interface ( type_module, mail_shell_content_type, GTK_TYPE_ORIENTABLE, &orientable_info); - + } GtkWidget * diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 2cfcf9fb72..c34a20526f 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -358,7 +358,7 @@ mail_shell_view_reader_changed_cb (EMailShellView *mail_shell_view, g_signal_connect_swapped ( web_view, "status-message", G_CALLBACK (e_shell_taskbar_set_message), - shell_taskbar); + shell_taskbar); } static void diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 5a469d8379..12e0c0b0f1 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -795,7 +795,7 @@ mail_shell_view_update_actions (EShellView *shell_view) shell_window = e_shell_view_get_shell_window (shell_view); mail_shell_content = mail_shell_view->priv->mail_shell_content; - reader = E_MAIL_READER (mail_shell_content->view); + reader = E_MAIL_READER (mail_shell_content->view); state = e_mail_reader_check_state (reader); e_mail_reader_update_actions (reader, state); @@ -862,7 +862,6 @@ mail_shell_view_update_actions (EShellView *shell_view) g_free (uri); } - action = ACTION (MAIL_ACCOUNT_DISABLE); sensitive = (account != NULL) && folder_is_store; if (account_is_groupwise) diff --git a/modules/mail/evolution-module-mail.c b/modules/mail/evolution-module-mail.c index d5b87d951d..cc4e8f41aa 100644 --- a/modules/mail/evolution-module-mail.c +++ b/modules/mail/evolution-module-mail.c @@ -54,7 +54,7 @@ e_module_load (GTypeModule *type_module) e_mail_shell_backend_register_type (type_module); e_mail_shell_content_register_type (type_module); - e_mail_paned_view_register_type (type_module); + e_mail_paned_view_register_type (type_module); e_mail_notebook_view_register_type (type_module); e_mail_shell_sidebar_register_type (type_module); e_mail_shell_view_register_type (type_module); -- cgit v1.2.3