[evolution/gnome-3-8] Miscellaneous cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-8] Miscellaneous cleanups.
- Date: Tue, 23 Jul 2013 16:31:15 +0000 (UTC)
commit 5378787268aae9d00f2d4bd90d82559f25e23eec
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Jul 23 10:46:41 2013 -0400
Miscellaneous cleanups.
addressbook/gui/merging/eab-contact-merging.c | 2 +-
addressbook/gui/widgets/ea-minicard-view.c | 7 +++--
calendar/alarm-notify/alarm-queue.c | 6 ++--
calendar/gui/dialogs/alarm-dialog.c | 8 +++---
calendar/gui/dialogs/send-comp.c | 8 +++---
calendar/gui/e-cal-list-view.c | 10 ++++----
calendar/gui/e-calendar-view.c | 24 ++++++++++----------
calendar/gui/e-day-view.c | 1 -
calendar/gui/itip-utils.c | 3 +-
e-util/e-alert-dialog.c | 4 +-
e-util/e-table-click-to-add.c | 4 +-
e-util/e-table-group-leaf.c | 10 +++++---
e-util/e-table-group.c | 10 ++++----
e-util/e-table.c | 8 +++---
e-util/e-tree.c | 4 +-
em-format/e-mail-formatter-text-html.c | 6 ++--
libemail-engine/e-mail-utils.c | 2 +-
mail/em-composer-utils.c | 4 +-
modules/addressbook/e-book-shell-view-actions.c | 6 ++--
modules/cal-config-google/e-google-chooser.c | 2 +-
.../evolution-cal-config-google.c | 3 +-
modules/calendar/e-cal-shell-content.c | 13 ++++++----
modules/calendar/e-cal-shell-sidebar.c | 3 +-
modules/calendar/e-memo-shell-content.c | 7 +++--
modules/calendar/e-task-shell-content.c | 7 +++--
25 files changed, 86 insertions(+), 76 deletions(-)
---
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 6ba850d..fb11e37 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/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index 0362b3c..d1592df 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -273,9 +273,10 @@ ea_minicard_view_ref_child (AtkObject *accessible,
if (index < child_num) {
if (reflow->items[index] == NULL) {
reflow->items[index] = e_reflow_model_incarnate (reflow->model, index,
GNOME_CANVAS_GROUP (reflow));
- g_object_set (reflow->items[index],
- "width", (double) reflow->column_width,
- NULL);
+ g_object_set (
+ reflow->items[index],
+ "width", (double) reflow->column_width,
+ NULL);
}
card = E_MINICARD (reflow->items[index]);
atk_object = atk_gobject_accessible_for_object (G_OBJECT (card));
diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index 93dfed9..87b6e92 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 9cc21eb..047a0ca 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;
@@ -820,7 +820,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/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 5f76785..70dd372 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -248,10 +248,10 @@ send_component_dialog (GtkWindow *parent,
**/
GtkResponseType
send_dragged_or_resized_component_dialog (GtkWindow *parent,
- ECalClient *client,
- ECalComponent *comp,
- gboolean *strip_alarms,
- gboolean *only_new_attendees)
+ ECalClient *client,
+ ECalComponent *comp,
+ gboolean *strip_alarms,
+ gboolean *only_new_attendees)
{
ECalComponentVType vtype;
const gchar *id;
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 275cc0c..54d0a8d 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);
@@ -177,8 +177,8 @@ e_cal_list_view_save_state (ECalListView *cal_list_view,
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 64d1791..9344d9f 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1791,14 +1791,14 @@ e_calendar_view_modify_and_send (ECalendarView *cal_view,
gboolean
e_calendar_view_modify (ECalendarView *cal_view,
- ECalComponent *comp,
- ECalClient *client,
- CalObjModType mod)
+ ECalComponent *comp,
+ ECalClient *client,
+ CalObjModType mod)
{
GError *error = NULL;
gboolean ret;
- g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
+ g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE);
e_cal_component_commit_sequence (comp);
@@ -1819,12 +1819,12 @@ e_calendar_view_modify (ECalendarView *cal_view,
void
e_calendar_view_send (ECalendarView *cal_view,
- ECalComponent *comp,
- ECalClient *client,
- CalObjModType mod,
- GtkWindow *toplevel,
- gboolean strip_alarms,
- gboolean only_new_attendees)
+ ECalComponent *comp,
+ ECalClient *client,
+ CalObjModType mod,
+ GtkWindow *toplevel,
+ gboolean strip_alarms,
+ gboolean only_new_attendees)
{
ESourceRegistry *registry;
ECalModel *model;
@@ -2402,8 +2402,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/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 4e31f2c..88647ee 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -8438,7 +8438,6 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
} else if (e_cal_component_is_instance (comp))
mod = CALOBJ_MOD_THIS;
-
modified = e_calendar_view_modify (E_CALENDAR_VIEW (day_view), comp, client, mod);
if (modified && send == GTK_RESPONSE_YES)
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index c7e8fca..12152e3 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -777,7 +777,8 @@ comp_to_list (ESourceRegistry *registry,
if (organizer.value && (!sender || g_ascii_strcasecmp (
itip_strip_mailto (organizer.value), sender) != 0)) {
destination = e_destination_new ();
- e_destination_set_email (destination,
+ e_destination_set_email (
+ destination,
itip_strip_mailto (organizer.value));
if (organizer.cn)
e_destination_set_name (destination, organizer.cn);
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 156c272..8b495c1 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 f44b4a2..c167dd3 100644
--- a/e-util/e-table-click-to-add.c
+++ b/e-util/e-table-click-to-add.c
@@ -372,8 +372,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 3f50d00..2112e98 100644
--- a/e-util/e-table-group-leaf.c
+++ b/e-util/e-table-group-leaf.c
@@ -60,8 +60,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));
@@ -108,7 +108,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;
@@ -345,7 +346,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 80f89af..e43a30c 100644
--- a/e-util/e-table-group.c
+++ b/e-util/e-table-group.c
@@ -84,9 +84,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);
@@ -794,8 +794,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 b380419..b263770 100644
--- a/e-util/e-table.c
+++ b/e-util/e-table.c
@@ -1069,8 +1069,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));
@@ -1368,8 +1368,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 56b807f..42ec7aa 100644
--- a/e-util/e-tree.c
+++ b/e-util/e-tree.c
@@ -262,8 +262,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/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c
index 2cdb952..1b5b623 100644
--- a/em-format/e-mail-formatter-text-html.c
+++ b/em-format/e-mail-formatter-text-html.c
@@ -319,9 +319,9 @@ emfe_text_html_format (EMailFormatterExtension *extension,
NULL);
/* HTML messages expect white background and black color for text.
- If Evolution uses a dark theme, then the dark background with
- a black text is hard to read, thus force white background color.
- The HTML content can still overwrite both colors.
+ * If Evolution uses a dark theme, then the dark background with
+ * a black text is hard to read, thus force white background color.
+ * The HTML content can still overwrite both colors.
*/
str = g_strdup_printf (
"<div class=\"part-container-nostyle\">"
diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c
index 48b2a7b..2bc8ef4 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -707,7 +707,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 5de7dfd..cccd8ad 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1003,8 +1003,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 d5f291f..4ae8b4b 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 1a4ebbc..ed3365c 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 9f6310b..5b09515 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 5a4210f..c5cdb89 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -317,8 +317,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));
@@ -415,7 +415,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 (
@@ -429,7 +430,8 @@ cal_shell_content_constructed (GObject *object)
priv->notebook, "page",
G_BINDING_SYNC_CREATE);
- 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;
@@ -519,7 +521,8 @@ cal_shell_content_constructed (GObject *object)
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-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 1d0529c..cdf047f 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -385,7 +385,8 @@ cal_shell_sidebar_restore_state_cb (EShellWindow *shell_window,
shell = e_shell_window_get_shell (shell_window);
shell_settings = e_shell_get_shell_settings (shell);
- g_signal_handlers_disconnect_by_func (shell_window,
+ g_signal_handlers_disconnect_by_func (
+ shell_window,
cal_shell_sidebar_restore_state_cb, shell_sidebar);
selector = E_SOURCE_SELECTOR (priv->selector);
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index ded7e8a..9a36976 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -302,8 +302,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));
@@ -552,7 +552,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 7bfb5b7..9036177 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -302,8 +302,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));
@@ -552,7 +552,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 (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]