[evolution/kill-bonobo] Whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution/kill-bonobo] Whitespace cleanup.
- Date: Thu, 28 May 2009 13:21:37 -0400 (EDT)
commit 14f8eee012382f04090ea9277e9567d5f32e8bf0
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu May 28 13:06:29 2009 -0400
Whitespace cleanup.
---
a11y/ea-factory.h | 18 +++---
addressbook/conduit/address-conduit.c | 54 +++++++-------
addressbook/gui/component/addressbook-config.h | 2 +-
addressbook/gui/component/e-book-shell-migrate.c | 2 +-
addressbook/gui/component/openldap-extract.h | 10 ++--
addressbook/gui/contact-editor/e-contact-editor.c | 18 +++---
addressbook/gui/contact-editor/eab-editor.h | 12 ++--
addressbook/gui/merging/eab-contact-merging.c | 4 +-
addressbook/gui/widgets/a11y/ea-minicard-view.c | 6 +-
addressbook/gui/widgets/e-addressbook-model.c | 6 +-
addressbook/gui/widgets/e-addressbook-view.c | 10 ++--
addressbook/gui/widgets/e-minicard-view-widget.h | 4 +-
addressbook/gui/widgets/e-minicard-view.c | 4 +-
addressbook/gui/widgets/e-minicard-view.h | 4 +-
addressbook/gui/widgets/e-minicard.c | 2 +-
addressbook/gui/widgets/eab-contact-display.c | 6 +-
addressbook/gui/widgets/eab-gui-util.c | 26 ++++----
addressbook/importers/evolution-ldif-importer.c | 6 +-
addressbook/importers/evolution-vcard-importer.c | 2 +-
addressbook/printing/e-contact-print.c | 4 +-
.../evolution-addressbook-export-list-cards.c | 4 +-
calendar/conduits/calendar/calendar-conduit.c | 36 +++++-----
calendar/conduits/memo/memo-conduit.c | 30 ++++----
calendar/conduits/todo/todo-conduit.c | 26 ++++----
calendar/gui/a11y/ea-day-view-main-item.c | 4 +-
calendar/gui/a11y/ea-week-view-cell.c | 12 ++--
calendar/gui/a11y/ea-week-view-main-item.c | 4 +-
calendar/gui/a11y/ea-week-view.c | 4 +-
calendar/gui/alarm-notify/alarm-notify-dialog.c | 4 +-
calendar/gui/alarm-notify/alarm-queue.c | 14 ++--
calendar/gui/calendar-commands.c | 2 +-
calendar/gui/calendar-view.h | 2 +-
calendar/gui/comp-util.c | 2 +-
calendar/gui/dialogs/alarm-dialog.c | 8 +-
calendar/gui/dialogs/comp-editor.c | 18 +++---
calendar/gui/dialogs/comp-editor.h | 2 +-
calendar/gui/dialogs/e-send-options-utils.c | 2 +-
calendar/gui/dialogs/event-editor.c | 6 +-
calendar/gui/dialogs/event-page.c | 20 +++---
calendar/gui/dialogs/event-page.h | 2 +-
calendar/gui/dialogs/memo-page.c | 6 +-
calendar/gui/dialogs/task-editor.c | 2 +-
calendar/gui/dialogs/task-page.c | 6 +-
calendar/gui/e-alarm-list.h | 2 +-
calendar/gui/e-cal-model-tasks.c | 2 +-
calendar/gui/e-cal-model.c | 8 +-
calendar/gui/e-cal-model.h | 2 +-
calendar/gui/e-cal-popup.c | 4 +-
calendar/gui/e-calendar-view.c | 70 ++++++++++----------
calendar/gui/e-date-time-list.h | 2 +-
calendar/gui/e-day-view-config.c | 2 +-
calendar/gui/e-day-view-layout.c | 10 ++--
calendar/gui/e-day-view-main-item.c | 8 +-
calendar/gui/e-day-view-time-item.c | 4 +-
calendar/gui/e-day-view-top-item.c | 4 +-
calendar/gui/e-day-view.c | 62 +++++++++---------
calendar/gui/e-day-view.h | 8 +-
calendar/gui/e-itip-control.c | 8 +-
calendar/gui/e-meeting-list-view.c | 8 +-
calendar/gui/e-meeting-store.c | 36 +++++-----
calendar/gui/e-meeting-time-sel-item.c | 2 +-
calendar/gui/e-meeting-time-sel.c | 2 +-
calendar/gui/e-week-view-config.c | 4 +-
calendar/gui/e-week-view-event-item.c | 2 +-
calendar/gui/e-week-view-main-item.c | 2 +-
calendar/gui/e-week-view.c | 28 ++++----
calendar/gui/e-week-view.h | 6 +-
calendar/gui/gnome-cal.c | 72 ++++++++++----------
calendar/gui/gnome-cal.h | 10 ++--
calendar/gui/itip-utils.c | 34 +++++-----
calendar/gui/print.c | 22 +++---
calendar/gui/tasks-control.c | 2 +-
calendar/module/e-memo-shell-migrate.c | 2 +-
composer/e-composer-header.h | 2 +-
composer/e-msg-composer.c | 4 +-
e-util/e-config.c | 4 +-
e-util/e-dialog-utils.c | 2 +-
e-util/e-sorter-array.c | 12 ++--
e-util/e-text-event-processor-emacs-like.h | 4 +-
e-util/e-util.h | 6 +-
em-format/em-format.c | 4 +-
filter/filter-part.c | 2 +-
filter/filter-rule.h | 2 +-
mail/e-mail-shell-backend.c | 4 +-
mail/e-mail-shell-migrate.c | 2 +-
mail/em-composer-utils.c | 8 +-
mail/em-event.h | 2 +-
mail/em-filter-context.c | 2 +-
mail/em-folder-browser.c | 8 +-
mail/em-folder-tree.c | 4 +-
mail/em-folder-utils.c | 2 +-
mail/em-folder-view.c | 2 +-
mail/em-format-html-display.c | 2 +-
mail/em-junk-hook.c | 4 +-
mail/em-subscribe-editor.c | 4 +-
mail/em-utils.c | 6 +-
mail/importers/mail-importer.c | 2 +-
mail/importers/pine-importer.c | 2 +-
mail/mail-ops.c | 24 +++---
mail/mail-send-recv.c | 6 +-
mail/mail-vfolder.c | 8 +-
mail/message-list.c | 50 +++++++-------
mail/message-list.h | 2 +-
mail/message-tag-editor.h | 2 +-
plugins/audio-inline/audio-inline.c | 4 +-
plugins/backup-restore/backup-restore.c | 16 ++--
plugins/backup-restore/backup.c | 12 ++--
plugins/bbdb/bbdb.c | 6 +-
plugins/bbdb/gaimbuddies.c | 2 +-
plugins/bogo-junk-plugin/bf-junk-filter.c | 38 +++++-----
plugins/calendar-http/calendar-http.c | 2 +-
plugins/calendar-weather/calendar-weather.c | 12 ++--
plugins/email-custom-header/email-custom-header.c | 8 +-
.../exchange-operations/exchange-account-setup.c | 8 +-
.../exchange-operations/exchange-config-listener.c | 26 ++++----
.../exchange-operations/exchange-config-listener.h | 4 +-
.../exchange-operations/exchange-delegates-user.c | 4 +-
plugins/exchange-operations/exchange-delegates.c | 2 +-
.../exchange-folder-subscription.c | 4 +-
.../exchange-mail-send-options.c | 6 +-
plugins/exchange-operations/exchange-operations.c | 6 +-
.../exchange-operations/exchange-send-options.c | 18 +++---
plugins/google-account-setup/google-source.c | 2 +-
.../groupwise-account-setup/camel-gw-listener.c | 22 +++---
.../groupwise-account-setup.c | 2 +-
plugins/groupwise-features/install-shared.c | 2 +-
plugins/groupwise-features/junk-mail-settings.c | 2 +-
plugins/groupwise-features/junk-settings.h | 2 +-
plugins/groupwise-features/proxy-login.c | 6 +-
plugins/groupwise-features/proxy.c | 14 ++--
plugins/groupwise-features/send-options.c | 2 +-
plugins/groupwise-features/share-folder.h | 2 +-
plugins/hula-account-setup/camel-hula-listener.c | 10 ++--
plugins/hula-account-setup/hula-account-setup.c | 2 +-
plugins/imap-features/imap-headers.c | 6 +-
plugins/ipod-sync/ipod.c | 6 +-
plugins/ipod-sync/sync.c | 12 ++--
plugins/itip-formatter/itip-formatter.c | 8 +-
plugins/mail-notification/mail-notification.c | 14 ++--
plugins/pst-import/pst-importer.c | 4 +-
plugins/publish-calendar/publish-calendar.c | 6 +-
plugins/python/python-plugin-loader.c | 2 +-
plugins/sa-junk-plugin/em-junk-filter.c | 8 +-
plugins/save-calendar/save-calendar.c | 2 +-
plugins/templates/templates.c | 16 ++--
plugins/tnef-attachments/tnef-plugin.c | 2 +-
.../webdav-account-setup/webdav-contacts-source.c | 2 +-
shell/e-shell-backend.h | 44 ++++++------
shell/e-shell-importer.c | 2 +-
shell/e-shell-view.h | 48 +++++++-------
widgets/e-timezone-dialog/e-timezone-dialog.c | 22 +++---
widgets/menus/gal-define-views-dialog.c | 2 +-
widgets/misc/a11y/ea-calendar-item.c | 4 +-
widgets/misc/e-attachment-dialog.c | 2 +-
widgets/misc/e-calendar.c | 12 ++--
widgets/misc/e-canvas.h | 2 +-
widgets/misc/e-charset-picker.c | 2 +-
widgets/misc/e-cursors.h | 2 +-
widgets/misc/e-dateedit.c | 4 +-
widgets/misc/e-filter-bar.c | 4 +-
widgets/misc/e-filter-bar.h | 2 +-
widgets/misc/e-icon-entry.c | 4 +-
widgets/misc/e-image-chooser.h | 6 +-
widgets/misc/e-map.c | 8 +-
widgets/misc/e-search-bar.c | 20 +++---
widgets/misc/e-send-options.c | 14 ++--
widgets/misc/e-spinner.c | 14 ++--
widgets/table/a11y/gal-a11y-e-cell-popup.c | 8 +-
widgets/table/a11y/gal-a11y-e-cell-toggle.c | 4 +-
widgets/table/a11y/gal-a11y-e-cell-vbox.h | 2 +-
widgets/table/a11y/gal-a11y-e-cell.c | 4 +-
widgets/table/a11y/gal-a11y-e-cell.h | 4 +-
widgets/table/a11y/gal-a11y-e-table-click-to-add.c | 2 +-
widgets/table/a11y/gal-a11y-e-table-item.c | 8 +-
widgets/table/e-cell-date-edit.c | 2 +-
widgets/table/e-cell-hbox.c | 2 +-
widgets/table/e-cell-hbox.h | 2 +-
widgets/table/e-cell-popup.c | 2 +-
widgets/table/e-cell-popup.h | 2 +-
widgets/table/e-cell-text.c | 20 +++---
widgets/table/e-cell-toggle.c | 2 +-
widgets/table/e-cell-vbox.c | 2 +-
widgets/table/e-cell.c | 2 +-
widgets/table/e-cell.h | 20 +++---
widgets/table/e-table-click-to-add.c | 2 +-
widgets/table/e-table-example-2.c | 16 ++--
widgets/table/e-table-header-item.c | 2 +-
widgets/table/e-table-header-utils.c | 2 +-
widgets/table/e-table-header.c | 2 +-
widgets/table/e-table-item.c | 30 ++++----
widgets/table/e-table-item.h | 24 +++---
widgets/table/e-table-sorted-variable.c | 2 +-
widgets/table/e-table-sorted.c | 4 +-
widgets/table/e-table-sorter.c | 30 ++++----
widgets/table/e-table-specification.c | 2 +-
widgets/table/e-table-without.c | 6 +-
widgets/table/e-table.c | 26 ++++----
widgets/table/e-table.h | 10 ++--
widgets/table/e-tree-memory-callbacks.c | 2 +-
widgets/table/e-tree-memory.c | 2 +-
widgets/table/e-tree-model.c | 4 +-
widgets/table/e-tree-selection-model.c | 16 ++--
widgets/table/e-tree-simple.c | 10 ++--
widgets/table/e-tree-sorted-variable.c | 4 +-
widgets/table/e-tree-sorted.c | 24 +++---
widgets/table/e-tree-table-adapter.c | 10 ++--
widgets/table/e-tree-table-adapter.h | 2 +-
widgets/table/e-tree.c | 30 ++++----
widgets/table/e-tree.h | 6 +-
widgets/text/a11y/gal-a11y-e-text.c | 28 ++++----
widgets/text/e-reflow.c | 2 +-
widgets/text/e-text.c | 18 +++---
widgets/text/e-text.h | 6 +-
213 files changed, 997 insertions(+), 997 deletions(-)
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
index 2331f54..e234368 100644
--- a/a11y/ea-factory.h
+++ b/a11y/ea-factory.h
@@ -36,11 +36,11 @@ type_as_function ## _factory_create_accessible (GObject *obj) \
{ \
AtkObject *accessible; \
g_return_val_if_fail (G_IS_OBJECT (obj), NULL); \
- accessible = opt_create_accessible (G_OBJECT (obj)); \
- return accessible; \
+ accessible = opt_create_accessible (G_OBJECT (obj)); \
+ return accessible; \
}
-#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \
+#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \
static AtkObject* \
type_as_function ## _factory_create_accessible (GObject *obj) \
{ \
@@ -52,10 +52,10 @@ type_as_function ## _factory_create_accessible (GObject *obj) \
widget = GTK_WIDGET (obj); \
\
accessible = opt_create_accessible (widget); \
- return accessible; \
+ return accessible; \
}
-#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) \
+#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) \
\
static GType \
type_as_function ## _factory_get_accessible_type (void) \
@@ -81,7 +81,7 @@ type_as_function ## _factory_get_type (void) \
gchar *name; \
static const GTypeInfo tinfo = \
{ \
- sizeof (AtkObjectFactoryClass), \
+ sizeof (AtkObjectFactoryClass), \
NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \
NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \
}; \
@@ -95,15 +95,15 @@ type_as_function ## _factory_get_type (void) \
return t; \
}
-#define EA_FACTORY(type, type_as_function, opt_create_accessible) \
- EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \
+#define EA_FACTORY(type, type_as_function, opt_create_accessible) \
+ EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \
EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)
#define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible) \
EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible) \
EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)
-#define EA_SET_FACTORY(obj_type, type_as_function) \
+#define EA_SET_FACTORY(obj_type, type_as_function) \
{ \
if (atk_get_root ()) { \
atk_registry_set_factory_type (atk_get_default_registry (), \
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 781bd83..0ae9210 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -1287,7 +1287,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
phone_str = e_contact_get_const (contact, next_mail);
next_mail = get_next_mail (&next_mail);
} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
- phone_str = e_contact_get_const (contact, next_home);
+ phone_str = e_contact_get_const (contact, next_home);
next_home = get_next_home (&next_home);
} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
phone_str = e_contact_get_const (contact, next_work);
@@ -1578,7 +1578,7 @@ pre_sync (GnomePilotConduit *conduit,
{
GnomePilotConduitSyncAbs *abs_conduit;
EBookQuery *query;
- GList *l;
+ GList *l;
gint len;
gchar *filename;
gchar *change_id;
@@ -1668,11 +1668,11 @@ pre_sync (GnomePilotConduit *conduit,
}
/* Set the count information */
- num_records = g_list_length (ctxt->cards);
- gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
- gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
- gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
- gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
+ num_records = g_list_length (ctxt->cards);
+ gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
+ gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
+ gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
+ gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
@@ -1701,7 +1701,7 @@ pre_sync (GnomePilotConduit *conduit,
unpack_AddressAppInfo (&(ctxt->ai), buf, len);
g_free (buf);
#endif
- check_for_slow_setting (conduit, ctxt);
+ check_for_slow_setting (conduit, ctxt);
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
|| ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
ctxt->map->write_touched_only = TRUE;
@@ -1793,10 +1793,10 @@ for_each (GnomePilotConduitSyncAbs *conduit,
EAddrLocalRecord **local,
EAddrConduitContext *ctxt)
{
- static GList *cards, *iterator;
- static gint count;
+ static GList *cards, *iterator;
+ static gint count;
- g_return_val_if_fail (local != NULL, -1);
+ g_return_val_if_fail (local != NULL, -1);
if (*local == NULL) {
LOG (g_message ( "beginning for_each" ));
@@ -1808,7 +1808,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
LOG (g_message ( "iterating over %d records", g_list_length (cards) ));
*local = g_new0 (EAddrLocalRecord, 1);
- local_record_from_ecard (*local, cards->data, ctxt);
+ local_record_from_ecard (*local, cards->data, ctxt);
ctxt->locals = g_list_prepend (ctxt->locals, *local);
iterator = cards;
@@ -1828,7 +1828,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
} else {
LOG (g_message ( "for_each ending" ));
- /* Tell the pilot the iteration is over */
+ /* Tell the pilot the iteration is over */
*local = NULL;
return 0;
@@ -1881,7 +1881,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
} else {
LOG (g_message ( "for_each_modified ending" ));
- /* Signal the iteration is over */
+ /* Signal the iteration is over */
*local = NULL;
return 0;
@@ -2056,7 +2056,7 @@ match (GnomePilotConduitSyncAbs *conduit,
EAddrLocalRecord **local,
EAddrConduitContext *ctxt)
{
- const gchar *uid;
+ const gchar *uid;
LOG (g_message ("match: looking for local copy of %s\n",
print_remote (remote)));
@@ -2191,22 +2191,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
- g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
- g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
- g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
- g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
- g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
- g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
- g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index 2814e8c..26c1788 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/addressbook/gui/component/addressbook-config.h
@@ -15,7 +15,7 @@
*
* Authors:
* Chris Toshok <toshok ximian com>
- * Chris Lahey <clahey ximian com>
+ * Chris Lahey <clahey ximian com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/addressbook/gui/component/e-book-shell-migrate.c b/addressbook/gui/component/e-book-shell-migrate.c
index 4ac7030..4b0b61d 100644
--- a/addressbook/gui/component/e-book-shell-migrate.c
+++ b/addressbook/gui/component/e-book-shell-migrate.c
@@ -660,7 +660,7 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
port = get_string_child (child, "port");
host = get_string_child (child, "host");
rootdn = get_string_child (child, "rootdn");
- scope = get_string_child (child, "scope");
+ scope = get_string_child (child, "scope");
authmethod = get_string_child (child, "authmethod");
ssl = get_string_child (child, "ssl");
emailaddr = get_string_child (child, "emailaddr");
diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h
index 083fc0d..630e12e 100644
--- a/addressbook/gui/component/openldap-extract.h
+++ b/addressbook/gui/component/openldap-extract.h
@@ -214,8 +214,8 @@ get_token( const gchar ** sp, gchar ** token_val )
*token_val = res;
}
break;
-/* kind = TK_UNEXPCHAR; */
-/* break; */
+/* kind = TK_UNEXPCHAR; */
+/* break; */
}
return kind;
@@ -863,9 +863,9 @@ skip_url_prefix(
const gchar **scheme )
{
/*
- * return non-zero if this looks like a LDAP URL; zero if not
- * if non-zero returned, *urlp will be moved past "ldap://"; part of URL
- */
+ * return non-zero if this looks like a LDAP URL; zero if not
+ * if non-zero returned, *urlp will be moved past "ldap://"; part of URL
+ */
const gchar *p;
if ( url == NULL ) {
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index fd00b1e..7f3699f 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -81,10 +81,10 @@ static void e_contact_editor_set_property (GObject *object, guint prop_id, const
static void e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void e_contact_editor_dispose (GObject *object);
-static void e_contact_editor_raise (EABEditor *editor);
-static void e_contact_editor_show (EABEditor *editor);
+static void e_contact_editor_raise (EABEditor *editor);
+static void e_contact_editor_show (EABEditor *editor);
static void e_contact_editor_save_contact (EABEditor *editor, gboolean should_close);
-static void e_contact_editor_close (EABEditor *editor);
+static void e_contact_editor_close (EABEditor *editor);
static gboolean e_contact_editor_is_valid (EABEditor *editor);
static gboolean e_contact_editor_is_changed (EABEditor *editor);
static GtkWindow* e_contact_editor_get_window (EABEditor *editor);
@@ -453,20 +453,20 @@ name_to_style (const EContactName *name, const gchar *company, gint style)
midstrptr=midstring;
if(name){
if (name->family && *name->family)
- *(midstrptr++) = name->family;
+ *(midstrptr++) = name->family;
if (name->given && *name->given)
- *(midstrptr++) = name->given;
+ *(midstrptr++) = name->given;
}
*midstrptr = NULL;
stringptr = strings;
*(stringptr++) = g_strjoinv(", ", midstring);
- if (name) {
+ if (name) {
if (name->additional && *name->additional)
*(stringptr++) = name->additional;
}
*stringptr = NULL;
- string = g_strjoinv(" ", strings);
- break;
+ string = g_strjoinv(" ", strings);
+ break;
case 3:
string = g_strdup(company);
break;
@@ -3892,7 +3892,7 @@ e_contact_editor_create_source_combo_box (gchar *name,
GtkWidget *
e_contact_editor_create_source_combo_box (gchar *name,
- gchar *string1, gchar *string2,
+ gchar *string1, gchar *string2,
gint int1, gint int2)
{
GtkWidget *combo_box;
diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h
index 9dcb5e1..1b3de4b 100644
--- a/addressbook/gui/contact-editor/eab-editor.h
+++ b/addressbook/gui/contact-editor/eab-editor.h
@@ -64,8 +64,8 @@ struct _EABEditorClass
/* virtual functions */
void (* show) (EABEditor *editor);
- void (* close) (EABEditor *editor);
- void (* raise) (EABEditor *editor);
+ void (* close) (EABEditor *editor);
+ void (* raise) (EABEditor *editor);
void (* save_contact) (EABEditor *editor, gboolean should_close);
gboolean (* is_valid) (EABEditor *editor);
gboolean (* is_changed) (EABEditor *editor);
@@ -92,10 +92,10 @@ GtkWindow* eab_editor_get_window (EABEditor *editor);
gboolean eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window);
/* these four generate EABEditor signals */
-void eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact);
-void eab_editor_contact_modified (EABEditor *editor, EBookStatus status, EContact *contact);
-void eab_editor_contact_deleted (EABEditor *editor, EBookStatus status, EContact *contact);
-void eab_editor_closed (EABEditor *editor);
+void eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact);
+void eab_editor_contact_modified (EABEditor *editor, EBookStatus status, EContact *contact);
+void eab_editor_contact_deleted (EABEditor *editor, EBookStatus status, EContact *contact);
+void eab_editor_closed (EABEditor *editor);
/* these maintain the global list of editors so we can prompt the user
if there are unsaved changes when they exit. */
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 0bcee0b..c8d795b 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -346,14 +346,14 @@ mergeit (EContactMergingLookup *lookup)
switch (result)
{
case GTK_RESPONSE_OK:
- lookup->contact = lookup->match;
+ lookup->contact = lookup->match;
e_book_async_remove_contact (lookup->book, lookup->match, NULL, lookup);
e_book_async_add_contact (lookup->book, lookup->contact, final_id_cb, lookup);
value = 1;
break;
case GTK_RESPONSE_CANCEL:
default:
- value = 0;
+ value = 0;
break;
}
gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.c b/addressbook/gui/widgets/a11y/ea-minicard-view.c
index 09eef66..b35f64a 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard-view.c
+++ b/addressbook/gui/widgets/a11y/ea-minicard-view.c
@@ -160,8 +160,8 @@ ea_minicard_view_get_name (AtkObject *accessible)
source_name="";
string = g_strdup_printf (ngettext ("current address book folder %s has %d card",
- "current address book folder %s has %d cards",
- reflow->count), source_name, reflow->count);
+ "current address book folder %s has %d cards",
+ reflow->count), source_name, reflow->count);
ATK_OBJECT_CLASS (parent_class)->set_name (accessible, string);
g_free (string);
@@ -384,7 +384,7 @@ static gboolean atk_action_interface_do_action (AtkAction *action, gint i)
e_minicard_view_create_contact_list (card_view);
break;
default:
- return_value = FALSE;
+ return_value = FALSE;
break;
}
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 79d1162..b68763c 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -155,8 +155,8 @@ update_folder_bar_message (EAddressbookModel *model)
static void
create_contact (EBookView *book_view,
- const GList *contact_list,
- EAddressbookModel *model)
+ const GList *contact_list,
+ EAddressbookModel *model)
{
GPtrArray *array;
guint count;
@@ -681,7 +681,7 @@ e_addressbook_model_new (void)
EContact *
e_addressbook_model_get_contact (EAddressbookModel *model,
- gint row)
+ gint row)
{
GPtrArray *array;
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index fe46882..657d04a 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1099,10 +1099,10 @@ delete_contacts_cb (EBook *book, EBookStatus status, gpointer closure)
case E_BOOK_ERROR_OK :
case E_BOOK_ERROR_CANCELLED :
break;
- case E_BOOK_ERROR_PERMISSION_DENIED :
- e_error_run (NULL, "addressbook:contact-delete-error-perm", NULL);
+ case E_BOOK_ERROR_PERMISSION_DENIED :
+ e_error_run (NULL, "addressbook:contact-delete-error-perm", NULL);
break;
- default :
+ default :
/* Unknown error */
eab_error_dialog (_("Failed to delete contact"), status);
break;
@@ -1295,7 +1295,7 @@ e_addressbook_view_save_as (EAddressbookView *view,
query = e_book_query_any_field_contains ("");
e_book_get_contacts (book, query, &list, NULL);
- e_book_query_unref (query);
+ e_book_query_unref (query);
} else
list = e_addressbook_view_get_selected (view);
@@ -1426,7 +1426,7 @@ view_transfer_contacts (EAddressbookView *view, gboolean delete_from_source, gbo
if (all) {
EBookQuery *query = e_book_query_any_field_contains("");
e_book_get_contacts(book, query, &contacts, NULL);
- e_book_query_unref(query);
+ e_book_query_unref(query);
}
else {
contacts = e_addressbook_view_get_selected (view);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 8af99aa..b9dcaec 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -32,8 +32,8 @@ G_BEGIN_DECLS
#define E_TYPE_MINICARD_VIEW_WIDGET (e_minicard_view_widget_get_type ())
#define E_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidget))
#define E_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidgetClass))
-#define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
+#define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
+#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
typedef struct _EMinicardViewWidget EMinicardViewWidget;
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index c62a334..e8b9c5d 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -639,8 +639,8 @@ e_minicard_view_jump_to_letter (EMinicardView *view,
utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0';
e_reflow_sorted_jump (E_REFLOW_SORTED (view),
- (GCompareFunc) compare_to_utf_str,
- utf_str);
+ (GCompareFunc) compare_to_utf_str,
+ utf_str);
#endif
}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 7a21914..db8815e 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -55,8 +55,8 @@ G_BEGIN_DECLS
#define E_TYPE_MINICARD_VIEW (e_minicard_view_get_type ())
#define E_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW, EMinicardView))
#define E_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW, EMinicardViewClass))
-#define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW))
-#define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW))
+#define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW))
+#define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW))
typedef struct _EMinicardView EMinicardView;
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index fe907d5..c446e1a 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -742,7 +742,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
EMinicardField *minicard_field;
gchar *name;
gchar *string;
- gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
+ gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
group = GNOME_CANVAS_GROUP( e_minicard );
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 292edd4..0b3e122 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -682,7 +682,7 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
e_contact_photo_free (photo);
}
- gtk_html_stream_printf (html_stream, "</td><td %s valign=\"top\">\n", is_rtl ? " align=\"right\" " : "");
+ gtk_html_stream_printf (html_stream, "</td><td %s valign=\"top\">\n", is_rtl ? " align=\"right\" " : "");
str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
if (!str)
@@ -844,7 +844,7 @@ eab_contact_display_render_compact (EABContactDisplay *display,
html = eab_parse_qp_email_to_html (str); \
\
if (!html) \
- html = e_text_to_html (str, 0); \
+ html = e_text_to_html (str, 0); \
\
gtk_html_stream_printf (html_stream, "%s%s", comma ? ", " : "", html); \
g_free (html); \
@@ -905,7 +905,7 @@ contact_display_button_press_event (GtkWidget *widget,
if (event->button.button != 3)
return FALSE;
- uri = gtk_html_get_url_at (
+ uri = gtk_html_get_url_at (
GTK_HTML (widget),
event->button.x, event->button.y);
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index e826910..58dc600 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -49,19 +49,19 @@
/* the NULL's in this table correspond to the status codes
that should *never* be generated by a backend */
static const gchar *status_to_string[] = {
- /* E_BOOK_ERROR_OK */ N_("Success"),
- /* E_BOOK_ERROR_INVALID_ARG */ NULL,
- /* E_BOOK_ERROR_BUSY */ N_("Backend busy"),
- /* E_BOOK_ERROR_REPOSITORY_OFFLINE */ N_("Repository offline"),
- /* E_BOOK_ERROR_NO_SUCH_BOOK */ N_("Address Book does not exist"),
- /* E_BOOK_ERROR_NO_SELF_CONTACT */ N_("No Self Contact defined"),
- /* E_BOOK_ERROR_URI_NOT_LOADED */ NULL,
- /* E_BOOK_ERROR_URI_ALREADY_LOADED */ NULL,
- /* E_BOOK_ERROR_PERMISSION_DENIED */ N_("Permission denied"),
- /* E_BOOK_ERROR_CONTACT_NOT_FOUND */ N_("Contact not found"),
- /* E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS */ N_("Contact ID already exists"),
- /* E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED */ N_("Protocol not supported"),
- /* E_BOOK_ERROR_CANCELLED */ N_("Canceled"),
+ /* E_BOOK_ERROR_OK */ N_("Success"),
+ /* E_BOOK_ERROR_INVALID_ARG */ NULL,
+ /* E_BOOK_ERROR_BUSY */ N_("Backend busy"),
+ /* E_BOOK_ERROR_REPOSITORY_OFFLINE */ N_("Repository offline"),
+ /* E_BOOK_ERROR_NO_SUCH_BOOK */ N_("Address Book does not exist"),
+ /* E_BOOK_ERROR_NO_SELF_CONTACT */ N_("No Self Contact defined"),
+ /* E_BOOK_ERROR_URI_NOT_LOADED */ NULL,
+ /* E_BOOK_ERROR_URI_ALREADY_LOADED */ NULL,
+ /* E_BOOK_ERROR_PERMISSION_DENIED */ N_("Permission denied"),
+ /* E_BOOK_ERROR_CONTACT_NOT_FOUND */ N_("Contact not found"),
+ /* E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS */ N_("Contact ID already exists"),
+ /* E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED */ N_("Protocol not supported"),
+ /* E_BOOK_ERROR_CANCELLED */ N_("Canceled"),
/* E_BOOK_ERROR_COULD_NOT_CANCEL */ N_("Could not cancel"),
/* E_BOOK_ERROR_AUTHENTICATION_FAILED */ N_("Authentication Failed"),
/* E_BOOK_ERROR_AUTHENTICATION_REQUIRED */ N_("Authentication Required"),
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 544bb48..8aaad1b 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -76,9 +76,9 @@ static struct {
const gchar *ldif_attribute;
EContactField contact_field;
#define FLAG_HOME_ADDRESS 0x01
-#define FLAG_WORK_ADDRESS 0x02
-#define FLAG_LIST 0x04
-#define FLAG_BOOLEAN 0x08
+#define FLAG_WORK_ADDRESS 0x02
+#define FLAG_LIST 0x04
+#define FLAG_BOOLEAN 0x08
gint flags;
}
ldif_fields[] = {
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index 169c641..ff6b205 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -18,7 +18,7 @@
* Authors:
* Chris Toshok <toshok ximian com>
* JP Rosevear <jpr ximian com>
- * Michael Zucchi <notzed ximian com>
+ * Michael Zucchi <notzed ximian com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index e57e5d1..6c6710a 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -217,7 +217,7 @@ e_contact_start_new_page (EContactPrintContext *ctxt)
/*cairo_show_page (cr);*/
- ctxt->x = ctxt->y = .0;
+ ctxt->x = ctxt->y = .0;
ctxt->column = 0;
ctxt->pages++;
}
@@ -294,7 +294,7 @@ e_contact_start_new_column (EContactPrintContext *ctxt)
else {
ctxt->x = ctxt->column *
(ctxt->column_width + ctxt->column_spacing);
- ctxt->y = .0;
+ ctxt->y = .0;
}
}
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 2b41834..5569314 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -166,7 +166,7 @@ static EContactCSVFieldData csv_field_data[] = {
{E_CONTACT_CSV_PHONE_HOME, E_CONTACT_PHONE_HOME, "", DT_STRING},
{E_CONTACT_CSV_ORG, E_CONTACT_ORG, "", DT_STRING},
/*E_CONTACT_CSV_ADDRESS_BUSINESS, */
- {E_CONTACT_CSV_ADDRESS_BUSINESS_STREET, NOMAP, "Business Address", DT_STRING},
+ {E_CONTACT_CSV_ADDRESS_BUSINESS_STREET, NOMAP, "Business Address", DT_STRING},
{E_CONTACT_CSV_ADDRESS_BUSINESS_EXT, NOMAP, "Business Address2", DT_STRING},
{E_CONTACT_CSV_ADDRESS_BUSINESS_CITY, NOMAP, "Business Address City", DT_STRING},
{E_CONTACT_CSV_ADDRESS_BUSINESS_REGION, NOMAP, "Business Address State", DT_STRING},
@@ -179,7 +179,7 @@ static EContactCSVFieldData csv_field_data[] = {
{E_CONTACT_CSV_ADDRESS_HOME_REGION, NOMAP, "Home Address State", DT_STRING},
{E_CONTACT_CSV_ADDRESS_HOME_POSTCODE, NOMAP, "Home Address PostCode", DT_STRING},
{E_CONTACT_CSV_ADDRESS_HOME_COUNTRY, NOMAP, "Home Address Country", DT_STRING},
- {E_CONTACT_CSV_PHONE_MOBILE, E_CONTACT_PHONE_MOBILE, "", DT_STRING},
+ {E_CONTACT_CSV_PHONE_MOBILE, E_CONTACT_PHONE_MOBILE, "", DT_STRING},
{E_CONTACT_CSV_PHONE_CAR, E_CONTACT_PHONE_CAR, "", DT_STRING},
{E_CONTACT_CSV_PHONE_BUSINESS_FAX, E_CONTACT_PHONE_BUSINESS_FAX, "", DT_STRING},
{E_CONTACT_CSV_PHONE_HOME_FAX, E_CONTACT_PHONE_HOME_FAX, "", DT_STRING},
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 3654f5b..fe6f7df 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -114,7 +114,7 @@ calconduit_load_configuration (guint32 pilot_id)
ECalConduitCfg *c;
GnomePilotConduitManagement *management;
GnomePilotConduitConfig *config;
- gchar prefix[256];
+ gchar prefix[256];
c = g_new0 (ECalConduitCfg, 1);
g_assert (c != NULL);
@@ -352,8 +352,8 @@ e_calendar_context_destroy (ECalConduitContext *ctxt)
if (ctxt->client != NULL)
g_object_unref (ctxt->client);
- if (ctxt->default_comp != NULL)
- g_object_unref (ctxt->default_comp);
+ if (ctxt->default_comp != NULL)
+ g_object_unref (ctxt->default_comp);
if (ctxt->comps != NULL) {
for (l = ctxt->comps; l; l = l->next)
g_object_unref (l->data);
@@ -673,7 +673,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp
is_date = TRUE;
old_start_value = dt_start.value;
- old_end_value = dt_end.value;
+ old_end_value = dt_end.value;
while (!last) {
ECalComponent *clone = e_cal_component_clone (ccc->comp);
icalcomponent *ical_comp = NULL;
@@ -1279,7 +1279,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
}
/* Recurrence information */
- icalrecurrencetype_clear (&recur);
+ icalrecurrencetype_clear (&recur);
switch (appt.repeatType) {
case repeatNone:
@@ -1610,7 +1610,7 @@ pre_sync (GnomePilotConduit *conduit,
return -1;
}
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
#else
@@ -2114,22 +2114,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
- g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
- g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
- g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
- g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
- g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
- g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
- g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 1d32917..9a226f5 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -891,7 +891,7 @@ pre_sync (GnomePilotConduit *conduit,
return -1;
}
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
#else
@@ -909,7 +909,7 @@ pre_sync (GnomePilotConduit *conduit,
#ifdef PILOT_LINK_0_12
buf = g_new0 (unsigned char,buffer->used);
memcpy(buf, buffer->data, buffer->used);
- unpack_MemoAppInfo (&(ctxt->ai), buf, len);
+ unpack_MemoAppInfo (&(ctxt->ai), buf, len);
pi_buffer_free(buffer);
#else
unpack_MemoAppInfo (&(ctxt->ai), buf, len);
@@ -1035,7 +1035,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
/* NOTE: ignore the return value, otherwise ctxt->locals
* gets messed up. The calling function keeps track of
* the *local variable */
- unused = g_list_prepend (ctxt->locals, *local);
+ unused = g_list_prepend (ctxt->locals, *local);
iterator = comps;
} else {
LOG (g_message ( "no events" ));
@@ -1391,22 +1391,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
- g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
- g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
- g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
- g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
- g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
- g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
- g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 1ced6ac..b0b5526 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -1080,7 +1080,7 @@ pre_sync (GnomePilotConduit *conduit,
pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
return -1;
}
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
#else
@@ -1581,22 +1581,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
- g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
- g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
- g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
- g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
- g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
- g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
- g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
diff --git a/calendar/gui/a11y/ea-day-view-main-item.c b/calendar/gui/a11y/ea-day-view-main-item.c
index c1176b4..87cd266 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.c
+++ b/calendar/gui/a11y/ea-day-view-main-item.c
@@ -445,10 +445,10 @@ ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data)
atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
g_object_unref (state_set);
- g_signal_emit_by_name (ea_main_item,
+ g_signal_emit_by_name (ea_main_item,
"active-descendant-changed",
item_cell);
- g_signal_emit_by_name (data, "selection_changed");
+ g_signal_emit_by_name (data, "selection_changed");
atk_focus_tracker_notify (item_cell);
g_object_unref (item_cell);
diff --git a/calendar/gui/a11y/ea-week-view-cell.c b/calendar/gui/a11y/ea-week-view-cell.c
index dda6ad6..e724592 100644
--- a/calendar/gui/a11y/ea-week-view-cell.c
+++ b/calendar/gui/a11y/ea-week-view-cell.c
@@ -369,9 +369,9 @@ component_interface_get_extents (AtkComponent *component,
if (week_view->multi_week_view) {
if (week_view->compress_weekend && (cell->column == (5 - start_day))) {
*height = week_view->row_heights[cell->row*2];
- *width = week_view->col_widths[cell->column];
- *x += week_view->col_offsets[cell->column] - scroll_x;
- *y += week_view->row_offsets[cell->row*2]- scroll_y;
+ *width = week_view->col_widths[cell->column];
+ *x += week_view->col_offsets[cell->column] - scroll_x;
+ *y += week_view->row_offsets[cell->row*2]- scroll_y;
} else if (week_view->compress_weekend && (cell->column == (6 - start_day))) {
*height = week_view->row_heights[cell->row*2];
*width = week_view->col_widths[cell->column - 1];
@@ -383,10 +383,10 @@ component_interface_get_extents (AtkComponent *component,
*x += week_view->col_offsets[cell->column - 1] - scroll_x;
*y += week_view->row_offsets[cell->row*2]- scroll_y;
} else {
- *height = week_view->row_heights[cell->row*2]*2;
+ *height = week_view->row_heights[cell->row*2]*2;
*width = week_view->col_widths[cell->column];
- *x += week_view->col_offsets[cell->column] - scroll_x;
- *y += week_view->row_offsets[cell->row*2]- scroll_y;
+ *x += week_view->col_offsets[cell->column] - scroll_x;
+ *y += week_view->row_offsets[cell->row*2]- scroll_y;
}
} else {
if (start_day < 3) {
diff --git a/calendar/gui/a11y/ea-week-view-main-item.c b/calendar/gui/a11y/ea-week-view-main-item.c
index 3ba4508..065f2be 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.c
+++ b/calendar/gui/a11y/ea-week-view-main-item.c
@@ -445,10 +445,10 @@ ea_week_view_main_item_time_change_cb (EWeekView *week_view, gpointer data)
atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
g_object_unref (state_set);
- g_signal_emit_by_name (ea_main_item,
+ g_signal_emit_by_name (ea_main_item,
"active-descendant-changed",
item_cell);
- g_signal_emit_by_name (data, "selection_changed");
+ g_signal_emit_by_name (data, "selection_changed");
atk_focus_tracker_notify (item_cell);
g_object_unref (item_cell);
}
diff --git a/calendar/gui/a11y/ea-week-view.c b/calendar/gui/a11y/ea-week-view.c
index 734f092..97a8dae 100644
--- a/calendar/gui/a11y/ea-week-view.c
+++ b/calendar/gui/a11y/ea-week-view.c
@@ -258,7 +258,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index)
g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
child_num = atk_object_get_n_accessible_children (accessible);
- if (child_num <= 0 || index < 0 || index >= child_num)
+ if (child_num <= 0 || index < 0 || index >= child_num)
return NULL;
if (!GTK_ACCESSIBLE (accessible)->widget)
@@ -270,7 +270,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index)
/* index == 0 is the main item */
atk_object = atk_gobject_accessible_for_object (G_OBJECT (week_view->main_canvas_item));
g_object_ref (atk_object);
- } else
+ } else
for (event_index = 0; event_index < max_count; ++event_index) {
EWeekViewEvent *event;
EWeekViewEventSpan *span;
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 5307936..9e9aa00 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -325,11 +325,11 @@ notified_alarms_dialog_new (void)
/* Set callback for updating the snooze "minutes" label */
g_signal_connect (G_OBJECT (an->snooze_time_min), "value_changed",
- G_CALLBACK (an_update_minutes_label), an);
+ G_CALLBACK (an_update_minutes_label), an);
/* Set callback for updating the snooze "hours" label */
g_signal_connect (G_OBJECT (an->snooze_time_hrs), "value_changed",
- G_CALLBACK (an_update_hrs_label), an);
+ G_CALLBACK (an_update_hrs_label), an);
na = g_new0 (AlarmNotificationsDialog, 1);
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index cf95c21..d5fd1af 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1461,7 +1461,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
if (text.value)
summary = text.value;
else
- summary = _("No summary available.");
+ summary = _("No summary available.");
e_cal_component_get_description_list (comp, &text_list);
@@ -1480,7 +1480,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
e_cal_component_get_location (comp, &location);
if (!location)
- location = _("No location information available.");
+ location = _("No location information available.");
/* create the tray icon */
if (tray_icon == NULL) {
@@ -1557,7 +1557,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
#ifdef HAVE_LIBNOTIFY
static void
popup_notification (time_t trigger, CompQueuedAlarms *cqa,
- gpointer alarm_id, gboolean use_description)
+ gpointer alarm_id, gboolean use_description)
{
QueuedAlarm *qa;
ECalComponent *comp;
@@ -1586,7 +1586,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
if (text.value)
summary = text.value;
else
- summary = _("No summary available.");
+ summary = _("No summary available.");
e_cal_component_get_location (comp, &location);
@@ -2051,8 +2051,8 @@ remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) {
d(printf("%s:%d (remove_comp_by_id)\n",__FILE__, __LINE__));
-/* if (!g_hash_table_size (ca->uid_alarms_hash)) */
-/* return; */
+/* if (!g_hash_table_size (ca->uid_alarms_hash)) */
+/* return; */
remove_cqa (ca, (ECalComponentId *)key, (CompQueuedAlarms *) value);
@@ -2208,7 +2208,7 @@ update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa)
d(printf("%s:%d (update_qa)\n",__FILE__, __LINE__));
for (instance_list = alarms->alarms; instance_list; instance_list = instance_list->next) {
al_inst = instance_list->data;
- if (al_inst->trigger == qa->orig_trigger) { /* FIXME if two or more alarm instances (audio, note) for same component have same trigger */
+ if (al_inst->trigger == qa->orig_trigger) { /* FIXME if two or more alarm instances (audio, note) for same component have same trigger */
g_free ((gchar *) qa->instance->auid);
qa->instance->auid = g_strdup (al_inst->auid);
break;
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 7f7c043..01e4fe5 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -427,5 +427,5 @@ calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
g_signal_handlers_disconnect_matched (gcal, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
bonobo_ui_component_rm (uic, "/", NULL);
- bonobo_ui_component_unset_container (uic, NULL);
+ bonobo_ui_component_unset_container (uic, NULL);
}
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
index a3c4a54..78b6127 100644
--- a/calendar/gui/calendar-view.h
+++ b/calendar/gui/calendar-view.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
#define TYPE_CALENDAR_VIEW (calendar_view_get_type ())
#define CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView))
-#define CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \
+#define CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \
CalendarViewClass))
#define IS_CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CALENDAR_VIEW))
#define IS_CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_VIEW))
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 49b4390..62a55d2 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -803,7 +803,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
ECalComponent *master = NULL;
icalcomponent *icalcomp = NULL;
ECalComponentRange rid;
- ECalComponentDateTime sdt;
+ ECalComponentDateTime sdt;
const gchar *uid;
/* Get the master component */
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index ca8a58d..5284656 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -612,7 +612,7 @@ populate_widgets_from_alarm (Dialog *dialog)
/* Alarm Types */
switch ( trigger->type ) {
- case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START:
+ case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START:
e_dialog_combo_box_set (dialog->time_combo, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, time_map);
break;
@@ -1212,9 +1212,9 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
}
if (!setup_select_names (&dialog)) {
- g_object_unref (dialog.xml);
- return FALSE;
- }
+ g_object_unref (dialog.xml);
+ return FALSE;
+ }
init_widgets (&dialog);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index c01ca84..ff08b76 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -116,11 +116,11 @@ struct _CompEditorPrivate {
CalObjModType mod;
- gboolean existing_org;
- gboolean user_org;
+ gboolean existing_org;
+ gboolean user_org;
gboolean is_group_item;
- gboolean warned;
+ gboolean warned;
};
enum {
@@ -549,8 +549,8 @@ save_comp_with_send (CompEditor *editor)
return FALSE;
if ((delegate && !e_cal_get_save_schedules (priv->client)) || (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org, &strip_alarms))) {
- if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp, priv->client))) {
- if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL)
+ if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp, priv->client))) {
+ if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL)
return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH, strip_alarms);
else
return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST, strip_alarms);
@@ -561,7 +561,7 @@ save_comp_with_send (CompEditor *editor)
if (delegate)
return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY, strip_alarms);
}
- }
+ }
return TRUE;
}
@@ -2431,9 +2431,9 @@ real_edit_comp (CompEditor *editor, ECalComponent *comp)
if (comp)
priv->comp = e_cal_component_clone (comp);
- priv->existing_org = e_cal_component_has_organizer (comp);
- priv->user_org = (itip_organizer_is_user (comp, priv->client) || itip_sentby_is_user (comp, priv->client));
- priv->warned = FALSE;
+ priv->existing_org = e_cal_component_has_organizer (comp);
+ priv->user_org = (itip_organizer_is_user (comp, priv->client) || itip_sentby_is_user (comp, priv->client));
+ priv->warned = FALSE;
update_window_border (editor, NULL);
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index 278501b..6a8f8e4 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -151,7 +151,7 @@ GtkAction * comp_editor_get_action (CompEditor *editor,
const gchar *action_name);
GtkActionGroup *
comp_editor_get_action_group (CompEditor *editor,
- const gchar *group_name);
+ const gchar *group_name);
GtkWidget * comp_editor_get_managed_widget (CompEditor *editor,
const gchar *widget_path);
CompEditor * comp_editor_find_instance (const gchar *uid);
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 5af9d4b..87f4584 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -131,7 +131,7 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source,
sopts->accepted = E_RETURN_NOTIFY_MAIL;
}
- value = e_source_get_property (source, "return-decline");
+ value = e_source_get_property (source, "return-decline");
if (value) {
if (!strcmp (value, "none"))
sopts->declined = E_RETURN_NOTIFY_NONE;
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index ee34590..6f0f338 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -323,7 +323,7 @@ event_editor_constructor (GType type,
event_page_show_options (priv->event_page);
comp_editor_set_group_item (editor, TRUE);
- if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) {
+ if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) {
GtkAction *action;
action = comp_editor_get_action (editor, "free-busy");
@@ -345,7 +345,7 @@ event_editor_dispose (GObject *object)
priv = EVENT_EDITOR_GET_PRIVATE (object);
if (priv->event_page) {
- g_object_unref (priv->event_page);
+ g_object_unref (priv->event_page);
priv->event_page = NULL;
}
@@ -697,7 +697,7 @@ event_editor_show_meeting (EventEditor *ee)
ee->priv->meeting_shown = TRUE;
- comp_editor_set_changed (editor, FALSE);
+ comp_editor_set_changed (editor, FALSE);
comp_editor_set_needs_send (editor, TRUE);
}
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 928d159..29e5e1d 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -736,7 +736,7 @@ sensitize_widgets (EventPage *epage)
priv = epage->priv;
if (flags & COMP_EDITOR_MEETING)
- sens = flags & COMP_EDITOR_USER_ORG;
+ sens = flags & COMP_EDITOR_USER_ORG;
if (!e_cal_is_read_only (client, &read_only, NULL))
read_only = TRUE;
@@ -1567,15 +1567,15 @@ void update_end_time_combo (EventPage *epage)
&start_tt.month,
&start_tt.day);
e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
- &start_tt.hour,
- &start_tt.minute);
+ &start_tt.hour,
+ &start_tt.minute);
e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
&end_tt.year,
&end_tt.month,
&end_tt.day);
e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
- &end_tt.hour,
- &end_tt.minute);
+ &end_tt.hour,
+ &end_tt.minute);
end_timet = icaltime_as_timet (end_tt);
start_timet = icaltime_as_timet (start_tt);
@@ -1623,10 +1623,10 @@ hour_minute_changed (EventPage *epage)
icaltime_adjust (&end_tt, 0, for_hours, for_minutes, 0);
e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (priv->end_time),
- end_tt.year,
+ end_tt.year,
end_tt.month,
end_tt.day,
- end_tt.hour,
+ end_tt.hour,
end_tt.minute);
}
@@ -1936,8 +1936,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage)
gtk_tree_selection_unselect_all (selection);
gtk_tree_selection_select_path (selection, path);
- if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL)
- disable_mask &= ~ATTENDEE_CAN_DELETE;
+ if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL)
+ disable_mask &= ~ATTENDEE_CAN_DELETE;
}
}
}
@@ -3054,7 +3054,7 @@ event_page_select_organizer (EventPage *epage, const gchar *backend_address)
if (user_addr)
subscribed_cal = TRUE;
else
- user_addr = (backend_address && *backend_address) ? backend_address : NULL;
+ user_addr = (backend_address && *backend_address) ? backend_address : NULL;
default_address = NULL;
if (user_addr)
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index 5bd377c..ab43c0f 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -108,7 +108,7 @@ void event_page_set_view_rvsp (EventPage *epage,
ENameSelector * event_page_get_name_selector (EventPage *epage);
void event_page_add_attendee (EventPage *epage,
EMeetingAttendee *attendee);
-void event_page_remove_all_attendees (EventPage *epage);
+void event_page_remove_all_attendees (EventPage *epage);
G_END_DECLS
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 4903f8f..4254dce 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -334,15 +334,15 @@ sensitize_widgets (MemoPage *mpage)
read_only = TRUE;
if (flags & COMP_EDITOR_IS_SHARED)
- sens = flags & COMP_EDITOR_USER_ORG;
+ sens = flags & COMP_EDITOR_USER_ORG;
else
sens = TRUE;
sensitize = (!read_only && sens);
/* The list of organizers is set to be non-editable. Otherwise any
- * change in the displayed list causes an 'Account not found' error.
- */
+ * change in the displayed list causes an 'Account not found' error.
+ */
gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (priv->org_combo))), FALSE);
gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->memo_content), sensitize);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 5acc509..c74ed46 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -406,7 +406,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_e_cal_component_attendee (ca));
/* If we aren't the organizer or the attendee is just delegating, don't allow editing */
if (!comp_editor_get_user_org (editor) || e_meeting_attendee_is_set_delto (ia))
- e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE);
+ e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE);
task_page_add_attendee (priv->task_page, ia);
g_object_unref (ia);
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 90eee6d..3cdbe34 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -325,7 +325,7 @@ sensitize_widgets (TaskPage *tpage)
read_only = TRUE;
if (flags & COMP_EDITOR_IS_ASSIGNED)
- sens = flags & COMP_EDITOR_USER_ORG;
+ sens = flags & COMP_EDITOR_USER_ORG;
sensitize = (!read_only && sens);
@@ -1247,8 +1247,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page)
gtk_tree_selection_unselect_all (selection);
gtk_tree_selection_select_path (selection, path);
- if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL)
- disable_mask &= ~ATTENDEE_CAN_DELETE;
+ if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL)
+ disable_mask &= ~ATTENDEE_CAN_DELETE;
}
}
}
diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h
index 6dfb1c6..e65e751 100644
--- a/calendar/gui/e-alarm-list.h
+++ b/calendar/gui/e-alarm-list.h
@@ -32,7 +32,7 @@
G_BEGIN_DECLS
#define E_TYPE_ALARM_LIST (e_alarm_list_get_type ())
-#define E_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList))
+#define E_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList))
#define E_ALARM_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ALARM_LIST, EAlarmListClass))
#define E_IS_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ALARM_LIST))
#define E_IS_ALARM_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_ALARM_LIST))
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index cc1ff58..6e7996d 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -136,7 +136,7 @@ ensure_task_complete (ECalModelComponent *comp_data, time_t completed_date)
if (completed_date == -1) {
if (prop)
set_completed = FALSE;
- else
+ else
completed_date = time (NULL);
}
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index d99efd6..7a1b947 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -180,7 +180,7 @@ e_cal_model_class_init (ECalModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ECalModelClass, cal_view_progress),
NULL, NULL,
- e_marshal_VOID__STRING_INT_INT,
+ e_marshal_VOID__STRING_INT_INT,
G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
signals[CAL_VIEW_DONE] =
g_signal_new ("cal_view_done",
@@ -1534,7 +1534,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
e_table_model_pre_change (E_TABLE_MODEL (model));
e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
- }
+ }
e_cal_component_free_id (id);
g_object_unref (comp);
@@ -1701,7 +1701,7 @@ e_cal_view_progress_cb (ECalView *query, const gchar *message, gint percent, gpo
static void
e_cal_view_done_cb (ECalView *query, ECalendarStatus status, gpointer user_data)
{
- ECalModel *model = (ECalModel *) user_data;
+ ECalModel *model = (ECalModel *) user_data;
ECal *client = e_cal_view_get_client (query);
g_return_if_fail (E_IS_CAL_MODEL (model));
@@ -2164,7 +2164,7 @@ e_cal_model_create_component_with_defaults (ECalModel *model)
comp = cal_comp_task_new_with_defaults (client);
break;
case ICAL_VJOURNAL_COMPONENT :
- comp = cal_comp_memo_new_with_defaults (client);
+ comp = cal_comp_memo_new_with_defaults (client);
break;
default:
return NULL;
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 2c47084..6f3d363 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -128,7 +128,7 @@ typedef struct {
typedef time_t (*ECalModelDefaultTimeFunc)(ECalModel *model, gpointer user_data);
GType e_cal_model_get_type (void);
-GType e_cal_model_component_get_type (void);
+GType e_cal_model_component_get_type (void);
icalcomponent_kind e_cal_model_get_component_kind (ECalModel *model);
void e_cal_model_set_component_kind (ECalModel *model,
icalcomponent_kind kind);
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index ef94eb8..d6bf0ed 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -362,7 +362,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
/* check for e_target_selector's offline_status property here */
offline = e_source_get_property (source, "offline_sync");
if (offline && strcmp (offline, "1") == 0)
- mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE; /* set the menu item to Mark Offline */
+ mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE; /* set the menu item to Mark Offline */
else
mask &= ~E_CAL_POPUP_SOURCE_OFFLINE;
} else {
@@ -374,7 +374,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
/* check for delete_status property here */
delete = e_source_get_property (source, "delete");
if (delete && strcmp (delete, "no") == 0)
- mask &= ~E_CAL_POPUP_SOURCE_NO_DELETE; /* set the menu item to non deletable */
+ mask &= ~E_CAL_POPUP_SOURCE_NO_DELETE; /* set the menu item to non deletable */
else
mask &= ~E_CAL_POPUP_SOURCE_DELETE;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 9009840..88fe49c 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -157,7 +157,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
object_class->destroy = e_calendar_view_destroy;
klass->selection_changed = NULL;
- klass->selected_time_changed = NULL;
+ klass->selected_time_changed = NULL;
klass->event_changed = NULL;
klass->event_added = NULL;
klass->user_created = NULL;
@@ -250,7 +250,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
#if 0 /* KILL-BONOBO */
/* init the accessibility support for e_day_view */
- e_cal_view_a11y_init ();
+ e_cal_view_a11y_init ();
#endif
}
@@ -1185,7 +1185,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
TRUE, zone ? zone : icaltimezone_get_utc_timezone ());
e_cal_util_remove_instances (event->comp_data->icalcomp, instance_rid, CALOBJ_MOD_THIS);
e_cal_modify_object (event->comp_data->client, event->comp_data->icalcomp, CALOBJ_MOD_THIS,
- &error);
+ &error);
}
delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
@@ -2262,10 +2262,10 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client)
/*
* It is expected to show the tooltips in this below format
*
- * <B>SUBJECT OF THE MEETING</B>
- * Organiser: NameOfTheUser<email ofuser com>
- * Location: PlaceOfTheMeeting
- * Time : DateAndTime (xx Minutes)
+ * <B>SUBJECT OF THE MEETING</B>
+ * Organiser: NameOfTheUser<email ofuser com>
+ * Location: PlaceOfTheMeeting
+ * Time : DateAndTime (xx Minutes)
* Status: Accepted: X Declined: Y ...
*/
@@ -2528,38 +2528,38 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0,
return;
if (rect_width / 2 < radius) {
if (rect_height / 2 < radius) {
- cairo_move_to (cr, x0, (y0 + y1)/2);
- cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
- cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
- cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
- cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
+ cairo_move_to (cr, x0, (y0 + y1)/2);
+ cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
+ cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
+ cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
+ cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
} else {
- cairo_move_to (cr, x0, y0 + radius);
- cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
- cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
- cairo_line_to (cr, x1 , y1 - radius);
- cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
- cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
- }
+ cairo_move_to (cr, x0, y0 + radius);
+ cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
+ cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
+ cairo_line_to (cr, x1 , y1 - radius);
+ cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
+ cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
+ }
} else {
if (rect_height / 2 < radius) {
- cairo_move_to (cr, x0, (y0 + y1)/2);
- cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
- cairo_line_to (cr, x1 - radius, y0);
- cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
- cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
- cairo_line_to (cr, x0 + radius, y1);
- cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
+ cairo_move_to (cr, x0, (y0 + y1)/2);
+ cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
+ cairo_line_to (cr, x1 - radius, y0);
+ cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
+ cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
+ cairo_line_to (cr, x0 + radius, y1);
+ cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
} else {
- cairo_move_to (cr, x0, y0 + radius);
- cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
- cairo_line_to (cr, x1 - radius, y0);
- cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
- cairo_line_to (cr, x1 , y1 - radius);
- cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
- cairo_line_to (cr, x0 + radius, y1);
- cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
- }
+ cairo_move_to (cr, x0, y0 + radius);
+ cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
+ cairo_line_to (cr, x1 - radius, y0);
+ cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
+ cairo_line_to (cr, x1 , y1 - radius);
+ cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
+ cairo_line_to (cr, x0 + radius, y1);
+ cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
+ }
}
cairo_close_path (cr);
}
diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h
index fe5e1fd..cdf279a 100644
--- a/calendar/gui/e-date-time-list.h
+++ b/calendar/gui/e-date-time-list.h
@@ -32,7 +32,7 @@
G_BEGIN_DECLS
#define E_TYPE_DATE_TIME_LIST (e_date_time_list_get_type ())
-#define E_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList))
+#define E_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList))
#define E_DATE_TIME_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_TIME_LIST, EDateTimeListClass))
#define E_IS_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DATE_TIME_LIST))
#define E_IS_DATE_TIME_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DATE_TIME_LIST))
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index 682c99e..942f739 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -353,7 +353,7 @@ set_show_event_end (EDayView *day_view)
{
gboolean show_event_end;
- show_event_end = calendar_config_get_show_event_end ();
+ show_event_end = calendar_config_get_show_event_end ();
e_day_view_set_show_event_end_times (day_view, show_event_end);
}
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index 5b5536d..ab1f6c0 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -40,14 +40,14 @@ static void e_day_view_layout_long_event (EDayViewEvent *event,
static void e_day_view_layout_day_event (EDayViewEvent *event,
EBitArray **grid,
guint16 *group_starts,
- guint8 *cols_per_row,
- gint rows,
- gint mins_per_row,
+ guint8 *cols_per_row,
+ gint rows,
+ gint mins_per_row,
gint max_cols);
static void e_day_view_expand_day_event (EDayViewEvent *event,
EBitArray **grid,
- guint8 *cols_per_row,
- gint mins_per_row);
+ guint8 *cols_per_row,
+ gint mins_per_row);
static void e_day_view_recalc_cols_per_row (gint rows,
guint8 *cols_per_row,
guint16 *group_starts);
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index c8449c0..2a705b8 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -112,7 +112,7 @@ e_day_view_main_item_class_init (EDayViewMainItemClass *class)
/* init the accessibility support for e_day_view */
#if 0 /* KILL-BONOBO */
- e_day_view_main_item_a11y_init ();
+ e_day_view_main_item_a11y_init ();
#endif
}
@@ -643,7 +643,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
gconf = gconf_client_get_default ();
alpha = gconf_client_get_float (gconf,
- "/apps/evolution/calendar/display/events_transparency",
+ "/apps/evolution/calendar/display/events_transparency",
NULL);
gradient = gconf_client_get_bool (gconf,
@@ -790,7 +790,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
/* Black border */
cairo_save (cr);
x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 9;
- y0 = item_y + 10;
+ y0 = item_y + 10;
rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 7, 0);
rect_height = item_h - 7;
@@ -1219,7 +1219,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
{
if (event->start_minute % day_view->mins_per_row != 0
|| (day_view->show_event_end_times
- && event->end_minute % day_view->mins_per_row != 0)) {
+ && event->end_minute % day_view->mins_per_row != 0)) {
offset = day_view->first_hour_shown * 60
+ day_view->first_minute_shown;
show_span = TRUE;
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 4cbfadd..78bf558 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -365,7 +365,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
/* diff is number of minutes */
diff = (icaltimezone_get_utc_offset (use_zone, &tt, NULL) -
- icaltimezone_get_utc_offset (cal_zone, &tt, NULL)
+ icaltimezone_get_utc_offset (cal_zone, &tt, NULL)
) / 60;
tt = icaltime_today ();
@@ -834,7 +834,7 @@ e_day_view_time_item_on_set_divisions (GtkWidget *item,
day_view = dvtmitem->day_view;
g_return_if_fail (day_view != NULL);
- if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item)))
+ if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item)))
return;
divisions = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "divisions"));
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index de9a542..7579f00 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -395,8 +395,8 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
gconf_client = gconf_client_get_default ();
alpha = gconf_client_get_float (gconf_client,
- "/apps/evolution/calendar/display/events_transparency",
- NULL);
+ "/apps/evolution/calendar/display/events_transparency",
+ NULL);
gradient = gconf_client_get_bool (gconf_client,
"/apps/evolution/calendar/display/events_gradient",
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 435fada..7b76e00 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -129,7 +129,7 @@ static gint e_day_view_focus_out (GtkWidget *widget,
static gboolean e_day_view_key_press (GtkWidget *widget,
GdkEventKey *event);
static gboolean e_day_view_focus (GtkWidget *widget,
- GtkDirectionType direction);
+ GtkDirectionType direction);
static gboolean e_day_view_get_next_tab_event (EDayView *day_view,
GtkDirectionType direction,
gint *day, gint *event_num);
@@ -452,11 +452,11 @@ e_day_view_class_init (EDayViewClass *class)
widget_class->realize = e_day_view_realize;
widget_class->unrealize = e_day_view_unrealize;
widget_class->style_set = e_day_view_style_set;
- widget_class->size_allocate = e_day_view_size_allocate;
+ widget_class->size_allocate = e_day_view_size_allocate;
widget_class->focus_in_event = e_day_view_focus_in;
widget_class->focus_out_event = e_day_view_focus_out;
widget_class->key_press_event = e_day_view_key_press;
- widget_class->focus = e_day_view_focus;
+ widget_class->focus = e_day_view_focus;
widget_class->popup_menu = e_day_view_popup_menu;
view_class->get_selected_events = e_day_view_get_selected_events;
@@ -467,7 +467,7 @@ e_day_view_class_init (EDayViewClass *class)
#if 0 /* KILL-BONOBO */
/* init the accessibility support for e_day_view */
- e_day_view_a11y_init ();
+ e_day_view_a11y_init ();
#endif
}
@@ -1242,19 +1242,19 @@ e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *
gdouble cc = 65535.0;
red = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red;
- green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green;
- blue = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue;
+ green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green;
+ blue = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue;
if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), event->comp_data),
- &bg_color)) {
+ &bg_color)) {
GdkColormap *colormap;
- colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
- if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
- red = bg_color.red;
+ colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
+ if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
+ red = bg_color.red;
green = bg_color.green;
- blue = bg_color.blue;
+ blue = bg_color.blue;
}
- }
+ }
if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
return widget->style->black;
@@ -2580,7 +2580,7 @@ e_day_view_update_marcus_bains (EDayView *day_view)
void
e_day_view_set_marcus_bains (EDayView *day_view,
gboolean show_line,
- const gchar *dayview_color,
+ const gchar *dayview_color,
const gchar *timebar_color)
{
g_return_if_fail (E_IS_DAY_VIEW (day_view));
@@ -4024,11 +4024,11 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
}
e_cal_component_commit_sequence (comp);
- if (e_cal_component_has_recurrences (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- gtk_widget_queue_draw (day_view->top_canvas);
+ if (e_cal_component_has_recurrences (comp)) {
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ gtk_widget_queue_draw (day_view->top_canvas);
goto out;
- }
+ }
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -4061,7 +4061,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
out:
- day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
+ day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
g_object_unref (comp);
}
@@ -4135,11 +4135,11 @@ e_day_view_finish_resize (EDayView *day_view)
day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
- if (e_cal_component_has_recurrences (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- gtk_widget_queue_draw (day_view->top_canvas);
+ if (e_cal_component_has_recurrences (comp)) {
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ gtk_widget_queue_draw (day_view->top_canvas);
goto out;
- }
+ }
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -4943,9 +4943,9 @@ e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
/*Go to the start/end of a work day*/
if ((keyval == GDK_Home)
- &&((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)
- &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
- &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) {
+ &&((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)
+ &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
+ &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) {
e_day_view_goto_start_of_work_day (day_view);
return TRUE;
}
@@ -6152,11 +6152,11 @@ e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt
day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
- if (e_cal_component_has_recurrences (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- gtk_widget_queue_draw (day_view->top_canvas);
+ if (e_cal_component_has_recurrences (comp)) {
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ gtk_widget_queue_draw (day_view->top_canvas);
goto out;
- }
+ }
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -7426,7 +7426,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
GtkSelectionData *data,
guint info,
guint time,
- EDayView *day_view)
+ EDayView *day_view)
{
EDayViewEvent *event=NULL;
ECalendarViewPosition pos;
@@ -7957,7 +7957,7 @@ e_day_view_paste_text (ECalendarView *cal_view)
if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT) {
event = &g_array_index (day_view->long_events,
- EDayViewEvent,
+ EDayViewEvent,
day_view->editing_event_num);
} else {
event = &g_array_index (day_view->events[day_view->editing_event_day],
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 8fde1e9..2b3f11e 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -530,7 +530,7 @@ void e_day_view_set_working_day (EDayView *day_view,
gboolean e_day_view_get_show_marcus_bains (EDayView *day_view);
void e_day_view_set_marcus_bains (EDayView *day_view,
gboolean show_line,
- const gchar *dayview_color,
+ const gchar *dayview_color,
const gchar *timebar_color);
/* Whether we display event end times in the main canvas. */
@@ -604,9 +604,9 @@ gint e_day_view_event_sort_func (const void *arg1,
const void *arg2);
gboolean e_day_view_find_event_from_item (EDayView *day_view,
- GnomeCanvasItem *item,
- gint *day_return,
- gint *event_num_return);
+ GnomeCanvasItem *item,
+ gint *day_return,
+ gint *event_num_return);
void e_day_view_update_calendar_selection_time (EDayView *day_view);
void e_day_view_ensure_rows_visible (EDayView *day_view,
gint start_row,
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index ae45ee5..d849c46 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -1105,12 +1105,12 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
itip_strip_mailto (organizer.value),
priv->delegator_name ?
priv->delegator_name :
- priv->delegator_address);
+ priv->delegator_address);
else
html = g_strdup_printf (itip_desc, _("An unknown person"),
priv->delegator_name ?
priv->delegator_name :
- priv->delegator_address);
+ priv->delegator_address);
} else {
if (organizer.value != NULL)
html = g_strdup_printf (itip_desc,
@@ -1284,7 +1284,7 @@ get_cancel_options (gboolean found, icalcomponent_kind kind)
case ICAL_VEVENT_COMPONENT:
return g_strdup_printf ("<i>%s</i>", _("The meeting has been canceled, however it could not be found in your calendars"));
case ICAL_VTODO_COMPONENT:
- return g_strdup_printf ("<i>%s</i>", _("The task has been canceled, however it could not be found in your task lists"));
+ return g_strdup_printf ("<i>%s</i>", _("The task has been canceled, however it could not be found in your task lists"));
default:
g_return_val_if_reached (NULL);
}
@@ -2191,7 +2191,7 @@ url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpoint
return;
}
- while ((len = read (fd, buffer, 4096)) > 0) {
+ while ((len = read (fd, buffer, 4096)) > 0) {
gtk_html_write (html, handle, (gchar *)buffer, len);
}
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 8567aa0..924ab67 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -15,7 +15,7 @@
*
* Authors:
* Mike Kestner <mkestner ximian com>
- * JP Rosevear <jpr ximian com>
+ * JP Rosevear <jpr ximian com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
@@ -97,7 +97,7 @@ e_meeting_list_view_finalize (GObject *obj)
g_free (priv);
if (G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize)
- (* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj);
+ (* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj);
}
static void
@@ -150,7 +150,7 @@ e_meeting_list_view_init (EMeetingListView *view)
name_selector_dialog = e_name_selector_peek_dialog (view->priv->name_selector);
gtk_window_set_title (GTK_WINDOW (name_selector_dialog), _("Attendees"));
- g_signal_connect (name_selector_dialog, "response",
+ g_signal_connect (name_selector_dialog, "response",
G_CALLBACK (name_selector_dialog_close_cb), view);
}
@@ -908,7 +908,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin
EMeetingStore *store;
const GPtrArray *attendees;
gint i;
- GSList *la = NULL, *l;
+ GSList *la = NULL, *l;
name_selector_model = e_name_selector_peek_model (view->priv->name_selector);
store = E_MEETING_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view)));
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index e843bee..b555c41 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -15,7 +15,7 @@
*
* Authors:
* JP Rosevear <jpr ximian com>
- * Mike Kestner <mkestner ximian com>
+ * Mike Kestner <mkestner ximian com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
@@ -539,13 +539,13 @@ ems_finalize (GObject *obj)
if (priv->client != NULL)
g_object_unref (priv->client);
- while (priv->refresh_queue->len > 0)
- refresh_queue_remove (store, g_ptr_array_index (priv->refresh_queue, 0));
- g_ptr_array_free (priv->refresh_queue, TRUE);
- g_hash_table_destroy (priv->refresh_data);
+ while (priv->refresh_queue->len > 0)
+ refresh_queue_remove (store, g_ptr_array_index (priv->refresh_queue, 0));
+ g_ptr_array_free (priv->refresh_queue, TRUE);
+ g_hash_table_destroy (priv->refresh_data);
- if (priv->refresh_idle_id)
- g_source_remove (priv->refresh_idle_id);
+ if (priv->refresh_idle_id)
+ g_source_remove (priv->refresh_idle_id);
g_free (priv->fb_uri);
@@ -554,7 +554,7 @@ ems_finalize (GObject *obj)
g_free (priv);
if (G_OBJECT_CLASS (parent_class)->finalize)
- (* G_OBJECT_CLASS (parent_class)->finalize) (obj);
+ (* G_OBJECT_CLASS (parent_class)->finalize) (obj);
}
static void
@@ -1048,19 +1048,19 @@ process_free_busy_comp (EMeetingAttendee *attendee,
static void
process_free_busy (EMeetingStoreQueueData *qdata, gchar *text)
{
- EMeetingStore *store = qdata->store;
- EMeetingStorePrivate *priv;
- EMeetingAttendee *attendee = qdata->attendee;
+ EMeetingStore *store = qdata->store;
+ EMeetingStorePrivate *priv;
+ EMeetingAttendee *attendee = qdata->attendee;
icalcomponent *main_comp;
icalcomponent_kind kind = ICAL_NO_COMPONENT;
priv = store->priv;
main_comp = icalparser_parse_string (text);
- if (main_comp == NULL) {
- process_callbacks (qdata);
- return;
- }
+ if (main_comp == NULL) {
+ process_callbacks (qdata);
+ return;
+ }
kind = icalcomponent_isa (main_comp);
if (kind == ICAL_VCALENDAR_COMPONENT) {
@@ -1136,7 +1136,7 @@ freebusy_async (gpointer data)
FreeBusyAsyncData *fbd = data;
EMeetingAttendee *attendee = fbd->attendee;
gchar *default_fb_uri = NULL;
- gchar *fburi = NULL;
+ gchar *fburi = NULL;
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
EMeetingStorePrivate *priv = fbd->store->priv;
@@ -1341,8 +1341,8 @@ refresh_queue_add (EMeetingStore *store, gint row,
e_meeting_attendee_clear_busy_periods (attendee);
e_meeting_attendee_set_has_calendar_info (attendee, FALSE);
- qdata->start = *start;
- qdata->end = *end;
+ qdata->start = *start;
+ qdata->end = *end;
qdata->string = g_string_new (NULL);
qdata->call_backs = g_ptr_array_new ();
qdata->data = g_ptr_array_new ();
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 95a1738..00efabe 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -726,7 +726,7 @@ e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorIt
{
EMeetingTimeSelector *mts;
EMeetingAttendee *ia;
- const GArray *busy_periods;
+ const GArray *busy_periods;
EMeetingFreeBusyPeriod *period;
GdkGC *gc;
gint period_num, x1, x2, x2_within_day, x2_within_col;
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 2628235..da33eb4 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -63,7 +63,7 @@ const gchar *EMeetingTimeSelectorHours12[24] = {
};
/* The number of days shown in the entire canvas. */
-#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN 35
+#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN 35
#define E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE 7
#define E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE 7
#define E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER 28
diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c
index c981be8..423a12a 100644
--- a/calendar/gui/e-week-view-config.c
+++ b/calendar/gui/e-week-view-config.c
@@ -193,7 +193,7 @@ set_show_event_end (EWeekView *week_view)
{
gboolean show_event_end;
- show_event_end = calendar_config_get_show_event_end ();
+ show_event_end = calendar_config_get_show_event_end ();
e_week_view_set_show_event_end_times (week_view, show_event_end);
}
@@ -214,7 +214,7 @@ set_compress_weekend (EWeekView *week_view)
{
gboolean compress_weekend;
- compress_weekend = calendar_config_get_compress_weekend ();
+ compress_weekend = calendar_config_get_compress_weekend ();
e_week_view_set_compress_weekend (week_view, compress_weekend);
}
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index a8123bd..f72c9df 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -179,7 +179,7 @@ static void
e_week_view_event_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags)
+ int flags)
{
EWeekViewEventItem *wveitem;
EWeekView *week_view;
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index a0e7aae..e0b1463 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -93,7 +93,7 @@ e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
#if 0 /* KILL-BONOBO */
/* init the accessibility support for e_week_view_main_item */
- e_week_view_main_item_a11y_init ();
+ e_week_view_main_item_a11y_init ();
#endif
}
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 04fa910..4d0e97b 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -211,7 +211,7 @@ e_week_view_class_init (EWeekViewClass *class)
widget_class->realize = e_week_view_realize;
widget_class->unrealize = e_week_view_unrealize;
widget_class->style_set = e_week_view_style_set;
- widget_class->size_allocate = e_week_view_size_allocate;
+ widget_class->size_allocate = e_week_view_size_allocate;
widget_class->focus_in_event = e_week_view_focus_in;
widget_class->focus_out_event = e_week_view_focus_out;
widget_class->key_press_event = e_week_view_key_press;
@@ -828,19 +828,19 @@ e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidg
gdouble cc = 65535.0;
red = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red;
- green = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green;
- blue = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue;
+ green = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green;
+ blue = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue;
if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)), event->comp_data),
- &bg_color)) {
+ &bg_color)) {
GdkColormap *colormap;
- colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));
- if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
- red = bg_color.red;
+ colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));
+ if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
+ red = bg_color.red;
green = bg_color.green;
- blue = bg_color.blue;
+ blue = bg_color.blue;
}
- }
+ }
if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
return widget->style->black;
@@ -2689,7 +2689,7 @@ tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item)
static gboolean
tooltip_event_cb (GnomeCanvasItem *item,
- GdkEvent *event,
+ GdkEvent *event,
EWeekView *view)
{
gint event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
@@ -3488,11 +3488,11 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end
week_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
- if (e_cal_component_has_recurrences (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- gtk_widget_queue_draw (week_view->main_canvas);
+ if (e_cal_component_has_recurrences (comp)) {
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ gtk_widget_queue_draw (week_view->main_canvas);
goto out;
- }
+ }
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 0936a1e..605c96b 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -441,9 +441,9 @@ gint e_week_view_event_sort_func (const void *arg1,
const void *arg2);
gboolean e_week_view_find_event_from_item (EWeekView *week_view,
- GnomeCanvasItem *item,
- gint *event_num_return,
- gint *span_num_return);
+ GnomeCanvasItem *item,
+ gint *event_num_return,
+ gint *span_num_return);
gboolean e_week_view_is_jump_button_visible (EWeekView *week_view,
gint day);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 9d28807..a46995a 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -151,7 +151,7 @@ struct _GnomeCalendarPrivate {
gint hpane_pos;
gint hpane_pos_month_view;
gint vpane_pos;
- gint vpane_pos_month_view;
+ gint vpane_pos_month_view;
/* The signal handler id for our GtkCalendar "day_selected" handler. */
guint day_selected_id;
@@ -189,7 +189,7 @@ enum {
GOTO_DATE,
SOURCE_ADDED,
SOURCE_REMOVED,
- CHANGE_VIEW,
+ CHANGE_VIEW,
LAST_SIGNAL
};
@@ -340,7 +340,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
class->source_added = NULL;
class->source_removed = NULL;
class->goto_date = gnome_calendar_goto_date;
- class->change_view = gnome_calendar_change_view;
+ class->change_view = gnome_calendar_change_view;
/*
* Key bindings
@@ -414,33 +414,33 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
G_TYPE_ENUM,
GNOME_CAL_GOTO_SAME_DAY_OF_NEXT_WEEK);
- /* Ctrl+Y/J/K/M/L to switch between
+ /* Ctrl+Y/J/K/M/L to switch between
* DayView/WorkWeekView/WeekView/MonthView/ListView */
- gtk_binding_entry_add_signal (binding_set, GDK_y,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_DAY_VIEW);
- gtk_binding_entry_add_signal (binding_set, GDK_j,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_WORK_WEEK_VIEW);
- gtk_binding_entry_add_signal (binding_set, GDK_k,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_WEEK_VIEW);
- gtk_binding_entry_add_signal (binding_set, GDK_m,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_MONTH_VIEW);
+ gtk_binding_entry_add_signal (binding_set, GDK_y,
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_DAY_VIEW);
+ gtk_binding_entry_add_signal (binding_set, GDK_j,
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_WORK_WEEK_VIEW);
+ gtk_binding_entry_add_signal (binding_set, GDK_k,
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_WEEK_VIEW);
+ gtk_binding_entry_add_signal (binding_set, GDK_m,
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_MONTH_VIEW);
gtk_binding_entry_add_signal (binding_set, GDK_l,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_LIST_VIEW);
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_LIST_VIEW);
/* init the accessibility support for gnome_calendar */
gnome_calendar_a11y_init ();
@@ -3231,32 +3231,32 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
GtkWidget *
gnome_calendar_get_e_calendar_widget (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return GTK_WIDGET(gcal->priv->date_navigator);
+ return GTK_WIDGET(gcal->priv->date_navigator);
}
GtkWidget *
gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return GTK_WIDGET(gcal->priv->search_bar);
+ return GTK_WIDGET(gcal->priv->search_bar);
}
GtkWidget *
gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return GTK_WIDGET(gcal->priv->notebook);
+ return GTK_WIDGET(gcal->priv->notebook);
}
ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return gcal->priv->calendar_menu;
+ return gcal->priv->calendar_menu;
}
void
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 3b94615..dfef719 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -100,7 +100,7 @@ struct _GnomeCalendarClass {
};
-GType gnome_calendar_get_type (void);
+GType gnome_calendar_get_type (void);
GtkWidget *gnome_calendar_construct (GnomeCalendar *gcal);
GtkWidget *gnome_calendar_new (void);
@@ -115,11 +115,11 @@ gboolean gnome_calendar_remove_source (GnomeCalendar *gcal, ESource *source)
gboolean gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, const gchar *uid);
gboolean gnome_calendar_set_default_source (GnomeCalendar *gcal, ESource *source);
-void gnome_calendar_next (GnomeCalendar *gcal);
-void gnome_calendar_previous (GnomeCalendar *gcal);
-void gnome_calendar_goto (GnomeCalendar *gcal,
+void gnome_calendar_next (GnomeCalendar *gcal);
+void gnome_calendar_previous (GnomeCalendar *gcal);
+void gnome_calendar_goto (GnomeCalendar *gcal,
time_t new_time);
-void gnome_calendar_dayjump (GnomeCalendar *gcal,
+void gnome_calendar_dayjump (GnomeCalendar *gcal,
time_t time);
/* Jumps to the current day */
void gnome_calendar_goto_today (GnomeCalendar *gcal);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 065434e..9056650 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -94,20 +94,20 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_
e_cal_component_get_organizer (comp, &organizer);
if (organizer.value != NULL) {
- strip = itip_strip_mailto (organizer.value);
+ strip = itip_strip_mailto (organizer.value);
- if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) {
- gchar *email = NULL;
+ if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) {
+ gchar *email = NULL;
- if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
+ if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
g_free (email);
- return TRUE;
+ return TRUE;
}
g_free (email);
- return FALSE;
- }
+ return FALSE;
+ }
user_org = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
}
@@ -436,7 +436,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
GPtrArray *array = NULL;
EDestination *destination;
gint len;
- gchar *sender = NULL;
+ gchar *sender = NULL;
union {
gpointer *pdata;
@@ -1386,13 +1386,13 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
if (text_list){
ECalComponentText text = *((ECalComponentText *)text_list->data);
- if (text.value)
- description = text.value;
- else
- description = "";
- } else {
- description = "";
- }
+ if (text.value)
+ description = text.value;
+ else
+ description = "";
+ } else {
+ description = "";
+ }
e_cal_component_free_text_list (text_list);
@@ -1502,8 +1502,8 @@ itip_publish_begin (ECalComponent *pub_comp, ECal *client,
icomp_clone = e_cal_component_get_icalcomponent (*clone);
for (prop = icalcomponent_get_first_property (icomp,
ICAL_FREEBUSY_PROPERTY);
- prop != NULL;
- prop = icalcomponent_get_next_property (icomp,
+ prop != NULL;
+ prop = icalcomponent_get_next_property (icomp,
ICAL_FREEBUSY_PROPERTY))
{
icalproperty *p;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index b087d6a..6ecd39f 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1353,7 +1353,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
max_font_size = ((top - bottom) / pdi.rows) - 4;
else
max_font_size = ((bottom - top ) / pdi.rows) - 4;
- font_size = MIN(DAY_NORMAL_FONT_SIZE, max_font_size);
+ font_size = MIN(DAY_NORMAL_FONT_SIZE, max_font_size);
font = get_font_for_size (font_size, PANGO_WEIGHT_NORMAL);
for (i = 0; i < pdi.events[0]->len; i++) {
@@ -1700,13 +1700,13 @@ print_week_summary_cb (ECalComponent *comp,
gpointer data)
{
- icaltimezone *zone = calendar_config_get_icaltimezone ();
- EWeekViewEvent event;
- struct icaltimetype start_tt, end_tt;
+ icaltimezone *zone = calendar_config_get_icaltimezone ();
+ EWeekViewEvent event;
+ struct icaltimetype start_tt, end_tt;
ECalModelGenerateInstancesData *mdata = (ECalModelGenerateInstancesData *) data;
- struct psinfo *psi = (struct psinfo *) mdata->cb_data;
+ struct psinfo *psi = (struct psinfo *) mdata->cb_data;
- /* Check that the event times are valid. */
+ /* Check that the event times are valid. */
#if 0
g_print ("View start:%li end:%li Event start:%li end:%li\n",
@@ -1714,12 +1714,12 @@ print_week_summary_cb (ECalComponent *comp,
start, end);
#endif
- g_return_val_if_fail (start <= end, TRUE);
- g_return_val_if_fail (start < psi->day_starts[psi->days_shown], TRUE);
- g_return_val_if_fail (end > psi->day_starts[0], TRUE);
+ g_return_val_if_fail (start <= end, TRUE);
+ g_return_val_if_fail (start < psi->day_starts[psi->days_shown], TRUE);
+ g_return_val_if_fail (end > psi->day_starts[0], TRUE);
- start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);
- end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);
+ start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);
+ end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);
event.comp_data = e_cal_model_copy_component_data (mdata->comp_data);
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index e2d3ee6..42a69b4 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -263,7 +263,7 @@ tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
g_signal_handlers_disconnect_matched (tasks, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
bonobo_ui_component_rm (uic, "/", NULL);
- bonobo_ui_component_unset_container (uic, NULL);
+ bonobo_ui_component_unset_container (uic, NULL);
}
static void
diff --git a/calendar/module/e-memo-shell-migrate.c b/calendar/module/e-memo-shell-migrate.c
index ccda666..5a161cf 100644
--- a/calendar/module/e-memo-shell-migrate.c
+++ b/calendar/module/e-memo-shell-migrate.c
@@ -159,7 +159,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar
return;
soap_port = camel_url_get_param (url, "soap_port");
- if (!soap_port || strlen (soap_port) == 0)
+ if (!soap_port || strlen (soap_port) == 0)
soap_port = "7191";
use_ssl = camel_url_get_param (url, "use_ssl");
diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h
index c136e99..3360090 100644
--- a/composer/e-composer-header.h
+++ b/composer/e-composer-header.h
@@ -69,7 +69,7 @@ void e_composer_header_set_sensitive (EComposerHeader *header,
gboolean e_composer_header_get_visible (EComposerHeader *header);
void e_composer_header_set_visible (EComposerHeader *header,
gboolean visible);
-void e_composer_header_set_property (GObject *object, guint property_id,
+void e_composer_header_set_property (GObject *object, guint property_id,
const GValue *value, GParamSpec *pspec);
void e_composer_header_set_title_tooltip
(EComposerHeader *header,
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 5a91197..7a178e3 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1181,7 +1181,7 @@ get_signature_html (EMsgComposer *composer)
"<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD><BR>"
"%s%s%s%s"
"</TD></TR></TABLE>",
- encoded_uid ? encoded_uid : "",
+ encoded_uid ? encoded_uid : "",
format_html ? "" : "<PRE>\n",
format_html || (!strncmp ("-- \n", text, 4) || strstr (text, "\n-- \n")) ? "" : "-- \n",
text,
@@ -1564,7 +1564,7 @@ msg_composer_map (GtkWidget *widget)
static gint
msg_composer_delete_event (GtkWidget *widget,
- GdkEventAny *event)
+ GdkEventAny *event)
{
/* This is needed for the ACTION macro. */
EMsgComposer *composer = E_MSG_COMPOSER (widget);
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 36f4245..b51ca46 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -554,9 +554,9 @@ ec_rebuild(EConfig *emp)
/* CONFIG_PAGEs depend on the config type.
E_CONFIG_BOOK:
- The page is a VBox, stored in the notebook.
+ The page is a VBox, stored in the notebook.
E_CONFIG_DRUID
- The page is a GnomeDruidPageStandard,
+ The page is a GnomeDruidPageStandard,
any sections automatically added are added to
the vbox inside it. */
sectionno = 0;
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index b44cd17..8740c78 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -15,7 +15,7 @@
*
* Authors:
* Michael Meeks <michael ximian com>
- * Ettore Perazzoli <ettore ximian com>
+ * Ettore Perazzoli <ettore ximian com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index a708550..02f9bc2 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -34,13 +34,13 @@
G_DEFINE_TYPE (ESorterArray, e_sorter_array, E_SORTER_TYPE)
-static void esa_sort (ESorterArray *esa);
-static void esa_backsort (ESorterArray *esa);
+static void esa_sort (ESorterArray *esa);
+static void esa_backsort (ESorterArray *esa);
-static gint esa_model_to_sorted (ESorter *sorter, gint row);
-static gint esa_sorted_to_model (ESorter *sorter, gint row);
-static void esa_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
-static void esa_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
+static gint esa_model_to_sorted (ESorter *sorter, gint row);
+static gint esa_sorted_to_model (ESorter *sorter, gint row);
+static void esa_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
+static void esa_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
static gboolean esa_needs_sorting (ESorter *esa);
#define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))->compare != NULL)
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 99635e2..efb8c7e 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -38,8 +38,8 @@ extern "C" {
#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE (e_text_event_processor_emacs_like_get_type ())
#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLike))
#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLikeClass))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
+#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
+#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
typedef struct _ETextEventProcessorEmacsLike ETextEventProcessorEmacsLike;
diff --git a/e-util/e-util.h b/e-util/e-util.h
index db35507..abc7635 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -76,8 +76,8 @@ guint32 e_color_to_value (GdkColor *color);
gchar * e_format_number (gint number);
typedef gint (*ESortCompareFunc) (gconstpointer first,
- gconstpointer second,
- gpointer closure);
+ gconstpointer second,
+ gpointer closure);
void e_bsearch (gconstpointer key,
gconstpointer base,
@@ -128,7 +128,7 @@ gchar * e_file_get_save_path (void);
gboolean e_file_lock_create (void);
void e_file_lock_destroy (void);
-gboolean e_file_lock_exists (void);
+gboolean e_file_lock_exists (void);
gchar * e_util_guess_mime_type (const gchar *filename,
gboolean localfile);
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 391b6b5..bee5f0c 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -237,7 +237,7 @@ em_format_get_type (void)
void
em_format_class_add_handler(EMFormatClass *emfc, EMFormatHandler *info)
{
- d(printf("adding format handler to '%s' '%s'\n", g_type_name_from_class((GTypeClass *)emfc), info->mime_type));
+ d(printf("adding format handler to '%s' '%s'\n", g_type_name_from_class((GTypeClass *)emfc), info->mime_type));
info->old = g_hash_table_lookup(emfc->type_handlers, info->mime_type);
g_hash_table_insert(emfc->type_handlers, (gpointer) info->mime_type, info);
}
@@ -1729,7 +1729,7 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E
camel_exception_free(ex);
camel_object_unref(cipher);
return;
- }
+ }
/* Setup output stream */
ostream = camel_stream_mem_new();
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 2247810..f8dc448 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -128,7 +128,7 @@ filter_part_validate (FilterPart *fp)
while (l && correct) {
FilterElement *fe = l->data;
- correct = filter_element_validate (fe);
+ correct = filter_element_validate (fe);
l = l->next;
}
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index ecada87..9009fd1 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -57,7 +57,7 @@ enum _filter_threading_t {
#define FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */
#define FILTER_SOURCE_DEMAND "demand" /* performed on the selected folder
- * when the user asks for it */
+ * when the user asks for it */
#define FILTER_SOURCE_OUTGOING "outgoing"/* performed on outgoing mail */
#define FILTER_SOURCE_JUNKTEST "junktest"/* perform only junktest on incoming mail */
diff --git a/mail/e-mail-shell-backend.c b/mail/e-mail-shell-backend.c
index 10a99e7..05bf2e4 100644
--- a/mail/e-mail-shell-backend.c
+++ b/mail/e-mail-shell-backend.c
@@ -88,8 +88,8 @@ struct _StoreInfo {
/* Initialization callback. */
void (*done) (CamelStore *store,
- CamelFolderInfo *info,
- gpointer user_data);
+ CamelFolderInfo *info,
+ gpointer user_data);
gpointer done_user_data;
guint removed : 1;
diff --git a/mail/e-mail-shell-migrate.c b/mail/e-mail-shell-migrate.c
index 862f807..147cce0 100644
--- a/mail/e-mail-shell-migrate.c
+++ b/mail/e-mail-shell-migrate.c
@@ -2378,7 +2378,7 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath)
/* Copy the mangled path. */
p = vpath;
- while (1) {
+ while (1) {
newp = strchr (p, '/');
if (newp == NULL) {
strcpy (dp, p);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index c433558..67d26f4 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -671,10 +671,10 @@ create_new_composer (const gchar *subject, const gchar *fromuri, gboolean lite)
EComposerHeaderTable *table;
EAccount *account = NULL;
- if (lite)
- composer = e_msg_composer_lite_new ();
- else
- composer = e_msg_composer_new ();
+ if (lite)
+ composer = e_msg_composer_lite_new ();
+ else
+ composer = e_msg_composer_new ();
table = e_msg_composer_get_header_table (composer);
if (fromuri != NULL) {
diff --git a/mail/em-event.h b/mail/em-event.h
index 81173fe..0af3208 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -134,7 +134,7 @@ struct _EMEventTargetCustomIcon {
EEventTarget target;
GtkCellRenderer *renderer;
- const gchar *folder_name;
+ const gchar *folder_name;
};
typedef struct _EEventItem EMEventItem;
diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c
index 5a82c6e..4817d89 100644
--- a/mail/em-filter-context.c
+++ b/mail/em-filter-context.c
@@ -291,7 +291,7 @@ filter_new_element(RuleContext *rc, const gchar *type)
} else if (!strcmp(type, "score")) {
return (FilterElement *) filter_int_new_type("score", -3, 3);
} else if (!strcmp(type, "source")) {
- return (FilterElement *) em_filter_source_element_new();
+ return (FilterElement *) em_filter_source_element_new();
} else {
return parent_class->new_element(rc, type);
}
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index cb45194..cd3f35d 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -281,7 +281,7 @@ emfb_init(GObject *o)
// efb = (EFilterBar *)emfb->search;
// efb->account_search_vf = NULL;
// efb->all_account_search_vf = NULL;
-// efb->account_search_cancel = NULL;
+// efb->account_search_cancel = NULL;
// e_search_bar_set_menu ((ESearchBar *)emfb->search, emfb_search_items);
// e_search_bar_set_scopeoption ((ESearchBar *)emfb->search, emfb_search_scope_items);
// e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, FALSE);
@@ -588,9 +588,9 @@ vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList
m->sources_uri = sources_uri;
m->sources_folder = sources_folder;
- if (cancel) {
- m->cancel = cancel;
- }
+ if (cancel) {
+ m->cancel = cancel;
+ }
id = m->base.seq;
mail_msg_slow_ordered_push (m);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index de04319..77bcdee 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -638,7 +638,7 @@ emft_maybe_expand_row (EMFolderTreeModel *model, GtkTreePath *tree_path, GtkTree
si = g_hash_table_lookup (model->store_hash, store);
if ((account = e_get_account_by_name (si->display_name))) {
- key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
+ key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
} else if (CAMEL_IS_VEE_STORE (store)) {
/* vfolder store */
key = g_strdup_printf ("vfolder/%s", full_name ? full_name : "");
@@ -1835,7 +1835,7 @@ emft_update_model_expanded_state (struct _EMFolderTreePrivate *priv, GtkTreeIter
si = g_hash_table_lookup (priv->model->store_hash, store);
if ((account = e_get_account_by_name (si->display_name))) {
- key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
+ key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
} else if (CAMEL_IS_VEE_STORE (store)) {
/* vfolder store */
key = g_strdup_printf ("vfolder/%s", full_name ? full_name : "");
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 1c7755f..4ad9378 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -625,7 +625,7 @@ new_folder_created_cb (CamelFolderInfo *fi, gpointer user_data)
}
g_object_unref (emcftd->emfs);
g_free (emcftd->uri);
- g_free (emcftd);
+ g_free (emcftd);
}
static void
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 5e2f88a..e0e64fa 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1019,7 +1019,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold
EMFormat *emf = (EMFormat *)emfv->preview;
header_config_list = gconf_client_get_list(gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL);
- em_format_clear_headers((EMFormat *)emfv->preview);
+ em_format_clear_headers((EMFormat *)emfv->preview);
p = header_config_list;
while (p) {
EMMailerPrefsHeader *h;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index dbd3ddb..2a51bfa 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1090,7 +1090,7 @@ efhd_change_cursor(GtkWidget *w, GdkEventCrossing *event, struct _attach_puri *i
if (info->shown && info->image) {
if (info->fit_width != 0) {
if (em_icon_stream_is_resized(info->puri.cid, info->fit_width, info->fit_height))
- e_cursor_set(w->window, E_CURSOR_ZOOM_IN);
+ e_cursor_set(w->window, E_CURSOR_ZOOM_IN);
}
}
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index 42c15f7..a0a2a20 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -55,7 +55,7 @@ static const EPluginHookTargetKey emjh_flag_map[] = {
<hook class="org.gnome.evolution.mail.junk:1.0">
<group id="EMJunk">
<item check_junk="sa_check_junk"
- report_junk="sa_report_junk"
+ report_junk="sa_report_junk"
report_non_junk="sa_report_non_junk"
commit_reports = "sa_commit_reports"/>
</group>
@@ -90,7 +90,7 @@ em_junk_get_name (CamelJunkPlugin *csp)
if (item->hook && item->hook->hook.plugin->enabled) {
return (item->hook->hook.plugin->name);
} else
- return _("None");
+ return _("None");
}
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index d2db79f..c5fdb54 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -220,8 +220,8 @@ sub_folder_done (struct _zsubscribe_msg *m)
msgListNode = (MailMsgListNode *) e_dlist_remhead(&m->sub->subscribe);
if (msgListNode) {
next = (struct _zsubscribe_msg *) msgListNode->msg;
- /* Free the memory of the MailMsgListNode which won't be used anymore. */
- g_free(msgListNode);
+ /* Free the memory of the MailMsgListNode which won't be used anymore. */
+ g_free(msgListNode);
next->sub->subscribe_id = next->base.seq;
mail_msg_unordered_push (next);
} else {
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 25943d6..c3740d8 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2202,7 +2202,7 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
}
}
- query = e_book_query_field_test(E_CONTACT_EMAIL, E_BOOK_QUERY_IS, addr);
+ query = e_book_query_field_test(E_CONTACT_EMAIL, E_BOOK_QUERY_IS, addr);
for (g = e_source_list_peek_groups(emu_addr_list); g; g = g_slist_next(g)) {
if (local && !is_local (g->data))
continue;
@@ -2274,8 +2274,8 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
/* Form a mime part out of the photo */
part = camel_mime_part_new();
camel_mime_part_set_content(part,
- (const gchar *) photo->data.inlined.data,
- photo->data.inlined.length, "image/jpeg");
+ (const gchar *) photo->data.inlined.data,
+ photo->data.inlined.length, "image/jpeg");
e_contact_photo_free (photo);
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 5540a08..e40a1df 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -366,7 +366,7 @@ import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const
const gchar *folder;
dir = g_dir_open(filepath, 0, NULL);
- if (dir == NULL)
+ if (dir == NULL)
return;
shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index e460d66..0c5b5fd 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -15,7 +15,7 @@
*
* Authors:
* Iain Holmes <iain ximian com>
- * Michael Zucchi <notzed ximian com>
+ * Michael Zucchi <notzed ximian com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index a10766b..4c9ef45 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -17,7 +17,7 @@
*
* Authors:
* Dan Winship <danw ximian com>
- * Jeffrey Stedfast <fejj ximian com>
+ * Jeffrey Stedfast <fejj ximian com>
* Peter Williams <peterw ximian com>
* Michael Zucchi <notzed ximian com>
*
@@ -731,11 +731,11 @@ send_queue_exec (struct _send_queue_msg *m)
if (m->cancel)
camel_operation_register (m->cancel);
- else
- camel_operation_register (m->base.cancel);
+ else
+ camel_operation_register (m->base.cancel);
- if (!m->cancel)
- camel_operation_start (NULL, _("Sending message"));
+ if (!m->cancel)
+ camel_operation_start (NULL, _("Sending message"));
camel_exception_init (&ex);
@@ -746,8 +746,8 @@ send_queue_exec (struct _send_queue_msg *m)
gint pc = (100 * i) / send_uids->len;
report_status (m, CAMEL_FILTER_STATUS_START, pc, _("Sending message %d of %d"), i+1, send_uids->len);
- if (!m->cancel)
- camel_operation_progress (NULL, (i+1) * 100 / send_uids->len);
+ if (!m->cancel)
+ camel_operation_progress (NULL, (i+1) * 100 / send_uids->len);
mail_send_message (m->queue, send_uids->pdata[i], m->destination, m->driver, &ex);
if (camel_exception_is_set (&ex)) {
@@ -796,13 +796,13 @@ send_queue_exec (struct _send_queue_msg *m)
camel_exception_clear (&ex);
}
- if (!m->cancel)
- camel_operation_end (NULL);
+ if (!m->cancel)
+ camel_operation_end (NULL);
if (m->cancel)
camel_operation_unregister (m->cancel);
- else
- camel_operation_unregister (m->base.cancel);
+ else
+ camel_operation_unregister (m->base.cancel);
}
@@ -2478,7 +2478,7 @@ prepare_offline_exec (struct _set_offline_msg *m)
{
if (CAMEL_IS_DISCO_STORE (m->store)) {
camel_disco_store_prepare_for_offline (CAMEL_DISCO_STORE (m->store),
- &m->base.ex);
+ &m->base.ex);
} else if (CAMEL_IS_OFFLINE_STORE (m->store)) {
camel_offline_store_prepare_for_offline (CAMEL_OFFLINE_STORE (m->store),
&m->base.ex);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 95f3ca5..aa1f1af 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -310,7 +310,7 @@ static gchar *
format_url(const gchar *internal_url, const gchar *account_name)
{
CamelURL *url;
- gchar *pretty_url;
+ gchar *pretty_url;
url = camel_url_new(internal_url, NULL);
if (account_name) {
@@ -498,7 +498,7 @@ build_dialog (GtkWindow *parent,
recv_icon = gtk_image_new_from_icon_name (
"mail-inbox", GTK_ICON_SIZE_LARGE_TOOLBAR);
- pretty_url = format_url (source->url, account->name);
+ pretty_url = format_url (source->url, account->name);
label = gtk_label_new (NULL);
gtk_label_set_ellipsize (
GTK_LABEL (label), PANGO_ELLIPSIZE_END);
@@ -519,7 +519,7 @@ build_dialog (GtkWindow *parent,
gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
- gtk_table_attach (
+ gtk_table_attach (
GTK_TABLE (table), recv_icon,
0, 1, row, row+2, 0, 0, 0, 0);
gtk_table_attach (
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 285f0b5..d2952cd 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -454,7 +454,7 @@ mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove)
LOCK();
-/* d(printf("%s uri to check: %s\n", remove?"Removing":"Adding", uri)); */
+/* d(printf("%s uri to check: %s\n", remove?"Removing":"Adding", uri)); */
/* maintain the source folders lists for changed rules later on */
if (CAMEL_IS_VEE_STORE(store)) {
@@ -485,7 +485,7 @@ mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove)
if (context == NULL)
goto done;
- rule = NULL;
+ rule = NULL;
while ((rule = rule_context_next_rule((RuleContext *)context, rule, NULL))) {
gint found = FALSE;
@@ -561,7 +561,7 @@ mail_vfolder_delete_uri(CamelStore *store, const gchar *curi)
goto done;
/* see if any rules directly reference this removed uri */
- rule = NULL;
+ rule = NULL;
while ((rule = rule_context_next_rule ((RuleContext *) context, rule, NULL))) {
if (!rule->name) {
@@ -650,7 +650,7 @@ mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto)
LOCK();
/* see if any rules directly reference this removed uri */
- rule = NULL;
+ rule = NULL;
while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) {
source = NULL;
while ( (source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source)) ) {
diff --git a/mail/message-list.c b/mail/message-list.c
index 8050dba..1291a14 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1585,32 +1585,32 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data
folder = message_list->folder;
}
- url = mail_tools_folder_to_url (folder);
- euri = em_uri_from_camel(url);
-
- account = mail_config_get_account_by_source_url (url);
-
- if (account) {
- curl = camel_url_new (url, &ex);
- location = g_strconcat (account->name, ":", curl->path, NULL);
- } else {
- /* Local account */
- euri = em_uri_from_camel(url);
- curl = camel_url_new (euri, &ex);
- if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local"))
- location = g_strconcat (_("On This Computer"), ":",curl->path, NULL);
- }
-
- camel_exception_clear (&ex);
+ url = mail_tools_folder_to_url (folder);
+ euri = em_uri_from_camel(url);
+
+ account = mail_config_get_account_by_source_url (url);
+
+ if (account) {
+ curl = camel_url_new (url, &ex);
+ location = g_strconcat (account->name, ":", curl->path, NULL);
+ } else {
+ /* Local account */
+ euri = em_uri_from_camel(url);
+ curl = camel_url_new (euri, &ex);
+ if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local"))
+ location = g_strconcat (_("On This Computer"), ":",curl->path, NULL);
+ }
+
+ camel_exception_clear (&ex);
camel_url_free (curl);
- g_free (url);
- g_free (euri);
+ g_free (url);
+ g_free (euri);
- return location;
+ return location;
}
case COL_MIXED_RECIPIENTS:
case COL_RECIPIENTS:{
- str = camel_message_info_to (msg_info);
+ str = camel_message_info_to (msg_info);
return sanitize_recipients(str);
}
@@ -1645,7 +1645,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data
} else
return (gpointer) ("");
}
- default:
+ default:
g_warning ("This shouldn't be reached\n");
return NULL;
}
@@ -1832,7 +1832,7 @@ static ECell * create_composite_cell (gint col)
cell_sub = e_cell_text_new(fixed_name? fixed_name:NULL, GTK_JUSTIFY_LEFT);
g_object_set (G_OBJECT (cell_sub),
-/* "bold_column", COL_UNREAD, */
+/* "bold_column", COL_UNREAD, */
"color_column", COL_COLOUR,
NULL);
cell_tree = e_cell_tree_new (NULL, NULL, TRUE, cell_sub);
@@ -2660,7 +2660,7 @@ message_list_construct (MessageList *message_list)
e_tree_memory_set_expanded_default(E_TREE_MEMORY(message_list->model),
read_boolean_with_default (gconf,
- "/apps/evolution/mail/display/thread_expand",
+ "/apps/evolution/mail/display/thread_expand",
TRUE));
message_list->priv->thread_latest = read_boolean_with_default (gconf, "/apps/evolution/mail/display/thread_latest", TRUE);
@@ -4038,7 +4038,7 @@ message_list_hide_clear (MessageList *ml)
/* version 1 file is:
uintf 1
uintf hide_before
- uintf hide_after
+ uintf hide_after
string* uids
*/
diff --git a/mail/message-list.h b/mail/message-list.h
index e902e96..47d3708 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -56,7 +56,7 @@ enum {
COL_FOLLOWUP_FLAG_STATUS,
COL_FOLLOWUP_FLAG,
COL_FOLLOWUP_DUE_BY,
- COL_LOCATION, /* vfolder location? */
+ COL_LOCATION, /* vfolder location? */
COL_SENDER,
COL_RECIPIENTS,
COL_MIXED_SENDER,
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
index 30d3ec1..5193ac2 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -34,7 +34,7 @@ extern "C" {
#endif /* __cplusplus */
#define MESSAGE_TAG_EDITOR_TYPE (message_tag_editor_get_type ())
-#define MESSAGE_TAG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditor))
+#define MESSAGE_TAG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditor))
#define MESSAGE_TAG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditorClass))
#define IS_MESSAGE_TAG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, MESSAGE_TAG_EDITOR_TYPE))
#define IS_MESSAGE_TAG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MESSAGE_TAG_EDITOR_TYPE))
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 41744fc..c6a7b94 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -135,7 +135,7 @@ org_gnome_audio_inline_set_audiosink (GstElement *playbin)
}
if (audiosink) {
- g_object_set (playbin, "audio-sink", audiosink, NULL);
+ g_object_set (playbin, "audio-sink", audiosink, NULL);
}
}
@@ -174,7 +174,7 @@ org_gnome_audio_inline_gst_callback (GstBus * bus, GstMessage * message, gpointe
if (po->pause_button)
gtk_widget_set_sensitive (po->pause_button, new_state > GST_STATE_PAUSED);
if (po->stop_button)
- gtk_widget_set_sensitive (po->stop_button, new_state >= GST_STATE_PAUSED);
+ gtk_widget_set_sensitive (po->stop_button, new_state >= GST_STATE_PAUSED);
}
break;
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 92d36e7..e550851 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -138,10 +138,10 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target)
dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE);
-/* dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution backup file"), GTK_WINDOW (target->target.widget), */
-/* GTK_FILE_CHOOSER_ACTION_SAVE, */
-/* GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, */
-/* GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); */
+/* dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution backup file"), GTK_WINDOW (target->target.widget), */
+/* GTK_FILE_CHOOSER_ACTION_SAVE, */
+/* GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, */
+/* GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); */
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dlg), "evolution-backup.tar.gz");
@@ -190,10 +190,10 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target)
dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file to restore"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN);
-/* dlg = gtk_file_chooser_dialog_new (_("Select Evolution backup file to restore"), GTK_WINDOW (target->target.widget), */
-/* GTK_FILE_CHOOSER_ACTION_OPEN, */
-/* GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, */
-/* GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); */
+/* dlg = gtk_file_chooser_dialog_new (_("Select Evolution backup file to restore"), GTK_WINDOW (target->target.widget), */
+/* GTK_FILE_CHOOSER_ACTION_OPEN, */
+/* GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, */
+/* GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); */
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 67dea3e..92adb2d 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -408,12 +408,12 @@ main (gint argc, gchar **argv)
gtk_window_set_default_icon_name ("evolution");
/* Backup / Restore only can have GUI. We should restrict the rest */
- progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Backup"): _("Evolution Restore"),
- NULL,
- GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
- NULL);
+ progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Backup"): _("Evolution Restore"),
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ NULL);
gtk_dialog_set_has_separator (GTK_DIALOG (progress_dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12);
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 8cd8535..bb11ab9 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -108,7 +108,7 @@ find_esource_by_uri (ESourceList *source_list, const gchar *target_uri)
gint
e_plugin_lib_enable (EPluginLib *ep, gint enable)
{
- /* Start up the plugin. */
+ /* Start up the plugin. */
if (enable) {
d(fprintf (stderr, "BBDB spinning up...\n"));
@@ -236,7 +236,7 @@ walk_destinations_and_free (EDestination **dests)
return;
for (i = 0; dests[i] != NULL; i++) {
- const char *name, *addr;
+ const gchar *name, *addr;
name = e_destination_get_name (dests[i]);
addr = e_destination_get_email (dests[i]);
@@ -465,7 +465,7 @@ enable_toggled_cb (GtkWidget *widget, gpointer data)
/* Save the new setting to gconf */
gconf_client_set_bool (stuff->target->gconf, GCONF_KEY_ENABLE, active, NULL);
- gtk_widget_set_sensitive (stuff->option_menu, active);
+ gtk_widget_set_sensitive (stuff->option_menu, active);
addressbook = gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL);
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index f50498f..98eb3d0 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -142,7 +142,7 @@ bbdb_sync_buddy_list (void)
name, just give up; we're not smart enough for
this. */
if (contacts->next != NULL)
- continue;
+ continue;
c = E_CONTACT (contacts->data);
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 105d97e..7da5584 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -142,21 +142,21 @@ retry:
}
if (!g_spawn_async_with_pipes (NULL,
- (gchar **) argv,
- NULL,
- G_SPAWN_DO_NOT_REAP_CHILD |
- G_SPAWN_STDOUT_TO_DEV_NULL,
- NULL,
- NULL,
- &child_pid,
- &bf_in,
- NULL,
- NULL,
- &err))
+ (gchar **) argv,
+ NULL,
+ G_SPAWN_DO_NOT_REAP_CHILD |
+ G_SPAWN_STDOUT_TO_DEV_NULL,
+ NULL,
+ NULL,
+ &child_pid,
+ &bf_in,
+ NULL,
+ NULL,
+ &err))
{
g_warning ("error occurred while spawning %s: %s",
- argv[0],
- err->message);
+ argv[0],
+ err->message);
/* For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself. */
g_set_error (error, EM_JUNK_ERROR, err->code, _("Error occurred while spawning %s: %s."), argv[0], err->message);
@@ -333,12 +333,12 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
gconf = gconf_client_get_default();
gconf_client_add_dir (gconf,
- em_junk_bf_gconf_dir,
- GCONF_CLIENT_PRELOAD_ONELEVEL,
- NULL);
+ em_junk_bf_gconf_dir,
+ GCONF_CLIENT_PRELOAD_ONELEVEL,
+ NULL);
gconf_client_notify_add (gconf,
- em_junk_bf_gconf_dir,
+ em_junk_bf_gconf_dir,
em_junk_bf_setting_notify,
NULL, NULL, NULL);
@@ -357,7 +357,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data)
gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
GConfClient *gconf = gconf_client_get_default();
- gconf_client_set_bool (gconf, data, active, NULL);
+ gconf_client_set_bool (gconf, data, active, NULL);
g_object_unref (gconf);
}
@@ -365,7 +365,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data)
GtkWidget *
org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
{
- GtkWidget *check;
+ GtkWidget *check;
guint i = ((GtkTable *)data->parent)->nrows;
if (data->old)
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index e6d4aee..86f9640 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -80,7 +80,7 @@ url_changed (GtkEntry *entry, ESource *source)
gpointer secure_checkbox;
secure_checkbox = g_object_get_data (G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (entry))),
- "secure_checkbox");
+ "secure_checkbox");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (secure_checkbox), TRUE);
}
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index f72421b..22fb494 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -58,14 +58,14 @@ e_plugin_lib_enable (EPluginLib *epl, gint enable)
const gchar *description;
const gchar *icon_name;
} categories[] = {
- { N_("Weather: Fog"), "weather-fog" },
- { N_("Weather: Cloudy"), "weather-few-clouds" },
+ { N_("Weather: Fog"), "weather-fog" },
+ { N_("Weather: Cloudy"), "weather-few-clouds" },
{ N_("Weather: Cloudy Night"), "weather-few-clouds-night" },
{ N_("Weather: Overcast"), "weather-overcast" },
- { N_("Weather: Showers"), "weather-showers" },
- { N_("Weather: Snow"), "weather-snow" },
- { N_("Weather: Sunny"), "weather-clear" },
- { N_("Weather: Clear Night"), "weather-clear-night" },
+ { N_("Weather: Showers"), "weather-showers" },
+ { N_("Weather: Snow"), "weather-snow" },
+ { N_("Weather: Sunny"), "weather-clear" },
+ { N_("Weather: Clear Night"), "weather-clear-night" },
{ N_("Weather: Thunderstorms"), "weather-storm" },
{ NULL, NULL }
};
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index ad665b8..e160e70 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -153,7 +153,7 @@ epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch)
gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0);
} else {
gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,
- g_array_index(priv->header_index_type, gint, set_index_column));
+ g_array_index(priv->header_index_type, gint, set_index_column));
}
}
}
@@ -355,7 +355,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id);
str = (temp_header_ptr->header_type_value)->str;
if (strcmp (str, security_field) == 0) {
- str = _(security_field);
+ str = _(security_field);
}
gtk_label_set_markup (GTK_LABEL (priv->header_type_name_label), str);
@@ -384,8 +384,8 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
str = (temp_header_value_ptr->sub_header_string_value)->str;
for (i = 0; security_values[i].value != NULL; i++) {
if (strcmp (str, security_values[i].value) == 0) {
- str = _(security_values[i].str);
- break;
+ str = _(security_values[i].str);
+ break;
}
}
gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box),
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 53af222..46f4101 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -120,7 +120,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
{
ExchangeAccount *account;
gchar *old_password, *new_password;
- ExchangeAccountResult result;
+ ExchangeAccountResult result;
account = exchange_operations_get_exchange_account ();
if (!account)
@@ -137,7 +137,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
return;
}
/* g_print ("Current password is \"%s\"\n", old_password); */
- result = exchange_account_set_password (account, old_password, new_password);
+ result = exchange_account_set_password (account, old_password, new_password);
if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS)
exchange_operations_report_error (account, result);
@@ -738,8 +738,8 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
/* url has hostname but not owa_url.
* Account has been created using x-c-s or evo is upgraded to 2.2
- * When invoked from druid, hostname will get set after validation,
- * so this condition will never be true during account creation.
+ * When invoked from druid, hostname will get set after validation,
+ * so this condition will never be true during account creation.
*/
owa_url = construct_owa_url (url);
camel_url_set_param (url, "owa_url", owa_url);
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 35d06d5..c898f1b 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -237,12 +237,12 @@ add_defaults_for_account (ExchangeConfigListener *config_listener,
eaccount = config_listener->priv->configured_account;
if (!e_account_get_string (eaccount, E_ACCOUNT_DRAFTS_FOLDER_URI)) {
set_special_mail_folder (account, "drafts",
- &eaccount->drafts_folder_uri);
+ &eaccount->drafts_folder_uri);
save = TRUE;
}
if (!e_account_get_string (eaccount, E_ACCOUNT_SENT_FOLDER_URI)) {
set_special_mail_folder (account, "sentitems",
- &eaccount->sent_folder_uri);
+ &eaccount->sent_folder_uri);
save = TRUE;
}
if (save) {
@@ -302,9 +302,9 @@ add_account_esources (ExchangeAccount *account,
cal_source_group = e_source_group_new (account->account_name,
EXCHANGE_URI_PREFIX);
tasks_source_group = e_source_group_new (account->account_name,
- EXCHANGE_URI_PREFIX);
+ EXCHANGE_URI_PREFIX);
contacts_source_group = e_source_group_new (account->account_name,
- EXCHANGE_URI_PREFIX);
+ EXCHANGE_URI_PREFIX);
if (!e_source_list_add_group (contacts_source_list, contacts_source_group, -1) ||
!e_source_list_add_group (cal_source_list, cal_source_group, -1) ||
@@ -481,15 +481,15 @@ add_sources (ExchangeAccount *account)
folders = g_slist_append (folders, folder_info);
}
else if (!(strcmp (folder_type, "tasks")) ||
- !(strcmp (folder_type, "tasks/public"))) {
+ !(strcmp (folder_type, "tasks/public"))) {
folder_info->name = e_folder_get_name (folder);
folder_info->uri = e_folder_get_physical_uri (folder);
folder_info->type = EXCHANGE_TASKS_FOLDER;
folders = g_slist_append (folders, folder_info);
}
else if (!(strcmp (folder_type, "contacts")) ||
- !(strcmp (folder_type, "contacts/public")) ||
- !(strcmp (folder_type, "contacts/ldap"))) {
+ !(strcmp (folder_type, "contacts/public")) ||
+ !(strcmp (folder_type, "contacts/ldap"))) {
folder_info->name = e_folder_get_name (folder);
folder_info->uri = e_folder_get_physical_uri (folder);
folder_info->type = EXCHANGE_CONTACTS_FOLDER;
@@ -508,7 +508,7 @@ add_sources (ExchangeAccount *account)
static void
remove_account_esource (ExchangeAccount *account,
- FolderType folder_type)
+ FolderType folder_type)
{
ESourceGroup *group;
ESource *source = NULL;
@@ -732,7 +732,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
exchange_account_set_save_password (account, FALSE);
}
- exchange_account_connect (account, password, &result);
+ exchange_account_connect (account, password, &result);
g_free (password);
g_free (key);
@@ -743,7 +743,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
new_password = get_new_exchange_password (account);
if (new_password) {
/* try connecting with new password */
- exchange_account_connect (account, new_password, &result);
+ exchange_account_connect (account, new_password, &result);
g_free (new_password);
}
#endif
@@ -872,7 +872,7 @@ account_added (EAccountList *account_list, EAccount *account)
g_signal_emit (config_listener, signals[EXCHANGE_ACCOUNT_CREATED], 0,
exchange_account);
-/* add_sources (exchange_account); */
+/* add_sources (exchange_account); */
exchange_config_listener_get_offline_status (config_listener, &is_offline);
@@ -925,7 +925,7 @@ requires_relogin (gchar *current_url, gchar *new_url)
if (current_uri->authmech || new_uri->authmech) {
if (current_uri->authmech && new_uri->authmech) {
- if (strcmp (current_uri->authmech, new_uri->authmech)) {
+ if (strcmp (current_uri->authmech, new_uri->authmech)) {
/* Auth mechanism has changed */
relogin = TRUE;
goto end;
@@ -1031,7 +1031,7 @@ account_changed (EAccountList *account_list, EAccount *account)
remove_account_esources (priv->exchange_account);
exchange_account_forget_password (priv->exchange_account);
} else if (strcmp (config_listener->priv->configured_name, account->name)) {
-/* remove_account_esources (priv->exchange_account); */
+/* remove_account_esources (priv->exchange_account); */
exchange_config_listener_modify_esource_group_name (config_listener,
config_listener->priv->configured_name,
account->name);
diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index 3ec2d5c..c079b7e 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.h
@@ -71,8 +71,8 @@ ExchangeConfigListener *exchange_config_listener_new (void);
GSList *exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener);
-void add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri);
-void remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri);
+void add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri);
+void remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri);
ExchangeConfigListenerStatus exchange_config_listener_get_offline_status (ExchangeConfigListener *excl, gint *mode);
void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 437aeec..085bce3 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -328,7 +328,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
summarizing the permissions assigned to him.
*/
msg_part1 = _("This message was sent automatically by Evolution to inform you that you have been "
- "designated as a delegate. You can now send messages on my behalf.");
+ "designated as a delegate. You can now send messages on my behalf.");
/* To translators: Another chunk of the same message.
*/
@@ -488,7 +488,7 @@ exchange_delegates_user_new (const gchar *display_name)
ExchangeDelegatesUser *
exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc,
const gchar *email,
- GByteArray *creator_entryid)
+ GByteArray *creator_entryid)
{
E2kGlobalCatalogStatus status;
E2kGlobalCatalogEntry *entry;
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index f5e8891..b4ef8c4 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -949,7 +949,7 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent)
/* Set up the table */
delegates->model = gtk_list_store_new (1, G_TYPE_STRING);
- delegates->table = glade_xml_get_widget (delegates->xml, "delegates_table");
+ delegates->table = glade_xml_get_widget (delegates->xml, "delegates_table");
column = gtk_tree_view_column_new_with_attributes (
_("Name"), gtk_cell_renderer_text_new (), "text", 0, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (delegates->table),
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 6b5d237..f877237 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -219,8 +219,8 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
}
/* It would be nice to insensitivize the OK button appropriately
- instead of doing this, but unfortunately we can't do this for the
- Bonobo control. */
+ instead of doing this, but unfortunately we can't do this for the
+ Bonobo control. */
e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL);
}
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 39929ea..9537f59 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -91,7 +91,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
addr = camel_header_address_decode (dialog->options->delegate_address, NULL);
sender_addr = camel_header_address_decode (sender_id, NULL);
- if(dialog->options->send_as_del_enabled &&
+ if(dialog->options->send_as_del_enabled &&
dialog->options->delegate_address &&
g_ascii_strcasecmp(addr->v.addr, sender_addr->v.addr)) {
@@ -109,7 +109,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
}
else
- e_msg_composer_add_header (composer, "From",
+ e_msg_composer_add_header (composer, "From",
dialog->options->delegate_address);
}
@@ -183,7 +183,7 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
return;
}
e_msg_composer_set_send_options (composer, TRUE);
- /*disply the send options dialog*/
+ /*disply the send options dialog*/
if (!dialog) {
g_print ("New dialog\n\n") ;
dialog = exchange_sendoptions_dialog_new () ;
diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c
index e9b8d3f..d79948c 100644
--- a/plugins/exchange-operations/exchange-operations.c
+++ b/plugins/exchange-operations/exchange-operations.c
@@ -102,7 +102,7 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
exchange_operations_tokenize_string (&luri, nodename, '/', sizeof(nodename));
- if (!nodename[0]) {
+ if (!nodename[0]) {
return TRUE;
}
@@ -157,7 +157,7 @@ exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter
return;
exchange_operations_tokenize_string (&luri, nodename, '/', sizeof(nodename));
- if (!nodename[0]) {
+ if (!nodename[0]) {
return;
}
@@ -278,7 +278,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol
/* This ESource points to one of the child folders */
gchar **tmpv, *truri;
/* A nasty search and replace */
- tmpv = g_strsplit (ruri, old_path, -1);
+ tmpv = g_strsplit (ruri, old_path, -1);
truri = g_strjoinv (new_path, tmpv);
e_source_set_relative_uri (tsource->data, truri);
g_strfreev (tmpv);
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index 783887c..e44056a 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -108,7 +108,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
- destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (name_selector_entry));
+ destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (name_selector_entry));
destinations = e_destination_store_list_destinations (destination_store);
tmp = destinations;
@@ -268,7 +268,7 @@ GType exchange_sendoptions_dialog_get_type (void)
sizeof (ExchangeSendOptionsDialog),
0, /* n_preallocs */
(GInstanceInitFunc) exchange_sendoptions_dialog_init,
- NULL /* instance_init */
+ NULL /* instance_init */
};
type = g_type_register_static (G_TYPE_OBJECT,
"ExchangeSendOptionsDialogType",
@@ -279,8 +279,8 @@ GType exchange_sendoptions_dialog_get_type (void)
static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
{
- ExchangeSendOptionsDialogPrivate *priv;
- ExchangeSendOptionsDialog *sod;
+ ExchangeSendOptionsDialogPrivate *priv;
+ ExchangeSendOptionsDialog *sod;
sod = func_data;
priv = sod->priv;
@@ -290,15 +290,15 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
if(exchange_send_options_get_widgets_data (sod) < 0)
return;
case GTK_RESPONSE_CANCEL:
- gtk_widget_hide (priv->main);
- gtk_widget_destroy (priv->main);
- g_object_unref (priv->xml);
- break;
+ gtk_widget_hide (priv->main);
+ gtk_widget_destroy (priv->main);
+ g_object_unref (priv->xml);
+ break;
case GTK_RESPONSE_HELP:
e_display_help (
GTK_WINDOW (priv->main),
priv->help_section);
- break;
+ break;
}
g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index cc18b0a..93b4ee9 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -641,7 +641,7 @@ plugin_google (EPlugin *epl,
gtk_widget_show (hbox);
spin = gtk_spin_button_new_with_range (1, 100, 1);
- gtk_label_set_mnemonic_widget (GTK_LABEL(label), spin);
+ gtk_label_set_mnemonic_widget (GTK_LABEL(label), spin);
gtk_widget_show (spin);
gtk_box_pack_start (GTK_BOX(hbox), spin, FALSE, TRUE, 0);
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 46beaac..99679eb 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -36,7 +36,7 @@
/*stores some info about all currently existing groupwise accounts
list of GwAccountInfo structures */
-static GList *groupwise_accounts = NULL;
+static GList *groupwise_accounts = NULL;
struct _CamelGwListenerPrivate {
GConfClient *gconf_client;
@@ -192,7 +192,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na
soap_port = camel_url_get_param (url, "soap_port");
- if (!soap_port || strlen (soap_port) == 0)
+ if (!soap_port || strlen (soap_port) == 0)
soap_port = "7191";
use_ssl = camel_url_get_param (url, "use_ssl");
@@ -345,7 +345,7 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun
gchar *old_relative_uri;
CamelURL *url;
gboolean found_group;
- GConfClient* client;
+ GConfClient* client;
const gchar *poa_address;
const gchar *new_poa_address;
const gchar * new_group_name = a->name;
@@ -464,7 +464,7 @@ remove_calendar_tasks_sources (GwAccountInfo *info)
static GList*
get_addressbook_names_from_server (gchar *source_url)
{
- gchar *key;
+ gchar *key;
EGwConnection *cnc;
gchar *password;
GList *book_list = NULL;
@@ -580,7 +580,7 @@ add_addressbook_sources (EAccount *account)
ESourceList *list;
ESourceGroup *group;
ESource *source;
- gchar *base_uri;
+ gchar *base_uri;
const gchar *soap_port;
GList *books_list, *temp_list;
GConfClient* client;
@@ -671,7 +671,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
ESourceList *list;
ESourceGroup *group;
GSList *groups;
- gboolean found_group;
+ gboolean found_group;
gboolean delete_group;
gchar *old_base_uri;
gchar *new_base_uri;
@@ -756,7 +756,7 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
ESourceList *list;
ESourceGroup *group;
GSList *groups;
- gboolean found_group;
+ gboolean found_group;
CamelURL *url;
gchar *base_uri;
const gchar *soap_port;
@@ -839,7 +839,7 @@ account_added (EAccountList *account_listener, EAccount *account)
static void
account_removed (EAccountList *account_listener, EAccount *account)
{
- GwAccountInfo *info;
+ GwAccountInfo *info;
if (!is_groupwise_account (account))
return;
@@ -919,7 +919,7 @@ account_changed (EAccountList *account_listener, EAccount *account)
if ((old_poa_address && strcmp (old_poa_address, new_poa_address))
|| (old_soap_port && strcmp (old_soap_port, new_soap_port))
|| strcmp (old_url->user, new_url->user)
- || (!old_use_ssl)
+ || (!old_use_ssl)
|| strcmp (old_use_ssl, new_use_ssl)) {
account_removed (account_listener, account);
@@ -998,7 +998,7 @@ camel_gw_listener_construct (CamelGwListener *config_listener)
prune_proxies ();
- config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
+ config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) {
@@ -1006,7 +1006,7 @@ camel_gw_listener_construct (CamelGwListener *config_listener)
if ( is_groupwise_account (account) && account->enabled) {
- info = g_new0 (GwAccountInfo, 1);
+ info = g_new0 (GwAccountInfo, 1);
info->uid = g_strdup (account->uid);
info->name = g_strdup (account->name);
info->source_url = g_strdup (account->source->url);
diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index 71bb1ee..549c75d 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.c
@@ -118,7 +118,7 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
{
if (!config_listener) {
config_listener = camel_gw_listener_new ();
- g_atexit ( free_groupwise_listener );
+ g_atexit ( free_groupwise_listener );
}
return 0;
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index c9d4ad5..67b1b5b 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -174,7 +174,7 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
camel_object_ref(msg);
accept_data->model = model;
g_object_set_data_full((GObject *)dialog, "accept-data", accept_data, accept_free);
- g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
+ g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
g_object_set_data_full((GObject *)dialog, "druid", druid, (GDestroyNotify)gtk_widget_destroy);
gtk_window_set_title (GTK_WINDOW (dialog), "Install Shared Folder");
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index aa8c963..dc13fad 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -48,7 +48,7 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t);
static void
abort_changes (JunkSettings *js)
{
- g_object_run_dispose ((GObject *)js);
+ g_object_run_dispose ((GObject *)js);
}
static void
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 43322de..13e8a25 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -33,7 +33,7 @@ extern "C" {
#include <camel/camel-store.h>
#include <e-gw-connection.h>
-#define _JUNK_SETTINGS_TYPE (junk_settings_get_type ())
+#define _JUNK_SETTINGS_TYPE (junk_settings_get_type ())
#define JUNK_SETTINGS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), JUNK_SETTINGS, JunkSettings))
#define JUNK_SETTINGS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), JUNK_SETTINGS_TYPE, JunkSettings))
#define IS_JUNK_SETTINGS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), JUNK_SETTINGS_TYPE))
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 895cf79..ad15f05 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -155,7 +155,7 @@ proxy_login_get_type (void)
sizeof (proxyLogin),
0, /* n_preallocs */
(GInstanceInitFunc) proxy_login_init,
- NULL /* instance_init */
+ NULL /* instance_init */
};
type = g_type_register_static (G_TYPE_OBJECT,
"proxyLoginType",
@@ -292,7 +292,7 @@ proxy_login_cb (GtkDialog *dialog, gint state)
g_object_unref (pld);
break;
case GTK_RESPONSE_CANCEL:
- gtk_widget_destroy (priv->main);
+ gtk_widget_destroy (priv->main);
g_object_unref (pld);
break;
case GTK_RESPONSE_HELP:
@@ -436,7 +436,7 @@ proxy_login_setup_tree_view (void)
static void
proxy_login_update_tree (void)
{
- GtkTreeIter iter;
+ GtkTreeIter iter;
gint i,n;
GdkPixbuf *broken_image = NULL;
GList *proxy_list = NULL;
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 6a18348..44c8261 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -15,7 +15,7 @@
*
* Authors:
* Shreyas Srinivasan <sshreyas novell com>
- * Sankar P <psankar novell com>
+ * Sankar P <psankar novell com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
@@ -230,7 +230,7 @@ proxy_dialog_get_type (void)
sizeof (proxyDialog),
0, /* n_preallocs */
(GInstanceInitFunc) proxy_dialog_init,
- NULL /* instance_init */
+ NULL /* instance_init */
};
type = g_type_register_static (G_TYPE_OBJECT,
@@ -551,7 +551,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
/* Handle case where the structure is new and deleted*/
if ( !((aclInstance->flags & E_GW_PROXY_NEW) && (aclInstance->flags & E_GW_PROXY_DELETED))) {
- if ( !E_IS_GW_CONNECTION(prd->cnc)) /* Add check in case the connection request fails*/
+ if ( !E_IS_GW_CONNECTION(prd->cnc)) /* Add check in case the connection request fails*/
prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (button)));
if (aclInstance->flags & E_GW_PROXY_NEW )
@@ -599,7 +599,7 @@ static void
proxy_update_tree_view (EAccount *account)
{
proxyDialog *prd = NULL;
- GtkTreeIter iter;
+ GtkTreeIter iter;
GdkPixbuf *broken_image = NULL;
GList *list_iter;
proxyHandler *aclInstance;
@@ -614,7 +614,7 @@ proxy_update_tree_view (EAccount *account)
list_iter = priv->proxy_list;
for (;list_iter; list_iter = g_list_next(list_iter)) {
- aclInstance = (proxyHandler *) list_iter->data;
+ aclInstance = (proxyHandler *) list_iter->data;
if(! (aclInstance->flags & E_GW_PROXY_DELETED )) {
gtk_tree_store_append (priv->store, &iter, NULL);
@@ -622,7 +622,7 @@ proxy_update_tree_view (EAccount *account)
}
}
- g_free (file_name);
+ g_free (file_name);
if (broken_image)
g_object_unref (broken_image);
@@ -835,7 +835,7 @@ proxy_get_item_from_list (EAccount *account, gchar *account_name)
list_iter = priv->proxy_list;
for (;list_iter; list_iter = g_list_next(list_iter)) {
- iter = (proxyHandler *) list_iter->data;
+ iter = (proxyHandler *) list_iter->data;
if ( g_str_equal (iter->proxy_email,account_name))
return iter;
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index a739571..c3036d1 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -191,7 +191,7 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
if (n_cnc)
e_sendoptions_dialog_run (sod, parent ? parent : NULL, E_ITEM_NONE);
else
- return;
+ return;
}
GtkWidget *
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index fadf37b..8ff4ec3 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -34,7 +34,7 @@ extern "C" {
#include <e-gw-connection.h>
#include <libedataserverui/e-name-selector.h>
-#define _SHARE_FOLDER_TYPE (share_folder_get_type ())
+#define _SHARE_FOLDER_TYPE (share_folder_get_type ())
#define SHARE_FOLDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SHARE_FOLDER, ShareFolder))
#define SHARE_FOLDER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SHARE_FOLDER_TYPE, ShareFolder))
#define IS_SHARE_FOLDER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SHARE_FOLDER_TYPE))
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index 966abd1..d5a17b7 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -32,7 +32,7 @@
#include "camel-hula-listener.h"
-static GList *hula_accounts = NULL;
+static GList *hula_accounts = NULL;
struct _CamelHulaListenerPrivate {
GConfClient *gconf_client;
@@ -312,7 +312,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const
gchar *old_relative_uri;
CamelURL *url;
gboolean found_group;
- GConfClient* client;
+ GConfClient* client;
url = camel_url_new (old_account_info->source_url, NULL);
if (!url->host || strlen (url->host) ==0)
@@ -440,7 +440,7 @@ account_added (EAccountList *account_listener, EAccount *account)
static void
account_removed (EAccountList *account_listener, EAccount *account)
{
- HulaAccountInfo *info;
+ HulaAccountInfo *info;
if (!is_hula_account (account) || !is_hula_caldav_account (account))
return;
@@ -546,7 +546,7 @@ camel_hula_listener_construct (CamelHulaListener *config_listener)
EAccount *account;
HulaAccountInfo *info ;
- config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
+ config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) {
@@ -554,7 +554,7 @@ camel_hula_listener_construct (CamelHulaListener *config_listener)
if ( is_hula_account (account) && account->enabled) {
- info = g_new0 (HulaAccountInfo, 1);
+ info = g_new0 (HulaAccountInfo, 1);
info->uid = g_strdup (account->uid);
info->name = g_strdup (account->name);
info->source_url = g_strdup (account->source->url);
diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
index 29b334f..c334019 100644
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ b/plugins/hula-account-setup/hula-account-setup.c
@@ -41,7 +41,7 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
{
if (!config_listener) {
config_listener = camel_hula_listener_new ();
- g_atexit ( free_hula_listener );
+ g_atexit ( free_hula_listener );
}
return 0;
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index be15e03..91ef049 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -44,13 +44,13 @@ typedef struct _epif_data EPImapFeaturesData;
struct _epif_data {
GtkWidget *all_headers;
GtkWidget *basic_headers;
- GtkWidget *mailing_list_headers;
+ GtkWidget *mailing_list_headers;
GtkWidget *custom_headers_box;
GtkEntry *entry_header;
GtkButton *add_header;
- GtkButton *remove_header;
+ GtkButton *remove_header;
GtkTreeView *custom_headers_tree;
GtkTreeStore *store;
@@ -173,7 +173,7 @@ epif_add_sensitivity (EPImapFeaturesData *ui)
if (g_ascii_strcasecmp (header_name, entry_contents) == 0) {
gtk_widget_set_sensitive (GTK_WIDGET (ui->add_header), FALSE);
return;
- }
+ }
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (ui->store), &iter);
}
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index baef16e..41267ae 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -180,13 +180,13 @@ find_ipod_mount_point (LibHalContext *ctx)
if (!libhal_device_property_exists (ctx, udi2,
"volume.is_filesystem", NULL) ||
!libhal_device_get_property_bool (ctx, udi2,
- "volume.is_filesystem", NULL))
+ "volume.is_filesystem", NULL))
{
has_fs = 1;
}
fsusage = libhal_device_get_property_string (ctx, udi2,
- "volume.fsusage", NULL);
+ "volume.fsusage", NULL);
if (fsusage == NULL)
continue;
@@ -208,7 +208,7 @@ find_ipod_mount_point (LibHalContext *ctx)
if (!libhal_device_property_exists (ctx, udi2,
"volume.is_mounted", NULL) ||
!libhal_device_get_property_bool (ctx, udi2,
- "volume.is_mounted", NULL))
+ "volume.is_mounted", NULL))
{
/* It isn't, so let's attempt to mount it */
if (device != NULL)
diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index cc2febc..5f518de 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.c
@@ -170,7 +170,7 @@ write_to_ipod (GString *str, gchar *path, gchar *filename)
if (mkdir (output_path, 0777) != 0)
critical_error (_("No output directory!"),
_("The output directory was not found on "
- "iPod! Please ensure that iPod has been correctly "
+ "iPod! Please ensure that iPod has been correctly "
"set up and try again."));
}
@@ -223,9 +223,9 @@ write_to_ipod (GString *str, gchar *path, gchar *filename)
static GString *
uri_list_to_vcard_string (GSList *uris)
{
- GString *str = NULL;
- EBook *book = NULL;
- EBookQuery *qry = NULL;
+ GString *str = NULL;
+ EBook *book = NULL;
+ EBookQuery *qry = NULL;
GList *contacts = NULL, *c = NULL;
GSList *uri;
@@ -285,8 +285,8 @@ uri_list_to_vcard_string (GSList *uris)
static GString *
uri_list_to_vcal_string (GSList *uris, ECalSourceType type)
{
- GString *str = NULL;
- ECal *cal = NULL;
+ GString *str = NULL;
+ ECal *cal = NULL;
icalcomponent *obj = NULL;
GList *objects = NULL, *o = NULL;
GSList *uri;
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 18aa1ea..ed406d9 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -970,7 +970,7 @@ message_foreach_part (CamelMimePart *part, GSList **part_list)
message_foreach_part (part, part_list);
}
} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
- message_foreach_part ((CamelMimePart *)containee, part_list);
+ message_foreach_part ((CamelMimePart *)containee, part_list);
}
}
@@ -1305,7 +1305,7 @@ update_attendee_status (struct _itip_puri *pitip)
icalcomponent_add_property (icalcomp, icalproperty_new_clone (del_prop));
e_cal_component_rescan (comp);
} else if (response == GTK_RESPONSE_NO) {
- remove_delegate (pitip, delegate, itip_strip_mailto (a->value), comp);
+ remove_delegate (pitip, delegate, itip_strip_mailto (a->value), comp);
goto cleanup;
} else {
goto cleanup;
@@ -1957,8 +1957,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
/* We do this to ensure there is at most one
* attendee in the response */
- if (found || g_ascii_strcasecmp (pitip->to_address, text))
- list = g_slist_prepend (list, prop);
+ if (found || g_ascii_strcasecmp (pitip->to_address, text))
+ list = g_slist_prepend (list, prop);
else if (!g_ascii_strcasecmp (pitip->to_address, text))
found = TRUE;
g_free (text);
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index d7c0f8a..a893895 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -48,11 +48,11 @@
#include <libnotify/notify.h>
#endif
-#define GCONF_KEY_ROOT "/apps/evolution/eplugin/mail-notification/"
+#define GCONF_KEY_ROOT "/apps/evolution/eplugin/mail-notification/"
#define GCONF_KEY_NOTIFY_ONLY_INBOX GCONF_KEY_ROOT "notify-only-inbox"
-#define GCONF_KEY_ENABLED_DBUS GCONF_KEY_ROOT "dbus-enabled"
-#define GCONF_KEY_ENABLED_STATUS GCONF_KEY_ROOT "status-enabled"
-#define GCONF_KEY_ENABLED_SOUND GCONF_KEY_ROOT "sound-enabled"
+#define GCONF_KEY_ENABLED_DBUS GCONF_KEY_ROOT "dbus-enabled"
+#define GCONF_KEY_ENABLED_STATUS GCONF_KEY_ROOT "status-enabled"
+#define GCONF_KEY_ENABLED_SOUND GCONF_KEY_ROOT "sound-enabled"
static gboolean enabled = FALSE;
static GtkWidget *get_cfg_widget (void);
@@ -556,9 +556,9 @@ get_config_widget_status (void)
vbox = gtk_vbox_new (FALSE, 0);
scw = g_malloc0 (sizeof (struct _StatusConfigureWidgets));
- #define create_check(c, key, desc) \
- c = gtk_check_button_new_with_mnemonic (desc); \
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (c), is_part_enabled (key)); \
+ #define create_check(c, key, desc) \
+ c = gtk_check_button_new_with_mnemonic (desc); \
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (c), is_part_enabled (key)); \
gtk_box_pack_start (GTK_BOX (parent), c, FALSE, FALSE, 0); \
g_signal_connect (G_OBJECT (c), "toggled", G_CALLBACK (toggled_status_cb), scw);
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 9c9f3ad..ac3d8ea 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -811,11 +811,11 @@ pst_process_email (PstImporter *m, pst_item *item)
camel_mime_message_set_from (msg, addr);
camel_object_unref (addr);
- if (item->email->sent_date != NULL) {
+ if (item->email->sent_date != NULL) {
camel_mime_message_set_date (msg, fileTimeToUnixTime (item->email->sent_date, 0), 0);
}
- if (item->email->messageid != NULL) {
+ if (item->email->messageid != NULL) {
camel_mime_message_set_message_id (msg, item->email->messageid);
}
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index ad6e38e..4650d97 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -608,7 +608,7 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui)
gtk_tree_model_get (model, &iter, URL_LIST_URL_COLUMN, &url, -1);
confirm = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
_("Are you sure you want to remove this location?"));
gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_CANCEL, GTK_RESPONSE_NO);
gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_REMOVE, GTK_RESPONSE_YES);
@@ -704,11 +704,11 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data)
renderer = gtk_cell_renderer_toggle_new ();
g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Enabled"),
- renderer, "active", URL_LIST_ENABLED_COLUMN, NULL);
+ renderer, "active", URL_LIST_ENABLED_COLUMN, NULL);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (url_list_enable_toggled), ui);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Location"),
- renderer, "text", URL_LIST_LOCATION_COLUMN, NULL);
+ renderer, "text", URL_LIST_LOCATION_COLUMN, NULL);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui);
diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c
index 4d7ead3..aa273ae 100644
--- a/plugins/python/python-plugin-loader.c
+++ b/plugins/python/python-plugin-loader.c
@@ -67,7 +67,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data)
Py_Initialize();
if (p->pModule == NULL) {
- pModuleName = PyString_FromString(epp->module_name);
+ pModuleName = PyString_FromString(epp->module_name);
PyRun_SimpleString(g_strdup_printf ("import sys ; sys.path.insert(0, '%s')", epp->location));
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 3c92b38..d7123dc 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -444,7 +444,7 @@ em_junk_sa_test_spamd (void)
em_junk_sa_spamd_binaries [0] = em_junk_sa_spamd_gconf_binary;
em_junk_sa_spamd_binaries [1] = NULL;
try_system_spamd = FALSE;
- }
+ }
em_junk_sa_use_spamc = FALSE;
@@ -513,7 +513,7 @@ em_junk_sa_is_available (GError **error)
/* While we're at it, see if spamd is running with --allow-tell */
if (!em_junk_sa_allow_tell_tested)
- em_junk_sa_test_allow_tell () ;
+ em_junk_sa_test_allow_tell () ;
pthread_mutex_unlock (&em_junk_sa_init_lock);
@@ -900,13 +900,13 @@ static void
use_remote_tests_cb (GtkWidget *widget, gpointer data)
{
gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- gconf_client_set_bool (em_junk_sa_gconf, data, !active, NULL);
+ gconf_client_set_bool (em_junk_sa_gconf, data, !active, NULL);
}
GtkWidget *
org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
{
- GtkWidget *check, *vbox, *label;
+ GtkWidget *check, *vbox, *label;
gchar *text = g_strdup_printf (" <small>%s</small>", _("This will make SpamAssassin more reliable, but slower"));
guint i = ((GtkTable *)data->parent)->nrows;
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index c63c1da..6042de7 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -163,7 +163,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE_AS, GTK_RESPONSE_OK,
- NULL);
+ NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), extra_widget);
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index b0de28a..95a3c1e 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -75,14 +75,14 @@ static void reply_with_template (EPopup *ep, EPopupItem *item, gpointer data);
static void popup_free (EPopup *ep, GSList *l, gpointer data);
static GSList *fill_submenu (CamelStore *store,
- CamelFolderInfo *info,
- GSList *list,
- EMPopupTargetSelect *t);
+ CamelFolderInfo *info,
+ GSList *list,
+ EMPopupTargetSelect *t);
-static GSList *append_to_menu (CamelFolder *folder,
- GPtrArray *uids,
- GSList *list,
- EMPopupTargetSelect *t);
+static GSList *append_to_menu (CamelFolder *folder,
+ GPtrArray *uids,
+ GSList *list,
+ EMPopupTargetSelect *t);
void org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t);
@@ -709,7 +709,7 @@ static GtkActionEntry entries[] = {
{ "Template",
GTK_STOCK_SAVE,
N_("Save as _Template"),
- "<Shift><Control>t",
+ "<Shift><Control>t",
N_("Save as Template"),
G_CALLBACK (action_template_cb) }
};
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 4e651e7..cd706e6 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -108,7 +108,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
if (camel_data_wrapper_decode_to_stream(content, out) == -1
|| camel_stream_close(out) == -1) {
camel_object_unref(out);
- goto fail;
+ goto fail;
}
camel_object_unref(out);
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index d338094..c4f7ef9 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -322,7 +322,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
gtk_check_button_new_with_mnemonic(
_("_Avoid IfMatch (needed on Apache < 2.2.8)")));
gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle),
- FALSE, FALSE, 0);
+ FALSE, FALSE, 0);
set_ui_from_source(uidata);
diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h
index 57663d8..0d4e02f 100644
--- a/shell/e-shell-backend.h
+++ b/shell/e-shell-backend.h
@@ -74,36 +74,36 @@ struct _EShellBackend {
* EShellBackendClass:
* @parent_class: The parent class structure.
* @name: The name of the backend. Also becomes the name of
- * the corresponding #EShellView subclass that the
- * backend will register.
+ * the corresponding #EShellView subclass that the
+ * backend will register.
* @aliases: Colon-separated list of aliases that can be used
- * when referring to a backend by name.
+ * when referring to a backend by name.
* @schemes: Colon-separated list of URI schemes. The #EShell
- * will forward command-line URIs to the appropriate
- * backend based on this list.
+ * will forward command-line URIs to the appropriate
+ * backend based on this list.
* @sort_order: Used to determine the order of backends listed in
- * the main menu and in the switcher. See
- * e_shell_backend_compare().
+ * the main menu and in the switcher. See
+ * e_shell_backend_compare().
* @shell_view_type: #GType for the corresponding #EShellView subclass.
* @start: Method for notifying the backend to begin loading
- * data and running background tasks. This is called
- * just before the first instantiation of the
- * corresponding #EShellView subclass. It allows the
- * backend to delay initialization steps that consume
- * significant resources until they are actually needed.
+ * data and running background tasks. This is called
+ * just before the first instantiation of the
+ * corresponding #EShellView subclass. It allows the
+ * backend to delay initialization steps that consume
+ * significant resources until they are actually needed.
* @is_busy: Method for querying whether the backend has operations
- * in progress that cannot be cancelled or finished
- * immediately. Returning %TRUE prevents the application
- * from shutting down.
+ * in progress that cannot be cancelled or finished
+ * immediately. Returning %TRUE prevents the application
+ * from shutting down.
* @shutdown: Method for notifying the backend to begin shutting
- * down. Returning %FALSE indicates there are still
- * unfinished operations and the #EShell should check
- * back shortly.
+ * down. Returning %FALSE indicates there are still
+ * unfinished operations and the #EShell should check
+ * back shortly.
* @migrate: Method for notifying the backend to migrate data and
- * settings from the given version. Returns %TRUE if the
- * migration was successful or if no action was necessary.
- * Returns %FALSE and sets a #GError if the migration
- * failed.
+ * settings from the given version. Returns %TRUE if the
+ * migration was successful or if no action was necessary.
+ * Returns %FALSE and sets a #GError if the migration
+ * failed.
*
* #EShellBackendClass contains a number of important settings for subclasses.
**/
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index b87da83..c117976 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -416,7 +416,7 @@ static void
import_druid_cancel (GnomeDruid *druid,
ImportData *data)
{
- gtk_widget_destroy (GTK_WIDGET (data->dialog));
+ gtk_widget_destroy (GTK_WIDGET (data->dialog));
}
static gboolean
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 664094e..a3ca595 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -78,41 +78,41 @@ struct _EShellView {
* EShellViewClass:
* @parent_class: The parent class structure.
* @label: The initial value for the switcher action's
- * #GtkAction:label property. See
- * e_shell_view_get_action().
+ * #GtkAction:label property. See
+ * e_shell_view_get_action().
* @icon_name: The initial value for the switcher action's
- * #GtkAction:icon-name property. See
- * e_shell_view_get_action().
+ * #GtkAction:icon-name property. See
+ * e_shell_view_get_action().
* @ui_definition: Base name of the UI definintion file to add
- * when the shell view is activated.
+ * when the shell view is activated.
* @ui_manager_id: The #GtkUIManager ID for #EPluginUI. Plugins
- * should use to this ID in their "eplug" files to
- * add menu and toolbar items to the shell view.
+ * should use to this ID in their "eplug" files to
+ * add menu and toolbar items to the shell view.
* @search_options: Widget path in the UI definition to the search
- * options popup menu. The menu gets shown when the
- * user clicks the "find" icon in the search entry.
+ * options popup menu. The menu gets shown when the
+ * user clicks the "find" icon in the search entry.
* @search_rules: Base name of the XML file containing predefined
- * search rules for this shell view. The XML files
- * are usually named something like <filename>
- * <emphasis>view</emphasis>types.xml</filename>.
+ * search rules for this shell view. The XML files
+ * are usually named something like <filename>
+ * <emphasis>view</emphasis>types.xml</filename>.
* @view_collection: A unique #GalViewCollection instance is created
- * for each subclass and shared across all instances
- * of that subclass. That much is done automatically
- * for subclasses, but subclasses are still responsible
- * for adding the appropriate #GalView factories to the
- * view collection.
+ * for each subclass and shared across all instances
+ * of that subclass. That much is done automatically
+ * for subclasses, but subclasses are still responsible
+ * for adding the appropriate #GalView factories to the
+ * view collection.
* @new_shell_content: Factory method for the shell view's #EShellContent.
- * See e_shell_view_get_shell_content().
+ * See e_shell_view_get_shell_content().
* @new_shell_sidebar: Factory method for the shell view's #EShellSidebar.
- * See e_shell_view_get_shell_sidebar().
+ * See e_shell_view_get_shell_sidebar().
* @new_shell_taskbar: Factory method for the shell view's #EShellTaskbar.
- * See e_shell_view_get_shell_taskbar().
+ * See e_shell_view_get_shell_taskbar().
* @toggled: Class method for the #EShellView::toggled signal.
- * Subclasses should rarely need to override the
- * default behavior.
+ * Subclasses should rarely need to override the
+ * default behavior.
* @update_actions: Class method for the #EShellView::update_actions
- * signal. There is no default behavior; subclasses
- * should override this.
+ * signal. There is no default behavior; subclasses
+ * should override this.
*
* #EShellViewClass contains a number of important settings for subclasses.
**/
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 33b7eeb..e559389 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -101,9 +101,9 @@ static void set_map_timezone (ETimezoneDialog *etd,
static void on_combo_changed (GtkComboBox *combo,
ETimezoneDialog *etd);
-static void timezone_combo_get_active_text (GtkComboBox *combo,
+static void timezone_combo_get_active_text (GtkComboBox *combo,
const gchar **zone_name);
-static gboolean timezone_combo_set_active_text (GtkComboBox *combo,
+static gboolean timezone_combo_set_active_text (GtkComboBox *combo,
const gchar *zone_name);
static void map_destroy_cb (gpointer data,
@@ -479,10 +479,10 @@ on_map_timeout (gpointer data)
if (e_map_point_get_color_rgba (priv->point_selected)
== E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA)
- e_map_point_set_color_rgba (priv->map, priv->point_selected,
+ e_map_point_set_color_rgba (priv->map, priv->point_selected,
E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_2_RGBA);
else
- e_map_point_set_color_rgba (priv->map, priv->point_selected,
+ e_map_point_set_color_rgba (priv->map, priv->point_selected,
E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA);
return TRUE;
@@ -505,14 +505,14 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
&longitude, &latitude);
if (priv->point_hover && priv->point_hover != priv->point_selected)
- e_map_point_set_color_rgba (priv->map, priv->point_hover,
+ e_map_point_set_color_rgba (priv->map, priv->point_hover,
E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
priv->point_hover = e_map_get_closest_point (priv->map, longitude,
latitude, TRUE);
if (priv->point_hover != priv->point_selected)
- e_map_point_set_color_rgba (priv->map, priv->point_hover,
+ e_map_point_set_color_rgba (priv->map, priv->point_hover,
E_TIMEZONE_DIALOG_MAP_POINT_HOVER_RGBA);
new_zone = get_zone_from_point (etd, priv->point_hover);
@@ -542,7 +542,7 @@ on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data)
return FALSE;
if (priv->point_hover && priv->point_hover != priv->point_selected)
- e_map_point_set_color_rgba (priv->map, priv->point_hover,
+ e_map_point_set_color_rgba (priv->map, priv->point_hover,
E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
timezone_combo_set_active_text (GTK_COMBO_BOX (priv->timezone_combo),
@@ -596,14 +596,14 @@ on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data)
&longitude, &latitude);
if (event->button != 1) {
- e_map_zoom_out (priv->map);
+ e_map_zoom_out (priv->map);
} else {
if (e_map_get_magnification (priv->map) <= 1.0)
- e_map_zoom_to_location (priv->map, longitude,
+ e_map_zoom_to_location (priv->map, longitude,
latitude);
if (priv->point_selected)
- e_map_point_set_color_rgba (priv->map,
+ e_map_point_set_color_rgba (priv->map,
priv->point_selected,
E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
priv->point_selected = priv->point_hover;
@@ -694,7 +694,7 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd,
g_return_if_fail (E_IS_TIMEZONE_DIALOG (etd));
- if (!zone) {
+ if (!zone) {
zone = (icaltimezone *)get_local_timezone();
if (!zone)
zone = icaltimezone_get_utc_timezone();
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 8ecbcba..3670218 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -167,7 +167,7 @@ gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
if (gtk_tree_path_prev (path)) {
gtk_tree_model_get_iter (dialog->model, &iter, path);
- } else {
+ } else {
gtk_tree_model_get_iter_first (dialog->model, &iter);
}
diff --git a/widgets/misc/a11y/ea-calendar-item.c b/widgets/misc/a11y/ea-calendar-item.c
index e1fb365..56a01b5 100644
--- a/widgets/misc/a11y/ea-calendar-item.c
+++ b/widgets/misc/a11y/ea-calendar-item.c
@@ -280,7 +280,7 @@ ea_calendar_item_get_name (AtkObject *accessible)
g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
if (!g_obj)
- return NULL;
+ return NULL;
g_return_val_if_fail (E_IS_CALENDAR_ITEM (g_obj), NULL);
calitem = E_CALENDAR_ITEM (g_obj);
@@ -1192,7 +1192,7 @@ e_calendar_item_get_day_extents (ECalendarItem *calitem,
month_y = item->y1 + ythickness + month_row * calitem->month_height;
month_cell_x = month_x + E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS
- + calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
+ + calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
text_y = month_y + ythickness * 2
+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
+ char_height + E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME
diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c
index e1037ae..45c2103 100644
--- a/widgets/misc/e-attachment-dialog.c
+++ b/widgets/misc/e-attachment-dialog.c
@@ -407,7 +407,7 @@ e_attachment_dialog_new (GtkWindow *parent,
EAttachment *attachment)
{
if (parent != NULL)
- g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+ g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
if (attachment != NULL)
g_return_val_if_fail (E_IS_ATTACHMENT (attachment), NULL);
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 88e59b8..a0adf46 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -83,7 +83,7 @@ static void e_calendar_drag_leave (GtkWidget *widget,
guint time);
static gboolean e_calendar_button_has_focus (ECalendar *cal);
static gboolean e_calendar_focus (GtkWidget *widget,
- GtkDirectionType direction);
+ GtkDirectionType direction);
static void e_calendar_on_prev_pressed (ECalendar *cal);
static void e_calendar_on_prev_released (ECalendar *cal);
@@ -113,11 +113,11 @@ e_calendar_class_init (ECalendarClass *class)
widget_class->realize = e_calendar_realize;
widget_class->style_set = e_calendar_style_set;
- widget_class->size_request = e_calendar_size_request;
- widget_class->size_allocate = e_calendar_size_allocate;
+ widget_class->size_request = e_calendar_size_request;
+ widget_class->size_allocate = e_calendar_size_allocate;
widget_class->drag_motion = e_calendar_drag_motion;
widget_class->drag_leave = e_calendar_drag_leave;
- widget_class->focus = e_calendar_focus;
+ widget_class->focus = e_calendar_focus;
}
@@ -351,7 +351,7 @@ e_calendar_size_allocate (GtkWidget *widget,
gnome_canvas_item_set (cal->prev_item,
"x", (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
? new_x2 + 1 - xthickness * 2 - E_CALENDAR_ARROW_BUTTON_X_PAD
- - arrow_button_size
+ - arrow_button_size
: xthickness * 2 + E_CALENDAR_ARROW_BUTTON_X_PAD,
"y", ythickness * 2
+ E_CALENDAR_ARROW_BUTTON_Y_PAD,
@@ -363,7 +363,7 @@ e_calendar_size_allocate (GtkWidget *widget,
"x", (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
? xthickness * 2 + E_CALENDAR_ARROW_BUTTON_X_PAD
: new_x2 + 1 - xthickness * 2 - E_CALENDAR_ARROW_BUTTON_X_PAD
- - arrow_button_size,
+ - arrow_button_size,
"y", ythickness * 2
+ E_CALENDAR_ARROW_BUTTON_Y_PAD,
"width", arrow_button_size,
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index e23d29f..5f60fc4 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -42,7 +42,7 @@ extern "C" {
#define E_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_CANVAS_TYPE))
typedef void (*ECanvasItemReflowFunc) (GnomeCanvasItem *item,
- gint flags);
+ gint flags);
typedef void (*ECanvasItemSelectionFunc) (GnomeCanvasItem *item,
gint flags,
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 34e9c63..593df6b 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -256,7 +256,7 @@ activate_other (GtkWidget *item, gpointer menu)
if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) {
new_charset = (gchar *)gtk_entry_get_text (GTK_ENTRY (entry));
- if (*new_charset) {
+ if (*new_charset) {
if (add_other_charset (menu, item, new_charset)) {
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (dialog);
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
index 7df3404..23ac7c0 100644
--- a/widgets/misc/e-cursors.h
+++ b/widgets/misc/e-cursors.h
@@ -51,7 +51,7 @@ void e_cursors_shutdown (void);
#define e_cursor_set(win, c) \
G_STMT_START { \
- if (win) \
+ if (win) \
gdk_window_set_cursor (win, e_cursor_get (c)); \
} G_STMT_END
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index e8034eb..b9ae1ad 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -1247,7 +1247,7 @@ position_date_popup (EDateEdit *dedit)
x += win_x;
y += win_y;
- screen_width = gdk_screen_width ();
+ screen_width = gdk_screen_width ();
screen_height = gdk_screen_height ();
x = CLAMP (x, 0, MAX (0, screen_width - cal_req.width));
@@ -1326,7 +1326,7 @@ on_date_popup_key_press (GtkWidget *widget,
EDateEdit *dedit)
{
if (event->keyval != GDK_Escape) {
- gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME);
+ gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME);
return FALSE;
}
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 77c20d5..1bc183d 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -875,7 +875,7 @@ e_filter_bar_lite_new (RuleContext *context,
bar = g_object_new (e_filter_bar_get_type (), NULL);
((ESearchBar *)bar)->lite = TRUE;
- e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar);
+ e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar);
return bar;
}
@@ -901,7 +901,7 @@ e_filter_bar_new_construct (RuleContext *context,
bar->all_account_search_vf = NULL;
bar->account_search_vf = NULL;
- bar->account_search_cancel = NULL;
+ bar->account_search_cancel = NULL;
g_signal_connect (context, "changed", G_CALLBACK (context_changed), bar);
g_signal_connect (context, "rule_removed", G_CALLBACK (context_rule_removed), bar);
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index 859a21b..30c3ac5 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -140,7 +140,7 @@ EFilterBar *e_filter_bar_lite_new (RuleContext *context,
gpointer data);
void
-e_filter_bar_new_construct (RuleContext *context,
+e_filter_bar_new_construct (RuleContext *context,
const gchar *systemrules,
const gchar *userrules,
EFilterBarConfigRule config,
diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c
index fb11c98..6da1594 100644
--- a/widgets/misc/e-icon-entry.c
+++ b/widgets/misc/e-icon-entry.c
@@ -99,8 +99,8 @@ icon_entry_create_proxy (GtkAction *action)
}
static gboolean
icon_entry_focus_change_cb (GtkWidget *widget,
- GdkEventFocus *event,
- GtkWidget *entry)
+ GdkEventFocus *event,
+ GtkWidget *entry)
{
gtk_widget_queue_draw (entry);
diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h
index a3972bd..be2d427 100644
--- a/widgets/misc/e-image-chooser.h
+++ b/widgets/misc/e-image-chooser.h
@@ -28,10 +28,10 @@
G_BEGIN_DECLS
-#define E_TYPE_IMAGE_CHOOSER (e_image_chooser_get_type ())
-#define E_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooser))
+#define E_TYPE_IMAGE_CHOOSER (e_image_chooser_get_type ())
+#define E_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooser))
#define E_IMAGE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_IMAGE_CHOOSER, EImageChooserClass))
-#define E_IS_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_IMAGE_CHOOSER))
+#define E_IS_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_IMAGE_CHOOSER))
#define E_IS_IMAGE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_IMAGE_CHOOSER))
typedef struct _EImageChooser EImageChooser;
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index c44e758..f35335f 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -345,7 +345,7 @@ e_map_unrealize (GtkWidget *widget)
g_return_if_fail (IS_E_MAP (widget));
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+ (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
@@ -882,7 +882,7 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point)
if (x >= 0 && x < GTK_WIDGET (map)->allocation.width &&
y >= 0 && y < GTK_WIDGET (map)->allocation.height)
- return TRUE;
+ return TRUE;
return FALSE;
}
@@ -1011,8 +1011,8 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays)
if (width > 1 && height > 1)
{
gdk_pixbuf_scale (priv->map_pixbuf, priv->map_render_pixbuf, 0, 0, /* Dest (x, y) */
- width, height, 0, 0, /* Offset (x, y) */
- zoom, zoom, /* Scale (x, y) */
+ width, height, 0, 0, /* Offset (x, y) */
+ zoom, zoom, /* Scale (x, y) */
interp);
}
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 849825e..83f4fda 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -610,13 +610,13 @@ search_bar_dispose (GObject *object)
/* static gpointer /
/* option_item_destroy_cb (GtkObject *object, gpointer data) */
/* { */
-/* /\* ESearchBarSubitem *subitems; *\/ */
+/* /\* ESearchBarSubitem *subitems; *\/ */
-/* /\* subitems = data; *\/ */
+/* /\* subitems = data; *\/ */
-/* /\* g_assert (subitems != NULL); *\/ */
-/* /\* free_subitems (subitems); *\/ */
-/* /\* g_object_set_data (G_OBJECT (object), "EsbChoiceSubitems", NULL); *\/ */
+/* /\* g_assert (subitems != NULL); *\/ */
+/* /\* free_subitems (subitems); *\/ */
+/* /\* g_object_set_data (G_OBJECT (object), "EsbChoiceSubitems", NULL); *\/ */
/* } */
static void
@@ -939,10 +939,10 @@ e_search_bar_get_type (void)
bonobo_object_unref (BONOBO_OBJECT (esb->ui_component));
esb->ui_component = NULL;
}
-/* if (esb->entry) { */
-/* g_object_unref (esb->entry); */
-/* esb->entry = NULL; */
-/* } */
+/* if (esb->entry) { */
+/* g_object_unref (esb->entry); */
+/* esb->entry = NULL; */
+/* } */
if (esb->suboption) {
g_object_unref (esb->suboption);
esb->suboption = NULL;
@@ -1066,7 +1066,7 @@ e_search_bar_set_context (ESearchBar *search_bar,
gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0);
search_bar->scopeoption = gtk_option_menu_new ();
- /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */
+ /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */
gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0);
gtk_widget_show_all (search_bar->scopeoption_box);
gtk_widget_hide (hbox);
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index b42630e..fa84e86 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -397,7 +397,7 @@ init_widgets (ESendOptionsDialog *sod)
g_signal_connect (priv->delay_until, "changed", G_CALLBACK (delay_until_date_changed_cb), sod);
if (priv->global)
- g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod);
+ g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod);
}
@@ -502,7 +502,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->until_label), priv->delay_until);
if (priv->global) {
- GtkWidget *widget = gtk_label_new ("Calendar");
+ GtkWidget *widget = gtk_label_new ("Calendar");
gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail");
gtk_notebook_append_page (priv->notebook, priv->status, widget);
gtk_widget_show (widget);
@@ -514,7 +514,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
switch (type) {
case E_ITEM_MAIL:
- priv->help_section = g_strdup ("usage-mail");
+ priv->help_section = g_strdup ("usage-mail");
gtk_widget_hide (priv->accepted_label);
gtk_widget_hide (priv->when_accepted);
gtk_widget_hide (priv->completed_label);
@@ -522,11 +522,11 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->declined_label), (_("When de_leted:")));
break;
case E_ITEM_CALENDAR:
- priv->help_section = g_strdup ("usage-calendar");
+ priv->help_section = g_strdup ("usage-calendar");
gtk_widget_hide (priv->completed_label);
gtk_widget_hide (priv->when_completed);
case E_ITEM_TASK:
- priv->help_section = g_strdup ("usage-calendar-todo");
+ priv->help_section = g_strdup ("usage-calendar-todo");
gtk_widget_hide (priv->security_label);
gtk_widget_hide (priv->security);
gtk_widget_set_sensitive (priv->autodelete, FALSE);
@@ -606,7 +606,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data
e_display_help (
GTK_WINDOW (priv->main),
priv->help_section);
- break;
+ break;
}
g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
@@ -821,7 +821,7 @@ GType e_sendoptions_dialog_get_type (void)
sizeof (ESendOptionsDialog),
0, /* n_preallocs */
(GInstanceInitFunc) e_sendoptions_dialog_init,
- NULL /* instance_init */
+ NULL /* instance_init */
};
type = g_type_register_static (G_TYPE_OBJECT,
"ESendOptionsDialogType",
diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
index 87e53dc..78303cc 100644
--- a/widgets/misc/e-spinner.c
+++ b/widgets/misc/e-spinner.c
@@ -66,7 +66,7 @@ struct _ESpinnerClass
#define E_TYPE_SPINNER_CACHE (e_spinner_cache_get_type())
#define E_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_CAST((object), E_TYPE_SPINNER_CACHE, ESpinnerCache))
-#define E_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass))
+#define E_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass))
#define E_IS_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), E_TYPE_SPINNER_CACHE))
#define E_IS_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), E_TYPE_SPINNER_CACHE))
#define E_SPINNER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass))
@@ -275,7 +275,7 @@ e_spinner_images_load (GdkScreen *screen,
/* Load the animation. The 'rest icon' is the 0th frame */
icon_info = gtk_icon_theme_lookup_icon (icon_theme,
SPINNER_ICON_NAME,
- requested_size, 0);
+ requested_size, 0);
if (icon_info == NULL)
{
g_warning ("Throbber animation not found");
@@ -741,10 +741,10 @@ e_spinner_start (ESpinner *spinner)
details->timer_task =
g_timeout_add_full (G_PRIORITY_LOW,
- details->timeout,
- (GSourceFunc) bump_spinner_frame_cb,
- spinner,
- NULL);
+ details->timeout,
+ (GSourceFunc) bump_spinner_frame_cb,
+ spinner,
+ NULL);
}
}
@@ -843,7 +843,7 @@ e_spinner_size_request (GtkWidget *widget,
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget),
details->size,
&requisition->width,
- &requisition->height);
+ &requisition->height);
return;
}
diff --git a/widgets/table/a11y/gal-a11y-e-cell-popup.c b/widgets/table/a11y/gal-a11y-e-cell-popup.c
index f76b243..141ce17 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-popup.c
+++ b/widgets/table/a11y/gal-a11y-e-cell-popup.c
@@ -89,15 +89,15 @@ gal_a11y_e_cell_popup_new (ETableItem *item,
{
AtkObject *a11y;
GalA11yECell *cell;
- ECellPopup *popupcell;
+ ECellPopup *popupcell;
ECellView* child_view = NULL;
popupcell= E_CELL_POPUP(cell_view->ecell);
if (popupcell && popupcell->popup_cell_view)
- child_view = popupcell->popup_cell_view->child_view;
+ child_view = popupcell->popup_cell_view->child_view;
- if (child_view && child_view->ecell) {
+ if (child_view && child_view->ecell) {
a11y = gal_a11y_e_cell_registry_get_object (NULL,
item,
child_view,
@@ -114,7 +114,7 @@ gal_a11y_e_cell_popup_new (ETableItem *item,
model_col,
view_col,
row);
- }
+ }
g_return_val_if_fail (a11y != NULL, NULL);
cell = GAL_A11Y_E_CELL(a11y);
gal_a11y_e_cell_add_action (cell,
diff --git a/widgets/table/a11y/gal-a11y-e-cell-toggle.c b/widgets/table/a11y/gal-a11y-e-cell-toggle.c
index 1101bac..4fec225 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/a11y/gal-a11y-e-cell-toggle.c
@@ -125,9 +125,9 @@ model_change_cb (ETableModel *etm,
if (col == cell->model_col && row == cell->row) {
- value = GPOINTER_TO_INT (
+ value = GPOINTER_TO_INT (
e_table_model_value_at (cell->cell_view->e_table_model,
- cell->model_col, cell->row));
+ cell->model_col, cell->row));
/* Cheat gnopernicus, or it will ignore the state change signal */
atk_focus_tracker_notify (ATK_OBJECT (cell));
diff --git a/widgets/table/a11y/gal-a11y-e-cell-vbox.h b/widgets/table/a11y/gal-a11y-e-cell-vbox.h
index cf6375a..b8f8bdd 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-vbox.h
+++ b/widgets/table/a11y/gal-a11y-e-cell-vbox.h
@@ -44,7 +44,7 @@ typedef struct _GalA11yECellVboxClass GalA11yECellVboxClass;
struct _GalA11yECellVbox
{
GalA11yECell object;
- gint a11y_subcell_count;
+ gint a11y_subcell_count;
gpointer *a11y_subcells;
};
diff --git a/widgets/table/a11y/gal-a11y-e-cell.c b/widgets/table/a11y/gal-a11y-e-cell.c
index a316500..e09b545 100644
--- a/widgets/table/a11y/gal-a11y-e-cell.c
+++ b/widgets/table/a11y/gal-a11y-e-cell.c
@@ -113,7 +113,7 @@ gal_a11y_e_cell_get_name (AtkObject * a11y)
return a11y->name;
if (cell->item != NULL) {
- ecol = e_table_header_get_column (cell->item->header, cell->view_col);
+ ecol = e_table_header_get_column (cell->item->header, cell->view_col);
if (ecol != NULL)
return ecol->text;
}
@@ -350,7 +350,7 @@ gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell,
g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
for (list_node = cell->action_list; list_node && !action_found;
- list_node = list_node->next) {
+ list_node = list_node->next) {
if (!g_ascii_strcasecmp (((ActionInfo *)(list_node->data))->name, action_name)) {
action_found = TRUE;
break;
diff --git a/widgets/table/a11y/gal-a11y-e-cell.h b/widgets/table/a11y/gal-a11y-e-cell.h
index 3ec3070..c61e5e2 100644
--- a/widgets/table/a11y/gal-a11y-e-cell.h
+++ b/widgets/table/a11y/gal-a11y-e-cell.h
@@ -90,7 +90,7 @@ void gal_a11y_e_cell_construct (AtkObject *object,
void gal_a11y_e_cell_type_add_action_interface (GType type);
gboolean gal_a11y_e_cell_add_action (GalA11yECell *cell,
- const gchar *action_name,
+ const gchar *action_name,
const gchar *action_description,
const gchar *action_keybinding,
ACTION_FUNC action_func);
@@ -99,7 +99,7 @@ gboolean gal_a11y_e_cell_remove_action (GalA11yECell *cell,
gint action_id);
gboolean gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell,
- const gchar *action_name);
+ const gchar *action_name);
gboolean gal_a11y_e_cell_add_state (GalA11yECell *cell,
AtkStateType state_type,
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add.c b/widgets/table/a11y/gal-a11y-e-table-click-to-add.c
index e36fe51..8a8fe56 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/a11y/gal-a11y-e-table-click-to-add.c
@@ -324,7 +324,7 @@ gal_a11y_e_table_click_to_add_new (GObject *widget)
g_signal_connect_after (G_OBJECT(widget), "event",
- G_CALLBACK (etcta_event), a11y);
+ G_CALLBACK (etcta_event), a11y);
g_signal_connect (etcta->selection, "cursor_changed",
G_CALLBACK (etcta_selection_cursor_changed), a11y);
diff --git a/widgets/table/a11y/gal-a11y-e-table-item.c b/widgets/table/a11y/gal-a11y-e-table-item.c
index 912d055..a3044a7 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item.c
+++ b/widgets/table/a11y/gal-a11y-e-table-item.c
@@ -185,7 +185,7 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y, ETableItem *item, gboolean
cell = eti_ref_at (ATK_TABLE (a11y), view_row, view_col);
if (cell != NULL) {
- g_object_set_data (G_OBJECT (a11y), "gail-focus-object", cell);
+ g_object_set_data (G_OBJECT (a11y), "gail-focus-object", cell);
gal_a11y_e_cell_add_state (GAL_A11Y_E_CELL (cell), ATK_STATE_FOCUSED, FALSE);
} else
g_object_set_data (G_OBJECT (a11y), "gail-focus-object", NULL);
@@ -362,7 +362,7 @@ eti_ref_at (AtkTable *table, gint row, gint column)
ATK_OBJECT (table),
ecol->col_idx,
column,
- row);
+ row);
if (ATK_IS_OBJECT (ret)) {
g_object_weak_ref (G_OBJECT (ret),
(GWeakNotify) cell_destroyed,
@@ -684,7 +684,7 @@ eti_rows_inserted (ETableModel * model, gint row, gint count,
gint old_nrows;
g_return_if_fail (table_item);
- item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item);
+ item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item);
n_cols = atk_table_get_n_columns (ATK_TABLE(table_item));
n_rows = atk_table_get_n_rows (ATK_TABLE(table_item));
@@ -840,7 +840,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
/* Emit signals */
if (reorder_found)
- g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered");
+ g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered");
if (removed_found) {
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index c488a4a..b2b921c 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -284,7 +284,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
gtk_container_set_focus_vadjustment (GTK_CONTAINER (tree_view),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
gtk_container_set_focus_hadjustment (GTK_CONTAINER (tree_view),
- gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+ gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
gtk_widget_show (tree_view);
ecde->time_tree_view = tree_view;
g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), "changed",
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 2cb36b6..1673fd5 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -277,7 +277,7 @@ e_cell_hbox_class_init (ECellHboxClass *klass)
ecc->max_width = ecv_max_width;
-/* gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_HBOX_TYPE, gal_a11y_e_cell_hbox_new); */
+/* gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_HBOX_TYPE, gal_a11y_e_cell_hbox_new); */
}
static void
diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h
index 366d01f..def14d8 100644
--- a/widgets/table/e-cell-hbox.h
+++ b/widgets/table/e-cell-hbox.h
@@ -61,7 +61,7 @@ ECell *e_cell_hbox_new (void);
void e_cell_hbox_append (ECellHbox *vbox,
ECell *subcell,
gint model_col,
- gint size);
+ gint size);
G_END_DECLS
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index ae85752..9480ec5 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -76,7 +76,7 @@ static int ecp_height (ECellView *ecv,
int model_col,
int view_col,
int row);
-static gpointer ecp_enter_edit (ECellView *ecv,
+static gpointer ecp_enter_edit (ECellView *ecv,
int model_col,
int view_col,
int row);
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
index b1e40a9..a8ce08f 100644
--- a/widgets/table/e-cell-popup.h
+++ b/widgets/table/e-cell-popup.h
@@ -71,7 +71,7 @@ typedef struct {
ECellClass parent_class;
/* Virtual function for subclasses to override. */
- gint (*popup) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col);
+ gint (*popup) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col);
} ECellPopupClass;
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index d4f61b2..d5eafb8 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -609,7 +609,7 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
pango_font_description_set_size (desc, fixed_size);
else
pango_font_description_set_absolute_size (desc, fixed_size);
-/* pango_font_description_set_style (desc, PANGO_STYLE_OBLIQUE); */
+/* pango_font_description_set_style (desc, PANGO_STYLE_OBLIQUE); */
pango_layout_set_font_description (layout, desc);
pango_font_description_free (desc);
pango_font_description_free (fixed_desc);
@@ -870,7 +870,7 @@ ect_get_bg_color(ECellView *ecell_view, gint row)
return NULL;
color_spec = e_table_model_value_at (ecell_view->e_table_model,
- ect->bg_color_column, row);
+ ect->bg_color_column, row);
return color_spec;
}
@@ -985,7 +985,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
if (preedit_len && flags & E_CELL_PREEDIT)
return 0;
else
- return 1;
+ return 1;
}
if (event->key.keyval == GDK_Escape){
@@ -1362,7 +1362,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
pango_context = gtk_widget_get_pango_context (canvas);
font_metrics = pango_context_get_metrics (pango_context,
- canvas->style->font_desc, pango_context_get_language(pango_context));
+ canvas->style->font_desc, pango_context_get_language(pango_context));
ty = (double)(text_height
- pango_font_metrics_get_ascent (font_metrics)
- pango_font_metrics_get_descent (font_metrics)) / 2.0 /(double)PANGO_SCALE;
@@ -1402,7 +1402,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
}
cairo_set_line_width (cr,(double)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(double)PANGO_SCALE);
- cairo_stroke (cr);
+ cairo_stroke (cr);
}
cairo_move_to(cr, 2, text_height- 5);
@@ -1592,7 +1592,7 @@ ect_show_tooltip (ECellView *ecell_view,
"clip_height", (double) height,
"clip", TRUE,
"line_wrap", FALSE,
- "justification", E_CELL_TEXT (text_view->cell_view.ecell)->justify,
+ "justification", E_CELL_TEXT (text_view->cell_view.ecell)->justify,
"draw_background", FALSE,
NULL);
@@ -1755,7 +1755,7 @@ e_cell_text_class_init (ECellTextClass *klass)
ecc->enter_edit = ect_enter_edit;
ecc->leave_edit = ect_leave_edit;
ecc->save_state = ect_save_state;
- ecc->load_state = ect_load_state;
+ ecc->load_state = ect_load_state;
ecc->free_state = ect_free_state;
ecc->print = ect_print;
ecc->print_height = ect_print_height;
@@ -1978,7 +1978,7 @@ e_cell_text_delete_surrounding_cb (GtkIMContext *context,
text_len = g_utf8_strlen (edit->text, -1);
begin_pos = g_utf8_pointer_to_offset (edit->text,
- edit->text + MIN (edit->selection_start, edit->selection_end));
+ edit->text + MIN (edit->selection_start, edit->selection_end));
begin_pos += offset;
end_pos = begin_pos + n_chars;
if(begin_pos < 0 || text_len < begin_pos)
@@ -1986,9 +1986,9 @@ e_cell_text_delete_surrounding_cb (GtkIMContext *context,
if(end_pos > text_len)
end_pos = text_len;
edit->selection_start = g_utf8_offset_to_pointer (edit->text, begin_pos)
- - edit->text;
+ - edit->text;
edit->selection_end = g_utf8_offset_to_pointer (edit->text, end_pos)
- - edit->text;
+ - edit->text;
_delete_selection (tv);
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 11a9ea4..5754b73 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -329,7 +329,7 @@ e_cell_toggle_class_init (ECellToggleClass *klass)
ecc->max_width = etog_max_width;
gal_a11y_e_cell_registry_add_cell_type (NULL,
- E_CELL_TOGGLE_TYPE,
+ E_CELL_TOGGLE_TYPE,
gal_a11y_e_cell_toggle_new);
}
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 1f3dc32..65c2723 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -79,7 +79,7 @@ ecv_kill_view (ECellView *ecv)
gint i;
if (vbox_view->cell_view.kill_view_cb)
- (vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data);
+ (vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data);
if (vbox_view->cell_view.kill_view_cb_data)
g_list_free(vbox_view->cell_view.kill_view_cb_data);
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index 1152a42..be674e6 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -16,7 +16,7 @@
*
* Authors:
* Miguel de Icaza <miguel ximian com>
- * Chris Lahey <clahey ximian com>
+ * Chris Lahey <clahey ximian com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index 614e1eb..79adb5c 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -93,13 +93,13 @@ typedef struct {
void (*realize) (ECellView *ecell_view);
void (*unrealize) (ECellView *ecell_view);
- void (*draw) (ECellView *ecell_view, GdkDrawable *drawable,
- gint model_col, gint view_col, gint row,
- ECellFlags flags, gint x1, gint y1, gint x2, gint y2);
- gint (*event) (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions);
- void (*focus) (ECellView *ecell_view, gint model_col, gint view_col,
- gint row, gint x1, gint y1, gint x2, gint y2);
- void (*unfocus) (ECellView *ecell_view);
+ void (*draw) (ECellView *ecell_view, GdkDrawable *drawable,
+ gint model_col, gint view_col, gint row,
+ ECellFlags flags, gint x1, gint y1, gint x2, gint y2);
+ gint (*event) (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions);
+ void (*focus) (ECellView *ecell_view, gint model_col, gint view_col,
+ gint row, gint x1, gint y1, gint x2, gint y2);
+ void (*unfocus) (ECellView *ecell_view);
gint (*height) (ECellView *ecell_view, gint model_col, gint view_col, gint row);
void *(*enter_edit) (ECellView *ecell_view, gint model_col, gint view_col, gint row);
@@ -108,10 +108,10 @@ typedef struct {
void (*load_state) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context, gpointer save_state);
void (*free_state) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state);
void (*print) (ECellView *ecell_view, GtkPrintContext *context,
- gint model_col, gint view_col, gint row,
- gdouble width, gdouble height);
+ gint model_col, gint view_col, gint row,
+ gdouble width, gdouble height);
gdouble (*print_height) (ECellView *ecell_view,GtkPrintContext *context,
- gint model_col, gint view_col, gint row, gdouble width);
+ gint model_col, gint view_col, gint row, gdouble width);
gint (*max_width) (ECellView *ecell_view, gint model_col, gint view_col);
gint (*max_width_by_row) (ECellView *ecell_view, gint model_col, gint view_col, gint row);
void (*show_tooltip) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gint col_width, ETableTooltip *tooltip);
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 13d55db..6c192eb 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -575,7 +575,7 @@ etcta_init (ETableClickToAdd *etcta)
/* create its a11y object at this time if accessibility is enabled*/
if (atk_get_root () != NULL) {
- a11y = atk_gobject_accessible_for_object (G_OBJECT (etcta));
+ a11y = atk_gobject_accessible_for_object (G_OBJECT (etcta));
atk_object_set_name (a11y, _("click to add"));
}
}
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index ca41285..295820d 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -89,14 +89,14 @@ The headers will be hard coded, as will be the example data.
front. It also sorts by the "Full Name" column (ascending.)
Sorting and grouping take the model column as their arguments
(sorting is specified by the "column" argument to the leaf elemnt. */
-#define INITIAL_SPEC "<ETableSpecification> \
- <columns-shown> \
- <column> 0 </column> \
- <column> 4 </column> \
- <column> 1 </column> \
- <column> 2 </column> \
- <column> 3 </column> \
- </columns-shown> \
+#define INITIAL_SPEC "<ETableSpecification> \
+ <columns-shown> \
+ <column> 0 </column> \
+ <column> 4 </column> \
+ <column> 1 </column> \
+ <column> 2 </column> \
+ <column> 3 </column> \
+ </columns-shown> \
<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \
</ETableSpecification>"
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 629252f..51bd49a 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -888,7 +888,7 @@ ethi_realize (GnomeCanvasItem *item)
gtk_drag_dest_set (GTK_WIDGET (item->canvas), 0,
ethi_drop_types, ELEMENTS (ethi_drop_types),
GDK_ACTION_MOVE);
- g_free(ethi_drop_types[0].target);
+ g_free(ethi_drop_types[0].target);
/* Drop signals */
ethi->drag_motion_id = g_signal_connect (item->canvas, "drag_motion",
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 84b547c..7976289 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -241,7 +241,7 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget,
gint x, gint y, PangoLayout *layout, gchar *str,
gint max_width, gboolean center)
{
- gint width;
+ gint width;
gint height;
gint index;
GSList *lines;
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index b931f48..37a1e3c 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -154,7 +154,7 @@ eth_finalize (GObject *object)
if (eth->sort_info) {
if (eth->sort_info_group_change_id)
g_signal_handler_disconnect(G_OBJECT(eth->sort_info),
- eth->sort_info_group_change_id);
+ eth->sort_info_group_change_id);
g_object_unref(eth->sort_info);
eth->sort_info = NULL;
}
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 485007c..461cacf 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -245,7 +245,7 @@ eti_editing (ETableItem *eti)
inline static GdkColor *
eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocatedp)
{
- ECellView *ecell_view = eti->cell_views [col];
+ ECellView *ecell_view = eti->cell_views [col];
GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas);
GdkColor *background, bg;
gchar *color_spec = NULL;
@@ -584,11 +584,11 @@ eti_remove_header_model (ETableItem *eti)
return;
g_signal_handler_disconnect (G_OBJECT (eti->header),
- eti->header_structure_change_id);
+ eti->header_structure_change_id);
g_signal_handler_disconnect (G_OBJECT (eti->header),
- eti->header_dim_change_id);
+ eti->header_dim_change_id);
g_signal_handler_disconnect (G_OBJECT (eti->header),
- eti->header_request_width_id);
+ eti->header_request_width_id);
if (eti->cell_views){
eti_unrealize_cell_views (eti);
@@ -1102,7 +1102,7 @@ eti_table_model_no_change (ETableModel *table_model, ETableItem *eti)
static void
eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
{
- if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+ if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
eti_unfreeze (eti);
return;
}
@@ -1124,7 +1124,7 @@ eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
static void
eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti)
{
- if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+ if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
eti_unfreeze (eti);
return;
}
@@ -1142,7 +1142,7 @@ eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti
static void
eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETableItem *eti)
{
- if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+ if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
eti_unfreeze (eti);
return;
}
@@ -1160,7 +1160,7 @@ eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETab
static void
eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, ETableItem *eti)
{
- if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+ if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
eti_unfreeze (eti);
return;
}
@@ -1187,7 +1187,7 @@ eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, E
static void
eti_table_model_rows_deleted (ETableModel *table_model, gint row, gint count, ETableItem *eti)
{
- if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+ if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
eti_unfreeze (eti);
return;
}
@@ -1578,8 +1578,8 @@ eti_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
static void
eti_init (ETableItem *eti)
{
- eti->motion_row = -1;
- eti->motion_col = -1;
+ eti->motion_row = -1;
+ eti->motion_col = -1;
eti->editing_col = -1;
eti->editing_row = -1;
eti->height = 0;
@@ -1637,7 +1637,7 @@ eti_init (ETableItem *eti)
eti->grabbed_row = -1;
eti->cursor_on_screen = FALSE;
- eti->cursor_x1 = -1;
+ eti->cursor_x1 = -1;
eti->cursor_y1 = -1;
eti->cursor_x2 = -1;
eti->cursor_y2 = -1;
@@ -2626,7 +2626,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
cross->crossing.time = e->motion.time;
return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col],
cross, cross->crossing.time,
- view_to_model_col(eti, eti->motion_col),
+ view_to_model_col(eti, eti->motion_col),
eti->motion_col, eti->motion_row, 0);
}
@@ -2910,7 +2910,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
if (eti->motion_row != -1 && eti->motion_col != -1)
return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col],
e, e->crossing.time,
- view_to_model_col(eti, eti->motion_col),
+ view_to_model_col(eti, eti->motion_col),
eti->motion_col, eti->motion_row, 0);
eti->motion_row = -1;
eti->motion_col = -1;
@@ -2952,7 +2952,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
static void
eti_style_set (ETableItem *eti, GtkStyle *previous_style)
{
- if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
+ if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
return;
if (eti->cell_views_realized) {
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 0536367..f149656 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -91,15 +91,15 @@ typedef struct {
GdkBitmap *stipple;
guint alternating_row_colors:1;
- guint horizontal_draw_grid:1;
- guint vertical_draw_grid:1;
- guint draw_focus:1;
- guint uniform_row_height:1;
- guint cell_views_realized:1;
+ guint horizontal_draw_grid:1;
+ guint vertical_draw_grid:1;
+ guint draw_focus:1;
+ guint uniform_row_height:1;
+ guint cell_views_realized:1;
- guint needs_redraw : 1;
- guint needs_compute_height : 1;
- guint needs_compute_width : 1;
+ guint needs_redraw : 1;
+ guint needs_compute_height : 1;
+ guint needs_compute_width : 1;
guint uses_source_model : 1;
@@ -124,10 +124,10 @@ typedef struct {
gint cursor_x2;
gint cursor_y2;
- gint drag_col;
- gint drag_row;
- gint drag_x;
- gint drag_y;
+ gint drag_col;
+ gint drag_row;
+ gint drag_x;
+ gint drag_y;
guint drag_state;
/*
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index 82b2d5b..c4d5574 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -53,7 +53,7 @@ etsv_dispose (GObject *object)
if (etsv->sort_info_changed_id)
g_signal_handler_disconnect (G_OBJECT (etsv->sort_info),
- etsv->sort_info_changed_id);
+ etsv->sort_info_changed_id);
etsv->sort_info_changed_id = 0;
if (etsv->sort_idle_id) {
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 7eceeb8..ae9bbbd 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -64,7 +64,7 @@ ets_dispose (GObject *object)
if (ets->sort_info) {
g_signal_handler_disconnect (G_OBJECT (ets->sort_info),
- ets->sort_info_changed_id);
+ ets->sort_info_changed_id);
g_object_unref(ets->sort_info);
ets->sort_info = NULL;
}
@@ -199,7 +199,7 @@ ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, gint co
static void
ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row, gint count)
{
- ETableModel *etm = E_TABLE_MODEL(etss);
+ ETableModel *etm = E_TABLE_MODEL(etss);
ETableSorted *ets = E_TABLE_SORTED(etss);
gint i;
gboolean full_change = FALSE;
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 8851f31..4d3148a 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -44,20 +44,20 @@ G_DEFINE_TYPE (ETableSorter, ets, E_SORTER_TYPE)
#define INCREMENT_AMOUNT 100
-static void ets_model_changed (ETableModel *etm, ETableSorter *ets);
-static void ets_model_row_changed (ETableModel *etm, gint row, ETableSorter *ets);
-static void ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets);
-static void ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets);
-static void ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets);
-static void ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets);
-static void ets_clean (ETableSorter *ets);
-static void ets_sort (ETableSorter *ets);
-static void ets_backsort (ETableSorter *ets);
-
-static gint ets_model_to_sorted (ESorter *sorter, gint row);
-static gint ets_sorted_to_model (ESorter *sorter, gint row);
-static void ets_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
-static void ets_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
+static void ets_model_changed (ETableModel *etm, ETableSorter *ets);
+static void ets_model_row_changed (ETableModel *etm, gint row, ETableSorter *ets);
+static void ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets);
+static void ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets);
+static void ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets);
+static void ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets);
+static void ets_clean (ETableSorter *ets);
+static void ets_sort (ETableSorter *ets);
+static void ets_backsort (ETableSorter *ets);
+
+static gint ets_model_to_sorted (ESorter *sorter, gint row);
+static gint ets_sorted_to_model (ESorter *sorter, gint row);
+static void ets_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
+static void ets_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
static gboolean ets_needs_sorting (ESorter *ets);
static void
@@ -210,7 +210,7 @@ e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortIn
ets->table_model_row_changed_id = g_signal_connect (source, "model_row_changed",
G_CALLBACK (ets_model_row_changed), ets);
ets->table_model_cell_changed_id = g_signal_connect (source, "model_cell_changed",
- G_CALLBACK (ets_model_cell_changed), ets);
+ G_CALLBACK (ets_model_cell_changed), ets);
ets->table_model_rows_inserted_id = g_signal_connect (source, "model_rows_inserted",
G_CALLBACK (ets_model_rows_inserted), ets);
ets->table_model_rows_deleted_id = g_signal_connect (source, "model_rows_deleted",
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index fd57f5b..e7acd90 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -217,7 +217,7 @@ e_table_specification_load_from_node (ETableSpecification *specification,
temp = e_xml_get_string_prop_by_name (node, (const guchar *)"cursor-mode");
if (temp && !g_ascii_strcasecmp (temp, "line")) {
specification->cursor_mode = E_CURSOR_LINE;
- } else if (temp && !g_ascii_strcasecmp (temp, "spreadsheet")) {
+ } else if (temp && !g_ascii_strcasecmp (temp, "spreadsheet")) {
specification->cursor_mode = E_CURSOR_SPREADSHEET;
}
g_free (temp);
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 6b85627..fc7cb10 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -262,9 +262,9 @@ e_table_without_construct (ETableWithout *etw,
E_TABLE_SUBSET(etw)->n_map = 0;
etw->priv->hash_func = hash_func;
- etw->priv->compare_func = compare_func;
- etw->priv->get_key_func = get_key_func;
- etw->priv->duplicate_key_func = duplicate_key_func;
+ etw->priv->compare_func = compare_func;
+ etw->priv->get_key_func = get_key_func;
+ etw->priv->duplicate_key_func = duplicate_key_func;
etw->priv->free_gotten_key_func = free_gotten_key_func;
etw->priv->free_duplicated_key_func = free_duplicated_key_func;
etw->priv->closure = closure;
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index e0a6179..549a4ca 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -168,19 +168,19 @@ et_disconnect_model (ETable *et)
if (et->table_model_change_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->model),
- et->table_model_change_id);
+ et->table_model_change_id);
if (et->table_row_change_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->model),
- et->table_row_change_id);
+ et->table_row_change_id);
if (et->table_cell_change_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->model),
- et->table_cell_change_id);
+ et->table_cell_change_id);
if (et->table_rows_inserted_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->model),
- et->table_rows_inserted_id);
+ et->table_rows_inserted_id);
if (et->table_rows_deleted_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->model),
- et->table_rows_deleted_id);
+ et->table_rows_deleted_id);
et->table_model_change_id = 0;
et->table_row_change_id = 0;
@@ -307,23 +307,23 @@ et_dispose (GObject *object)
if (et->search) {
if (et->search_search_id)
g_signal_handler_disconnect (G_OBJECT (et->search),
- et->search_search_id);
+ et->search_search_id);
if (et->search_accept_id)
g_signal_handler_disconnect (G_OBJECT (et->search),
- et->search_accept_id);
+ et->search_accept_id);
g_object_unref (et->search);
et->search = NULL;
}
if (et->group_info_change_id) {
g_signal_handler_disconnect (G_OBJECT (et->sort_info),
- et->group_info_change_id);
+ et->group_info_change_id);
et->group_info_change_id = 0;
}
if (et->sort_info_change_id) {
g_signal_handler_disconnect (G_OBJECT (et->sort_info),
- et->sort_info_change_id);
+ et->sort_info_change_id);
et->sort_info_change_id = 0;
}
@@ -1115,7 +1115,7 @@ table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer d
gnome_canvas_item_grab_focus (etable->canvas_vbox);
gnome_canvas_item_grab_focus (etable->click_to_add);
} else if (!canvas->focused_item && etable->group) {
- focus_first_etable_item (etable->group);
+ focus_first_etable_item (etable->group);
} else if (canvas->focused_item) {
ESelectionModel *selection = (ESelectionModel *)etable->selection;
@@ -2454,7 +2454,7 @@ struct _ETableDragSourceSite
GdkModifierType start_button_mask;
GtkTargetList *target_list; /* Targets for drag data */
GdkDragAction actions; /* Possible actions */
- GdkColormap *colormap; /* Colormap for drag icon */
+ GdkColormap *colormap; /* Colormap for drag icon */
GdkPixmap *pixmap; /* Icon for drag data */
GdkBitmap *mask;
@@ -2795,8 +2795,8 @@ e_table_drag_source_unset (ETable *table)
**/
GdkDragContext *
e_table_drag_begin (ETable *table,
- gint row,
- gint col,
+ gint row,
+ gint col,
GtkTargetList *targets,
GdkDragAction actions,
gint button,
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 7d3d0ff..bb82ef1 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -77,8 +77,8 @@ typedef struct {
ETableCol *current_search_col;
- guint search_search_id;
- guint search_accept_id;
+ guint search_search_id;
+ guint search_accept_id;
gint table_model_change_id;
gint table_row_change_id;
@@ -174,11 +174,11 @@ typedef struct {
GtkAdjustment *vadjustment);
/* Source side drag signals */
- void (* table_drag_begin) (ETable *table,
+ void (* table_drag_begin) (ETable *table,
gint row,
gint col,
GdkDragContext *context);
- void (* table_drag_end) (ETable *table,
+ void (* table_drag_end) (ETable *table,
gint row,
gint col,
GdkDragContext *context);
@@ -195,7 +195,7 @@ typedef struct {
GdkDragContext *context);
/* Target side drag signals */
- void (* table_drag_leave) (ETable *table,
+ void (* table_drag_leave) (ETable *table,
gint row,
gint col,
GdkDragContext *context,
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index 25175c9..562a473 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -277,7 +277,7 @@ e_tree_memory_callbacks_new (ETreeMemoryCallbacksIconAtFn icon_at,
etmc->has_get_node_by_id = has_get_node_by_id;
etmc->get_node_by_id = get_node_by_id;
- etmc->sort_value_at = sort_value_at;
+ etmc->sort_value_at = sort_value_at;
etmc->value_at = value_at;
etmc->set_value_at = set_value_at;
etmc->is_editable = is_editable;
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 728392f..54bd7b7 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -274,7 +274,7 @@ etmm_get_prev (ETreeModel *etm, ETreePath node)
static gboolean
etmm_is_root (ETreeModel *etm, ETreePath node)
{
- ETreeMemoryPath *path = node;
+ ETreeMemoryPath *path = node;
return e_tree_memory_path_depth (path) == 0;
}
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 9482fe9..143ad61 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -180,7 +180,7 @@ e_tree_model_class_init (ETreeModelClass *klass)
klass->has_change_pending = NULL;
- klass->sort_value_at = NULL;
+ klass->sort_value_at = NULL;
klass->value_at = NULL;
klass->set_value_at = NULL;
klass->is_editable = NULL;
@@ -193,7 +193,7 @@ e_tree_model_class_init (ETreeModelClass *klass)
klass->pre_change = NULL;
klass->no_change = NULL;
- klass->rebuilt = NULL;
+ klass->rebuilt = NULL;
klass->node_changed = NULL;
klass->node_data_changed = NULL;
klass->node_col_changed = NULL;
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 68316f7..3bb4375 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -241,21 +241,21 @@ drop_model(ETreeSelectionModel *etsm)
return;
g_signal_handler_disconnect (G_OBJECT (priv->model),
- priv->tree_model_pre_change_id);
+ priv->tree_model_pre_change_id);
g_signal_handler_disconnect (G_OBJECT (priv->model),
- priv->tree_model_no_change_id);
+ priv->tree_model_no_change_id);
g_signal_handler_disconnect (G_OBJECT (priv->model),
- priv->tree_model_node_changed_id);
+ priv->tree_model_node_changed_id);
g_signal_handler_disconnect (G_OBJECT (priv->model),
- priv->tree_model_node_data_changed_id);
+ priv->tree_model_node_data_changed_id);
g_signal_handler_disconnect (G_OBJECT (priv->model),
- priv->tree_model_node_col_changed_id);
+ priv->tree_model_node_col_changed_id);
g_signal_handler_disconnect (G_OBJECT (priv->model),
- priv->tree_model_node_inserted_id);
+ priv->tree_model_node_inserted_id);
g_signal_handler_disconnect (G_OBJECT (priv->model),
- priv->tree_model_node_removed_id);
+ priv->tree_model_node_removed_id);
g_signal_handler_disconnect (G_OBJECT (priv->model),
- priv->tree_model_node_deleted_id);
+ priv->tree_model_node_deleted_id);
g_object_unref (priv->model);
priv->model = NULL;
diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c
index 2704b7e..b71f108 100644
--- a/widgets/table/e-tree-simple.c
+++ b/widgets/table/e-tree-simple.c
@@ -182,12 +182,12 @@ e_tree_simple_new (ETableSimpleColumnCountFn col_count,
ETableSimpleValueIsEmptyFn value_is_empty,
ETableSimpleValueToStringFn value_to_string,
- ETreeSimpleIconAtFn icon_at,
- ETreeSimpleValueAtFn value_at,
- ETreeSimpleSetValueAtFn set_value_at,
- ETreeSimpleIsEditableFn is_editable,
+ ETreeSimpleIconAtFn icon_at,
+ ETreeSimpleValueAtFn value_at,
+ ETreeSimpleSetValueAtFn set_value_at,
+ ETreeSimpleIsEditableFn is_editable,
- gpointer model_data)
+ gpointer model_data)
{
ETreeSimple *etg = g_object_new (E_TREE_SIMPLE_TYPE, NULL);
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
index 0bc8250..d9901e6 100644
--- a/widgets/table/e-tree-sorted-variable.c
+++ b/widgets/table/e-tree-sorted-variable.c
@@ -63,7 +63,7 @@ etsv_dispose (GObject *object)
if (etsv->table_model_changed_id)
g_signal_handler_disconnect (G_OBJECT (etss->source),
- etsv->table_model_changed_id);
+ etsv->table_model_changed_id);
etsv->table_model_changed_id = 0;
#if 0
@@ -77,7 +77,7 @@ etsv_dispose (GObject *object)
#endif
if (etsv->sort_info_changed_id)
g_signal_handler_disconnect (etsv->sort_info,
- etsv->sort_info_changed_id);
+ etsv->sort_info_changed_id);
etsv->sort_info_changed_id = 0;
if (etsv->sort_idle_id)
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 3ec12c8..c72c269 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -593,23 +593,23 @@ ets_dispose (GObject *object)
if (priv->source) {
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_pre_change_id);
+ priv->tree_model_pre_change_id);
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_no_change_id);
+ priv->tree_model_no_change_id);
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_node_changed_id);
+ priv->tree_model_node_changed_id);
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_node_data_changed_id);
+ priv->tree_model_node_data_changed_id);
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_node_col_changed_id);
+ priv->tree_model_node_col_changed_id);
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_node_inserted_id);
+ priv->tree_model_node_inserted_id);
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_node_removed_id);
+ priv->tree_model_node_removed_id);
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_node_deleted_id);
+ priv->tree_model_node_deleted_id);
g_signal_handler_disconnect (G_OBJECT (priv->source),
- priv->tree_model_node_request_collapse_id);
+ priv->tree_model_node_request_collapse_id);
g_object_unref (priv->source);
priv->source = NULL;
@@ -627,7 +627,7 @@ ets_dispose (GObject *object)
if (priv->sort_info) {
g_signal_handler_disconnect (G_OBJECT (priv->sort_info),
- priv->sort_info_changed_id);
+ priv->sort_info_changed_id);
priv->sort_info_changed_id = 0;
g_object_unref (priv->sort_info);
@@ -746,7 +746,7 @@ ets_get_prev (ETreeModel *etm, ETreePath node)
static gboolean
ets_is_root (ETreeModel *etm, ETreePath node)
{
- ETreeSortedPath *path = node;
+ ETreeSortedPath *path = node;
ETreeSorted *ets = E_TREE_SORTED(etm);
return e_tree_model_node_is_root (ets->priv->source, path->corresponding);
@@ -755,7 +755,7 @@ ets_is_root (ETreeModel *etm, ETreePath node)
static gboolean
ets_is_expandable (ETreeModel *etm, ETreePath node)
{
- ETreeSortedPath *path = node;
+ ETreeSortedPath *path = node;
ETreeSorted *ets = E_TREE_SORTED(etm);
gboolean expandable = e_tree_model_node_is_expandable (ets->priv->source, path->corresponding);
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 2018ea5..cac1260 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -60,8 +60,8 @@ struct ETreeTableAdapterPriv {
ETableSortInfo *sort_info;
ETableHeader *header;
- gint n_map;
- gint n_vals_allocated;
+ gint n_map;
+ gint n_vals_allocated;
node_t **map_table;
GHashTable *nodes;
GNode *root;
@@ -864,7 +864,7 @@ e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source, ETa
if (sort_info) {
g_object_ref(sort_info);
etta->priv->sort_info_changed_id = g_signal_connect (G_OBJECT (sort_info), "sort_info_changed",
- G_CALLBACK (etta_sort_info_changed), etta);
+ G_CALLBACK (etta_sort_info_changed), etta);
}
etta->priv->header = header;
@@ -1247,7 +1247,7 @@ e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sor
{
if (etta->priv->sort_info) {
g_signal_handler_disconnect(G_OBJECT(etta->priv->sort_info),
- etta->priv->sort_info_changed_id);
+ etta->priv->sort_info_changed_id);
g_object_unref(etta->priv->sort_info);
}
@@ -1255,7 +1255,7 @@ e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sor
if (sort_info) {
g_object_ref(sort_info);
etta->priv->sort_info_changed_id = g_signal_connect(G_OBJECT(sort_info), "sort_info_changed",
- G_CALLBACK(etta_sort_info_changed), etta);
+ G_CALLBACK(etta_sort_info_changed), etta);
}
if (!etta->priv->root)
diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h
index 6a0f67b..596a3de 100644
--- a/widgets/table/e-tree-table-adapter.h
+++ b/widgets/table/e-tree-table-adapter.h
@@ -58,7 +58,7 @@ ETableModel *e_tree_table_adapter_new (ETreeModel
ETableHeader *header);
ETableModel *e_tree_table_adapter_construct (ETreeTableAdapter *ets,
ETreeModel *source,
- ETableSortInfo *sort_info,
+ ETableSortInfo *sort_info,
ETableHeader *header);
ETreePath e_tree_table_adapter_node_get_next (ETreeTableAdapter *etta,
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 7b76e9b..beb069e 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -127,8 +127,8 @@ struct ETreePriv {
ETableCol *current_search_col;
- guint search_search_id;
- guint search_accept_id;
+ guint search_search_id;
+ guint search_accept_id;
gint reflow_idle_id;
gint scroll_idle_id;
@@ -251,16 +251,16 @@ et_disconnect_from_etta (ETree *et)
{
if (et->priv->table_model_change_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->priv->etta),
- et->priv->table_model_change_id);
+ et->priv->table_model_change_id);
if (et->priv->table_row_change_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->priv->etta),
- et->priv->table_row_change_id);
+ et->priv->table_row_change_id);
if (et->priv->table_cell_change_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->priv->etta),
- et->priv->table_cell_change_id);
+ et->priv->table_cell_change_id);
if (et->priv->table_rows_delete_id != 0)
g_signal_handler_disconnect (G_OBJECT (et->priv->etta),
- et->priv->table_rows_delete_id);
+ et->priv->table_rows_delete_id);
et->priv->table_model_change_id = 0;
et->priv->table_row_change_id = 0;
@@ -316,17 +316,17 @@ disconnect_header (ETree *e_tree)
if (e_tree->priv->structure_change_id)
g_signal_handler_disconnect (G_OBJECT (e_tree->priv->header),
- e_tree->priv->structure_change_id);
+ e_tree->priv->structure_change_id);
if (e_tree->priv->expansion_change_id)
g_signal_handler_disconnect (G_OBJECT (e_tree->priv->header),
- e_tree->priv->expansion_change_id);
+ e_tree->priv->expansion_change_id);
if (e_tree->priv->sort_info) {
if (e_tree->priv->sort_info_change_id)
g_signal_handler_disconnect (G_OBJECT (e_tree->priv->sort_info),
- e_tree->priv->sort_info_change_id);
+ e_tree->priv->sort_info_change_id);
if (e_tree->priv->group_info_change_id)
g_signal_handler_disconnect (G_OBJECT (e_tree->priv->sort_info),
- e_tree->priv->group_info_change_id);
+ e_tree->priv->group_info_change_id);
g_object_unref(e_tree->priv->sort_info);
}
@@ -793,7 +793,7 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
&row, &col, &x, &y, &w, &h);
}
- if (y < adj->value || y + h > adj->value + adj->page_size)
+ if (y < adj->value || y + h > adj->value + adj->page_size)
gtk_adjustment_set_value(adj, CLAMP(y - adj->page_size / 2, adj->lower, adj->upper - adj->page_size));
}
@@ -2254,7 +2254,7 @@ struct _ETreeDragSourceSite
GdkModifierType start_button_mask;
GtkTargetList *target_list; /* Targets for drag data */
GdkDragAction actions; /* Possible actions */
- GdkColormap *colormap; /* Colormap for drag icon */
+ GdkColormap *colormap; /* Colormap for drag icon */
GdkPixmap *pixmap; /* Icon for drag data */
GdkBitmap *mask;
@@ -2545,8 +2545,8 @@ e_tree_drag_source_unset (ETree *tree)
GdkDragContext *
e_tree_drag_begin (ETree *tree,
- gint row,
- gint col,
+ gint row,
+ gint col,
GtkTargetList *targets,
GdkDragAction actions,
gint button,
@@ -2900,7 +2900,7 @@ static void
context_connect (ETree *et, GdkDragContext *context)
{
if (context == et->priv->last_drop_context)
- return;
+ return;
if (et->priv->last_drop_context)
g_object_weak_unref (G_OBJECT(et->priv->last_drop_context), context_destroyed, et);
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 6bcc217..b746156 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -76,12 +76,12 @@ typedef struct {
GtkAdjustment *vadjustment);
/* Source side drag signals */
- void (* tree_drag_begin) (ETree *tree,
+ void (* tree_drag_begin) (ETree *tree,
gint row,
ETreePath path,
gint col,
GdkDragContext *context);
- void (* tree_drag_end) (ETree *tree,
+ void (* tree_drag_end) (ETree *tree,
gint row,
ETreePath path,
gint col,
@@ -101,7 +101,7 @@ typedef struct {
GdkDragContext *context);
/* Target side drag signals */
- void (* tree_drag_leave) (ETree *tree,
+ void (* tree_drag_leave) (ETree *tree,
gint row,
ETreePath path,
gint col,
diff --git a/widgets/text/a11y/gal-a11y-e-text.c b/widgets/text/a11y/gal-a11y-e-text.c
index 6717f68..f593967 100644
--- a/widgets/text/a11y/gal-a11y-e-text.c
+++ b/widgets/text/a11y/gal-a11y-e-text.c
@@ -383,19 +383,19 @@ et_get_text_at_offset (AtkText *text,
case ATK_TEXT_BOUNDARY_SENTENCE_START:
start = find_sentence_start (full_text, offset - 1, -1);
end = find_sentence_start (full_text, offset, 1);
- break;
+ break;
case ATK_TEXT_BOUNDARY_SENTENCE_END:
- start = find_sentence_end (full_text, offset, -1);
+ start = find_sentence_end (full_text, offset, -1);
end = find_sentence_end (full_text, offset + 1, 1);
break;
case ATK_TEXT_BOUNDARY_LINE_START:
- start = find_line_start (full_text, offset - 1, -1);
+ start = find_line_start (full_text, offset - 1, -1);
end = find_line_start (full_text, offset, 1);
- break;
+ break;
case ATK_TEXT_BOUNDARY_LINE_END:
start = find_line_end (full_text, offset, -1);
end = find_line_end (full_text, offset + 1, 1);
- break;
+ break;
default:
return NULL;
}
@@ -448,19 +448,19 @@ et_get_text_before_offset (AtkText *text,
case ATK_TEXT_BOUNDARY_SENTENCE_START:
end = find_sentence_start (full_text, offset, -1);
start = find_sentence_start (full_text, end - 1, -1);
- break;
+ break;
case ATK_TEXT_BOUNDARY_SENTENCE_END:
- end = find_sentence_end (full_text, offset, -1);
+ end = find_sentence_end (full_text, offset, -1);
start = find_sentence_end (full_text, end - 1, -1);
- break;
+ break;
case ATK_TEXT_BOUNDARY_LINE_START:
- end = find_line_start (full_text, offset, -1);
+ end = find_line_start (full_text, offset, -1);
start = find_line_start (full_text, end - 1, -1);
- break;
+ break;
case ATK_TEXT_BOUNDARY_LINE_END:
- end = find_line_end (full_text, offset, -1);
+ end = find_line_end (full_text, offset, -1);
start = find_line_end (full_text, end - 1, -1);
- break;
+ break;
default:
return NULL;
}
@@ -572,8 +572,8 @@ et_get_character_extents (AtkText *text,
window = gdk_window_get_toplevel (window);
gdk_window_get_origin (window, &x_window, &y_window);
*x -= x_window;
- *y -= y_window;
- }
+ *y -= y_window;
+ }
else if (coords == ATK_XY_SCREEN) {
}
else {
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index e9f7adc..cae0f4d 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -1278,7 +1278,7 @@ e_reflow_point (GnomeCanvasItem *item,
return 0;
#if 0
if (y >= E_REFLOW_BORDER_WIDTH && y <= reflow->height - E_REFLOW_BORDER_WIDTH) {
- float n_x;
+ float n_x;
n_x = x;
n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
n_x = fmod(n_x, (reflow->column_width + E_REFLOW_FULL_GUTTER));
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index d9f599f..12a1668 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -436,8 +436,8 @@ reset_layout (EText *text)
pango_font_description_get_family ((GTK_WIDGET (item->canvas))->style->font_desc));
pango_layout_set_font_description (text->layout, text->font_desc);
- pango_layout_set_text (text->layout, text->text, -1);
- reset_layout_attrs (text);
+ pango_layout_set_text (text->layout, text->text, -1);
+ reset_layout_attrs (text);
}
if (!text->button_down) {
@@ -2226,7 +2226,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
* Here when a new text widget comes into focus we can disconnect the
* old one.Shouldn't hurt much, as in worst case, save_text which should
* be disconnected will be overwritten and we will have signal
- * handlers connect to multiple e-texts but with subsequent commit these
+ * handlers connect to multiple e-texts but with subsequent commit these
* should go away.
*/
@@ -2753,7 +2753,7 @@ popup_targets_received (GtkClipboard *clipboard,
/* If invoked by S-F10 key binding, button will be 0. */
if (button->button == 0){
- gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL,
+ gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL,
popup_menu_placement_cb, (gpointer)text,
button->button, GDK_CURRENT_TIME);
} else {
@@ -3911,15 +3911,15 @@ e_text_preedit_changed_cb (GtkIMContext *context,
EText *etext)
{
gchar *preedit_string = NULL;
- gint cursor_pos;
+ gint cursor_pos;
gtk_im_context_get_preedit_string (context, &preedit_string,
NULL, &cursor_pos);
- cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
+ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
etext->preedit_len = strlen (preedit_string);
- etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
- g_free (preedit_string);
+ etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
+ g_free (preedit_string);
g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
}
@@ -3943,7 +3943,7 @@ e_text_delete_surrounding_cb (GtkIMContext *context,
EText *text)
{
e_text_model_delete (text->model,
- MIN (text->selection_start, text->selection_end) + offset,
+ MIN (text->selection_start, text->selection_end) + offset,
n_chars);
return TRUE;
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index f9b838a..5f6904b 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -109,8 +109,8 @@ struct _EText {
gint model_repos_signal_id;
const gchar *text; /* Text to display --- from the ETextModel */
- gint preedit_len; /* preedit length to display */
- gint preedit_pos; /* preedit cursor position */
+ gint preedit_len; /* preedit length to display */
+ gint preedit_pos; /* preedit cursor position */
PangoLayout *layout;
gint num_lines; /* Number of lines of text */
@@ -124,7 +124,7 @@ struct _EText {
double xofs, yofs; /* Text offset distance from anchor position */
- GdkColor color; /* Fill color */
+ GdkColor color; /* Fill color */
GdkBitmap *stipple; /* Stipple for text */
GdkGC *gc; /* GC for drawing text */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
