From ceea3a0a1feaa25b8022852b52b7dab1bdf5eb5d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 Jun 2012 16:52:01 -0400 Subject: Reduce diff noise with 'account-mgmt' branch. One last time. --- modules/addressbook/autocompletion-config.c | 2 -- modules/addressbook/autocompletion-config.h | 2 +- modules/addressbook/e-book-shell-backend.c | 12 ++++++++---- modules/calendar/e-cal-attachment-handler.c | 6 ++++-- modules/calendar/e-cal-shell-backend.c | 18 ++++++++++++------ modules/calendar/e-cal-shell-view-memopad.c | 2 ++ modules/calendar/e-cal-shell-view-private.c | 4 ++-- modules/calendar/e-cal-shell-view-taskpad.c | 2 ++ modules/calendar/e-memo-shell-backend.c | 12 ++++++++---- modules/calendar/e-memo-shell-view-actions.c | 3 +++ modules/calendar/e-task-shell-backend.c | 12 ++++++++---- modules/calendar/e-task-shell-content.c | 4 ++-- modules/calendar/e-task-shell-sidebar.c | 3 ++- modules/calendar/e-task-shell-view-actions.c | 3 +++ modules/mail/e-mail-shell-backend.h | 17 ++++++++++------- modules/mail/e-mail-shell-view-actions.c | 3 ++- modules/online-accounts/camel-sasl-xoauth.c | 11 +++++------ 17 files changed, 74 insertions(+), 42 deletions(-) (limited to 'modules') diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c index 985eafaff5..f8199eef84 100644 --- a/modules/addressbook/autocompletion-config.c +++ b/modules/addressbook/autocompletion-config.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H #include -#endif #include "autocompletion-config.h" diff --git a/modules/addressbook/autocompletion-config.h b/modules/addressbook/autocompletion-config.h index c4630f8d66..2cebea1b4a 100644 --- a/modules/addressbook/autocompletion-config.h +++ b/modules/addressbook/autocompletion-config.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS -GtkWidget *autocompletion_config_new (EPreferencesWindow *window); +GtkWidget * autocompletion_config_new (EPreferencesWindow *window); G_END_DECLS diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index 5a564e8fa4..a10eefa01d 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -284,13 +284,17 @@ action_contact_new_cb (GtkAction *action, /* Use a callback function appropriate for the action. */ action_name = gtk_action_get_name (action); if (strcmp (action_name, "contact-new") == 0) - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - book_shell_backend_new_contact_cb, g_object_ref (shell)); + book_shell_backend_new_contact_cb, + g_object_ref (shell)); if (strcmp (action_name, "contact-new-list") == 0) - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - book_shell_backend_new_contact_list_cb, g_object_ref (shell)); + book_shell_backend_new_contact_list_cb, + g_object_ref (shell)); g_object_unref (source_list); } diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c index 403345d8ec..360635e45f 100644 --- a/modules/calendar/e-cal-attachment-handler.c +++ b/modules/calendar/e-cal-attachment-handler.c @@ -363,13 +363,15 @@ attachment_handler_run_dialog (GtkWindow *parent, e_client_utils_open_new ( source, E_CLIENT_SOURCE_TYPE_EVENTS, FALSE, NULL, e_client_utils_authenticate_handler, NULL, - attachment_handler_import_event, g_object_ref (attachment)); + attachment_handler_import_event, + g_object_ref (attachment)); break; case E_CAL_CLIENT_SOURCE_TYPE_TASKS: e_client_utils_open_new ( source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL, e_client_utils_authenticate_handler, NULL, - attachment_handler_import_todo, g_object_ref (attachment)); + attachment_handler_import_todo, + g_object_ref (attachment)); break; default: break; diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index e73eca5d42..bcc4ade035 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -422,17 +422,23 @@ action_event_new_cb (GtkAction *action, /* Use a callback function appropriate for the action. * FIXME Need to obtain a better default time zone. */ if (strcmp (action_name, "event-all-day-new") == 0) - e_client_utils_open_new (source, source_type, FALSE, NULL, + e_client_utils_open_new ( + source, source_type, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - cal_shell_backend_event_all_day_new_cb, g_object_ref (shell)); + cal_shell_backend_event_all_day_new_cb, + g_object_ref (shell)); else if (strcmp (action_name, "event-meeting-new") == 0) - e_client_utils_open_new (source, source_type, FALSE, NULL, + e_client_utils_open_new ( + source, source_type, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - cal_shell_backend_event_meeting_new_cb, g_object_ref (shell)); + cal_shell_backend_event_meeting_new_cb, + g_object_ref (shell)); else - e_client_utils_open_new (source, source_type, FALSE, NULL, + e_client_utils_open_new ( + source, source_type, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - cal_shell_backend_event_new_cb, g_object_ref (shell)); + cal_shell_backend_event_new_cb, + g_object_ref (shell)); g_object_unref (source_list); } diff --git a/modules/calendar/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c index 4978ca2183..eab1254415 100644 --- a/modules/calendar/e-cal-shell-view-memopad.c +++ b/modules/calendar/e-cal-shell-view-memopad.c @@ -50,9 +50,11 @@ action_calendar_memopad_forward_cb (GtkAction *action, comp = e_cal_component_new (); clone = icalcomponent_new_clone (comp_data->icalcomp); e_cal_component_set_icalcomponent (comp, clone); + itip_send_comp ( E_CAL_COMPONENT_METHOD_PUBLISH, comp, comp_data->client, NULL, NULL, NULL, TRUE, FALSE); + g_object_unref (comp); } diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index c256c9aebe..5418d6cab9 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -712,8 +712,8 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view) e_cal_shell_view_search_stop (cal_shell_view); - /* Calling calendar's save state from here, - * because it is too late in its dispose. */ + /* Calling ECalShellContent's save state from here, + * because it is too late in its own dispose(). */ if (priv->cal_shell_content != NULL) e_cal_shell_content_save_state (priv->cal_shell_content); diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c index 92263c75e3..5a88c7d92c 100644 --- a/modules/calendar/e-cal-shell-view-taskpad.c +++ b/modules/calendar/e-cal-shell-view-taskpad.c @@ -73,9 +73,11 @@ action_calendar_taskpad_forward_cb (GtkAction *action, comp = e_cal_component_new (); clone = icalcomponent_new_clone (comp_data->icalcomp); e_cal_component_set_icalcomponent (comp, clone); + itip_send_comp ( E_CAL_COMPONENT_METHOD_PUBLISH, comp, comp_data->client, NULL, NULL, NULL, TRUE, FALSE); + g_object_unref (comp); } diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index 127473d582..c34808698e 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -283,13 +283,17 @@ action_memo_new_cb (GtkAction *action, * FIXME Need to obtain a better default time zone. */ action_name = gtk_action_get_name (action); if (g_strcmp0 (action_name, "memo-shared-new") == 0) - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - memo_shell_backend_memo_shared_new_cb, g_object_ref (shell)); + memo_shell_backend_memo_shared_new_cb, + g_object_ref (shell)); else - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - memo_shell_backend_memo_new_cb, g_object_ref (shell)); + memo_shell_backend_memo_new_cb, + g_object_ref (shell)); g_object_unref (source_list); } diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c index 4c2025910a..44625ad670 100644 --- a/modules/calendar/e-memo-shell-view-actions.c +++ b/modules/calendar/e-memo-shell-view-actions.c @@ -95,9 +95,11 @@ action_memo_forward_cb (GtkAction *action, comp = e_cal_component_new (); clone = icalcomponent_new_clone (comp_data->icalcomp); e_cal_component_set_icalcomponent (comp, clone); + itip_send_comp ( E_CAL_COMPONENT_METHOD_PUBLISH, comp, comp_data->client, NULL, NULL, NULL, TRUE, FALSE); + g_object_unref (comp); } @@ -166,6 +168,7 @@ action_memo_list_delete_cb (GtkAction *action, GTK_WINDOW (shell_window), "calendar:prompt-delete-memo-list", e_source_get_display_name (source), NULL); + if (response != GTK_RESPONSE_YES) { g_object_unref (source); return; diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 786e9c6910..0bcf95d31d 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -278,13 +278,17 @@ action_task_new_cb (GtkAction *action, * FIXME Need to obtain a better default time zone. */ action_name = gtk_action_get_name (action); if (strcmp (action_name, "task-assigned-new") == 0) - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - task_shell_backend_task_assigned_new_cb, g_object_ref (shell)); + task_shell_backend_task_assigned_new_cb, + g_object_ref (shell)); else - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL, e_client_utils_authenticate_handler, GTK_WINDOW (shell_window), - task_shell_backend_task_new_cb, g_object_ref (shell)); + task_shell_backend_task_new_cb, + g_object_ref (shell)); g_object_unref (source_list); } diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index 8284a63446..73351d0cf0 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -427,10 +427,10 @@ static void task_shell_content_constructed (GObject *object) { ETaskShellContentPrivate *priv; + EShellView *shell_view; + EShellWindow *shell_window; EShellContent *shell_content; EShellTaskbar *shell_taskbar; - EShellWindow *shell_window; - EShellView *shell_view; GalViewInstance *view_instance; GtkTargetList *target_list; GtkTargetEntry *targets; diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index 4667ae4ed6..3a9a09ad16 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -750,7 +750,8 @@ task_shell_sidebar_check_state (EShellSidebar *shell_sidebar) client = g_hash_table_lookup ( task_shell_sidebar->priv->client_table, e_source_get_uid (source)); - refresh_supported = client && + refresh_supported = + client != NULL && e_client_check_refresh_supported (E_CLIENT (client)); g_object_unref (source); diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c index badfbf031d..c15597b082 100644 --- a/modules/calendar/e-task-shell-view-actions.c +++ b/modules/calendar/e-task-shell-view-actions.c @@ -118,9 +118,11 @@ action_task_forward_cb (GtkAction *action, comp = e_cal_component_new (); clone = icalcomponent_new_clone (comp_data->icalcomp); e_cal_component_set_icalcomponent (comp, clone); + itip_send_comp ( E_CAL_COMPONENT_METHOD_PUBLISH, comp, comp_data->client, NULL, NULL, NULL, TRUE, FALSE); + g_object_unref (comp); } @@ -189,6 +191,7 @@ action_task_list_delete_cb (GtkAction *action, GTK_WINDOW (shell_window), "calendar:prompt-delete-task-list", e_source_get_display_name (source), NULL); + if (response != GTK_RESPONSE_YES) { g_object_unref (source); return; diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h index c9c23d045d..3b820a0439 100644 --- a/modules/mail/e-mail-shell-backend.h +++ b/modules/mail/e-mail-shell-backend.h @@ -59,14 +59,17 @@ struct _EMailShellBackendClass { EMailBackendClass parent_class; }; -GType e_mail_shell_backend_get_type (void); -void e_mail_shell_backend_type_register (GTypeModule *type_module); +GType e_mail_shell_backend_get_type (void); +void e_mail_shell_backend_type_register + (GTypeModule *type_module); -void e_mail_shell_backend_new_account (EMailShellBackend *mail_shell_backend, - GtkWindow *parent); -void e_mail_shell_backend_edit_account (EMailShellBackend *mail_shell_backend, - GtkWindow *parent, - EAccount *account); +void e_mail_shell_backend_new_account + (EMailShellBackend *mail_shell_backend, + GtkWindow *parent); +void e_mail_shell_backend_edit_account + (EMailShellBackend *mail_shell_backend, + GtkWindow *parent, + EAccount *account); /* XXX Find a better place for this function. */ GSList * e_mail_labels_get_filter_options (void); diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index bcda07c7a1..5de1e509fb 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -139,7 +139,8 @@ action_mail_account_properties_cb (GtkAction *action, service = CAMEL_SERVICE (store); uid = camel_service_get_uid (service); - e_mail_shell_backend_edit_account (E_MAIL_SHELL_BACKEND (shell_backend), + e_mail_shell_backend_edit_account ( + E_MAIL_SHELL_BACKEND (shell_backend), GTK_WINDOW (shell_window), e_get_account_by_uid (uid)); } diff --git a/modules/online-accounts/camel-sasl-xoauth.c b/modules/online-accounts/camel-sasl-xoauth.c index 7b1a59aa24..e3cbb69f80 100644 --- a/modules/online-accounts/camel-sasl-xoauth.c +++ b/modules/online-accounts/camel-sasl-xoauth.c @@ -16,19 +16,18 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +/* XXX Yeah, yeah... */ +#define GOA_API_IS_SUBJECT_TO_CHANGE +#include #include +#include + #include #include "camel-sasl-xoauth.h" -#define GOA_API_IS_SUBJECT_TO_CHANGE -#include - #define CAMEL_SASL_XOAUTH_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), CAMEL_TYPE_SASL_XOAUTH, CamelSaslXOAuthPrivate)) -- cgit v1.2.3