diff options
-rw-r--r-- | addressbook/gui/merging/eab-contact-merging.c | 2 | ||||
-rw-r--r-- | calendar/alarm-notify/alarm-queue.c | 6 | ||||
-rw-r--r-- | calendar/gui/dialogs/alarm-dialog.c | 8 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-page.c | 14 | ||||
-rw-r--r-- | calendar/gui/e-cal-list-view.c | 10 | ||||
-rw-r--r-- | calendar/gui/e-calendar-view.c | 4 | ||||
-rw-r--r-- | composer/e-msg-composer.c | 10 | ||||
-rw-r--r-- | e-util/e-alert-dialog.c | 4 | ||||
-rw-r--r-- | e-util/e-table-click-to-add.c | 4 | ||||
-rw-r--r-- | e-util/e-table-group-leaf.c | 10 | ||||
-rw-r--r-- | e-util/e-table-group.c | 10 | ||||
-rw-r--r-- | e-util/e-table.c | 8 | ||||
-rw-r--r-- | e-util/e-tree.c | 4 | ||||
-rw-r--r-- | libemail-engine/e-mail-utils.c | 2 | ||||
-rw-r--r-- | mail/em-composer-utils.c | 4 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-view-actions.c | 6 | ||||
-rw-r--r-- | modules/cal-config-google/e-google-chooser.c | 2 | ||||
-rw-r--r-- | modules/cal-config-google/evolution-cal-config-google.c | 3 | ||||
-rw-r--r-- | modules/calendar/e-cal-shell-content.c | 13 | ||||
-rw-r--r-- | modules/calendar/e-memo-shell-content.c | 7 | ||||
-rw-r--r-- | modules/calendar/e-task-shell-content.c | 7 | ||||
-rw-r--r-- | shell/e-shell-window-actions.c | 2 |
22 files changed, 74 insertions, 66 deletions
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 6ba850de2f..fb11e37629 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -288,7 +288,7 @@ dropdown_changed (GtkWidget *dropdown, static void email_dropdown_changed (GtkWidget *dropdown, - dropdown_data *data) + dropdown_data *data) { gchar *str = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (dropdown)); diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c index 93dfed9d64..87b6e92e19 100644 --- a/calendar/alarm-notify/alarm-queue.c +++ b/calendar/alarm-notify/alarm-queue.c @@ -1595,9 +1595,9 @@ tray_list_add_new (TrayIconData *data) static void alarm_queue_get_alarm_summary (ECalComponent *comp, - const ECalComponentAlarmInstance *instance, - ECalComponentText *text, - ECalComponentAlarm **palarm) + const ECalComponentAlarmInstance *instance, + ECalComponentText *text, + ECalComponentAlarm **palarm) { g_return_if_fail (comp != NULL); g_return_if_fail (instance != NULL); diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index a51fadef5f..a1c73b43c6 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -184,9 +184,9 @@ clear_widgets (Dialog *dialog) static void populate_relative_time_combobox_widget (GtkWidget *combobox, - ECalClient *cal_client, - const gint *map, - gint prop) + ECalClient *cal_client, + const gint *map, + gint prop) { GtkTreeModel *model; GtkTreeIter iter; @@ -817,7 +817,7 @@ dialog_to_alarm (Dialog *dialog) static void build_combobox_widget (GtkWidget *combobox, - const gchar *actions[]) + const gchar *actions[]) { GtkComboBox *combo = GTK_COMBO_BOX (combobox); GtkCellRenderer *cell; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 7971bfbe2c..b1f68d3381 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -2206,7 +2206,7 @@ complete_date_changed (TaskPage *tpage, static void completed_date_changed_cb (EDateEdit *dedit, - TaskPage *tpage) + TaskPage *tpage) { TaskPagePrivate *priv = tpage->priv; CompEditorPageDates dates = {NULL, NULL, NULL, NULL}; @@ -2351,9 +2351,9 @@ percent_complete_changed (GtkAdjustment *adj, static gboolean task_page_transform_classification_to_combo (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer user_data) + const GValue *source_value, + GValue *target_value, + gpointer user_data) { gint action_value; @@ -2368,9 +2368,9 @@ task_page_transform_classification_to_combo (GBinding *binding, static gboolean task_page_transform_classification_from_combo (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer user_data) + const GValue *source_value, + GValue *target_value, + gpointer user_data) { gint combo_value; diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 844ce26480..b4bf105a7b 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -74,9 +74,9 @@ G_DEFINE_TYPE (ECalListView, e_cal_list_view, E_TYPE_CALENDAR_VIEW) static void e_cal_list_view_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) + guint property_id, + GValue *value, + GParamSpec *pspec) { ECalListView *eclv = E_CAL_LIST_VIEW (object); @@ -152,8 +152,8 @@ get_current_time_cb (ECellDateEdit *ecde, static void e_cal_list_view_table_editing_changed_cb (ETable *table, - GParamSpec *param, - ECalListView *eclv) + GParamSpec *param, + ECalListView *eclv) { g_return_if_fail (E_IS_CAL_LIST_VIEW (eclv)); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 54df73aac3..93734c9347 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -2375,8 +2375,8 @@ e_calendar_view_is_editing (ECalendarView *cal_view) g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE); /* this should be called from the main thread only, - and each descendant overrides the property, - thus might cause no call recursion */ + * and each descendant overrides the property, + * thus might cause no call recursion */ if (in) { g_warn_if_reached (); return FALSE; diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index d247180734..cd04183dd2 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -183,7 +183,7 @@ static gchar * emcu_part_to_html (EMsgComposer *composer, CamelMimePart *part, gssize *len, - gboolean keep_signature, + gboolean keep_signature, GCancellable *cancellable) { CamelSession *session; @@ -2648,7 +2648,7 @@ e_msg_composer_add_message_attachments (EMsgComposer *composer, static void handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, - gboolean keep_signature, + gboolean keep_signature, GCancellable *cancellable, gint depth) { @@ -2729,7 +2729,7 @@ handle_multipart_signed (EMsgComposer *composer, static void handle_multipart_encrypted (EMsgComposer *composer, CamelMimePart *multipart, - gboolean keep_signature, + gboolean keep_signature, GCancellable *cancellable, gint depth) { @@ -2822,7 +2822,7 @@ handle_multipart_encrypted (EMsgComposer *composer, static void handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart, - gboolean keep_signature, + gboolean keep_signature, GCancellable *cancellable, gint depth) { @@ -2897,7 +2897,7 @@ handle_multipart_alternative (EMsgComposer *composer, static void handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, - gboolean keep_signature, + gboolean keep_signature, GCancellable *cancellable, gint depth) { diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c index 156c2729ac..8b495c17db 100644 --- a/e-util/e-alert-dialog.c +++ b/e-util/e-alert-dialog.c @@ -324,8 +324,8 @@ e_alert_dialog_new_for_args (GtkWindow *parent, static gboolean dialog_focus_in_event_cb (GtkWindow *dialog, - GdkEvent *event, - GtkWindow *parent) + GdkEvent *event, + GtkWindow *parent) { gtk_window_set_urgency_hint (parent, FALSE); diff --git a/e-util/e-table-click-to-add.c b/e-util/e-table-click-to-add.c index 2f36b1899d..d5202f7a03 100644 --- a/e-util/e-table-click-to-add.c +++ b/e-util/e-table-click-to-add.c @@ -373,8 +373,8 @@ set_initial_selection (ETableClickToAdd *etcta) static void table_click_to_add_row_is_editing_changed_cb (ETableItem *item, - GParamSpec *param, - ETableClickToAdd *etcta) + GParamSpec *param, + ETableClickToAdd *etcta) { g_return_if_fail (E_IS_TABLE_CLICK_TO_ADD (etcta)); diff --git a/e-util/e-table-group-leaf.c b/e-util/e-table-group-leaf.c index a052e36913..bf1ef1b865 100644 --- a/e-util/e-table-group-leaf.c +++ b/e-util/e-table-group-leaf.c @@ -61,8 +61,8 @@ enum { static void etgl_item_is_editing_changed_cb (ETableItem *item, - GParamSpec *param, - ETableGroupLeaf *etgl) + GParamSpec *param, + ETableGroupLeaf *etgl) { g_return_if_fail (E_IS_TABLE_GROUP_LEAF (etgl)); @@ -109,7 +109,8 @@ etgl_dispose (GObject *object) etgl->item, etgl->etgl_start_drag_id); - g_signal_handlers_disconnect_by_func (etgl->item, + g_signal_handlers_disconnect_by_func ( + etgl->item, etgl_item_is_editing_changed_cb, etgl); etgl->etgl_cursor_change_id = 0; @@ -368,7 +369,8 @@ etgl_realize (GnomeCanvasItem *item) etgl->item, "start_drag", G_CALLBACK (etgl_start_drag), etgl); - g_signal_connect (etgl->item, "notify::is-editing", + g_signal_connect ( + etgl->item, "notify::is-editing", G_CALLBACK (etgl_item_is_editing_changed_cb), etgl); e_canvas_item_request_reflow (item); diff --git a/e-util/e-table-group.c b/e-util/e-table-group.c index 1c9ed2c39b..161ab68522 100644 --- a/e-util/e-table-group.c +++ b/e-util/e-table-group.c @@ -85,9 +85,9 @@ etg_dispose (GObject *object) static void etg_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) + guint property_id, + GValue *value, + GParamSpec *pspec) { ETableGroup *etg = E_TABLE_GROUP (object); @@ -795,8 +795,8 @@ e_table_group_is_editing (ETableGroup *table_group) g_return_val_if_fail (E_IS_TABLE_GROUP (table_group), FALSE); /* this should be called from the main thread only, - and each descendant overrides the property, - thus might cause no call recursion */ + * and each descendant overrides the property, + * thus might cause no call recursion */ if (in) { g_warn_if_reached (); return FALSE; diff --git a/e-util/e-table.c b/e-util/e-table.c index 9d6db60222..19298a90ab 100644 --- a/e-util/e-table.c +++ b/e-util/e-table.c @@ -1072,8 +1072,8 @@ et_table_rows_deleted (ETableModel *table_model, static void group_is_editing_changed_cb (ETableClickToAdd *etcta, - GParamSpec *param, - ETable *table) + GParamSpec *param, + ETable *table) { g_return_if_fail (E_IS_TABLE (table)); @@ -1371,8 +1371,8 @@ canvas_vbox_event (ECanvasVbox *vbox, static void click_to_add_is_editing_changed_cb (ETableClickToAdd *etcta, - GParamSpec *param, - ETable *table) + GParamSpec *param, + ETable *table) { g_return_if_fail (E_IS_TABLE (table)); diff --git a/e-util/e-tree.c b/e-util/e-tree.c index b861fa6ca1..de11f96d19 100644 --- a/e-util/e-tree.c +++ b/e-util/e-tree.c @@ -261,8 +261,8 @@ G_DEFINE_TYPE_WITH_CODE (ETree, e_tree, GTK_TYPE_TABLE, static void tree_item_is_editing_changed_cb (ETableItem *item, - GParamSpec *param, - ETree *tree) + GParamSpec *param, + ETree *tree) { g_return_if_fail (E_IS_TREE (tree)); diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c index 7ebb8f952e..4afa0cec53 100644 --- a/libemail-engine/e-mail-utils.c +++ b/libemail-engine/e-mail-utils.c @@ -689,7 +689,7 @@ em_utils_is_local_delivery_mbox_file (CamelURL *url) } /* Expands groups to individual addresses, or removes empty groups completely. - Usual email addresses are left untouched. + * Usual email addresses are left untouched. */ void em_utils_expand_groups (CamelInternetAddress *addresses) diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 5f2bd0aa54..1980ac902c 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1008,8 +1008,8 @@ em_utils_composer_print_cb (EMsgComposer *composer, EMailSession *session) { /* as long as EMsgComposer uses GtkHTML, use its routine for printing; - this conditional compile is here rather to not forget to fix this - once the WebKit-based composer will land */ + * this conditional compile is here rather to not forget to fix this + * once the WebKit-based composer will land */ #if defined(GTK_TYPE_HTML) EWebViewGtkHTML *gtkhtml_web_view; GtkPrintOperation *operation; diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index fe43821eaf..d2fe86e0ca 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -202,8 +202,8 @@ action_address_book_properties_cb (GtkAction *action, static void address_book_refresh_done_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { EClient *client; GError *error = NULL; @@ -228,7 +228,7 @@ address_book_refresh_done_cb (GObject *source_object, static void action_address_book_refresh_cb (GtkAction *action, - EBookShellView *book_shell_view) + EBookShellView *book_shell_view) { EBookShellSidebar *book_shell_sidebar; ESourceSelector *selector; diff --git a/modules/cal-config-google/e-google-chooser.c b/modules/cal-config-google/e-google-chooser.c index 1a4ebbcfb8..ed3365ce44 100644 --- a/modules/cal-config-google/e-google-chooser.c +++ b/modules/cal-config-google/e-google-chooser.c @@ -627,7 +627,7 @@ e_google_chooser_apply_selected (EGoogleChooser *chooser) void e_google_chooser_construct_default_uri (SoupURI *soup_uri, - const gchar *username) + const gchar *username) { gchar *decoded_user, *path; diff --git a/modules/cal-config-google/evolution-cal-config-google.c b/modules/cal-config-google/evolution-cal-config-google.c index 9f6310b036..5b095150a3 100644 --- a/modules/cal-config-google/evolution-cal-config-google.c +++ b/modules/cal-config-google/evolution-cal-config-google.c @@ -127,7 +127,8 @@ cal_config_google_commit_changes (ESourceConfigBackend *backend, ESourceAuthentication *authentication_extension = e_source_get_extension (scratch_source, E_SOURCE_EXTENSION_AUTHENTICATION); - e_google_chooser_construct_default_uri (soup_uri, + e_google_chooser_construct_default_uri ( + soup_uri, e_source_authentication_get_user (authentication_extension)); } diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index cccc9993e8..6e35a1fc66 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -319,8 +319,8 @@ gc_get_default_time (ECalModel *model, static void cal_shell_content_is_editing_changed_cb (gpointer cal_view_tasks_memos_table, - GParamSpec *param, - EShellView *shell_view) + GParamSpec *param, + EShellView *shell_view) { g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); @@ -408,7 +408,8 @@ cal_shell_content_constructed (GObject *object) for (ii = 0; ii < GNOME_CAL_LAST_VIEW; ii++) { calendar_view = gnome_calendar_get_calendar_view (calendar, ii); - g_signal_connect (calendar_view, "notify::is-editing", + g_signal_connect ( + calendar_view, "notify::is-editing", G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view); gtk_notebook_append_page ( @@ -465,7 +466,8 @@ cal_shell_content_constructed (GObject *object) G_CALLBACK (e_cal_shell_view_taskpad_open_task), shell_view); - g_signal_connect (widget, "notify::is-editing", + g_signal_connect ( + widget, "notify::is-editing", G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view); container = priv->vpaned; @@ -510,7 +512,8 @@ cal_shell_content_constructed (GObject *object) G_CALLBACK (e_cal_shell_view_memopad_open_memo), shell_view); - g_signal_connect (widget, "notify::is-editing", + g_signal_connect ( + widget, "notify::is-editing", G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view); /* Load the view instance. */ diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index ec97019f65..bf715ec4d9 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -292,8 +292,8 @@ memo_shell_content_restore_state_cb (EShellWindow *shell_window, static void memo_shell_content_is_editing_changed_cb (EMemoTable *memo_table, - GParamSpec *param, - EShellView *shell_view) + GParamSpec *param, + EShellView *shell_view) { g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); @@ -532,7 +532,8 @@ memo_shell_content_constructed (GObject *object) G_CALLBACK (memo_shell_content_selection_change_cb), object); - g_signal_connect (priv->memo_table, "notify::is-editing", + g_signal_connect ( + priv->memo_table, "notify::is-editing", G_CALLBACK (memo_shell_content_is_editing_changed_cb), shell_view); g_signal_connect_swapped ( diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index 33c65081c4..cff476d4b0 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -291,8 +291,8 @@ task_shell_content_restore_state_cb (EShellWindow *shell_window, static void task_shell_content_is_editing_changed_cb (ETaskTable *task_table, - GParamSpec *param, - EShellView *shell_view) + GParamSpec *param, + EShellView *shell_view) { g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); @@ -531,7 +531,8 @@ task_shell_content_constructed (GObject *object) G_CALLBACK (task_shell_content_selection_change_cb), object); - g_signal_connect (priv->task_table, "notify::is-editing", + g_signal_connect ( + priv->task_table, "notify::is-editing", G_CALLBACK (task_shell_content_is_editing_changed_cb), shell_view); g_signal_connect_swapped ( diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 937ce5b391..a777417cf4 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1191,7 +1191,7 @@ static GtkActionEntry shell_gal_view_entries[] = { NULL, N_("Delete Current View"), NULL, - NULL, /* Set in update_view_menu() */ + NULL, /* Set in update_view_menu */ G_CALLBACK (action_gal_delete_view_cb) }, { "gal-save-custom-view", |