[evolution] Coding style and whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Coding style and whitespace cleanup.
- Date: Sun, 19 Aug 2012 18:19:10 +0000 (UTC)
commit c85109fc322137596bf34cffc5445d568223c60d
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Jul 12 08:02:18 2012 -0400
Coding style and whitespace cleanup.
.../gui/contact-editor/e-contact-editor-fullname.c | 26 +-
addressbook/gui/contact-editor/e-contact-editor.c | 70 ++--
.../gui/contact-editor/e-contact-quick-add.c | 2 +-
addressbook/gui/merging/eab-contact-compare.c | 2 +-
addressbook/gui/merging/eab-contact-merging.c | 2 +-
.../gui/widgets/e-addressbook-table-adapter.c | 2 +-
addressbook/gui/widgets/e-minicard-label.c | 8 +-
addressbook/gui/widgets/e-minicard-view.c | 2 +-
addressbook/gui/widgets/e-minicard.c | 10 +-
addressbook/gui/widgets/eab-contact-display.c | 2 +-
addressbook/gui/widgets/eab-contact-formatter.c | 19 +-
addressbook/gui/widgets/eab-contact-formatter.h | 4 +-
addressbook/importers/evolution-csv-importer.c | 120 +++---
addressbook/importers/evolution-ldif-importer.c | 16 +-
addressbook/importers/evolution-vcard-importer.c | 26 +-
addressbook/printing/e-contact-print.c | 62 ++--
calendar/alarm-notify/alarm-queue.c | 4 +-
calendar/alarm-notify/util.c | 6 +-
calendar/gui/dialogs/comp-editor.c | 2 +-
calendar/gui/dialogs/event-page.c | 16 +-
calendar/gui/dialogs/memo-page.c | 4 +-
calendar/gui/dialogs/task-page.c | 2 +-
calendar/gui/e-alarm-list.c | 10 +-
calendar/gui/e-cal-component-preview.c | 9 +-
calendar/gui/e-cal-model-memos.c | 2 +-
calendar/gui/e-cal-model.c | 2 +-
calendar/gui/e-calendar-view.c | 4 +-
calendar/gui/e-day-view.c | 26 +-
calendar/gui/e-meeting-list-view.c | 2 +-
calendar/gui/e-week-view.c | 18 +-
calendar/gui/ea-cal-view-event.c | 2 +-
calendar/gui/ea-cal-view.c | 6 +-
calendar/gui/ea-calendar.c | 2 +-
calendar/gui/ea-day-view-cell.c | 2 +-
calendar/gui/ea-day-view.c | 2 +-
calendar/gui/ea-gnome-calendar.c | 2 +-
calendar/gui/ea-week-view-cell.c | 2 +-
calendar/gui/ea-week-view-main-item.c | 14 +-
calendar/gui/ea-week-view.c | 4 +-
calendar/gui/gnome-cal.c | 2 +-
calendar/gui/itip-utils.c | 12 +-
calendar/gui/misc.c | 6 +-
calendar/gui/print.c | 14 +-
calendar/importers/icalendar-importer.c | 38 +-
composer/e-msg-composer.c | 6 +-
e-util/e-config.c | 127 +++---
e-util/e-dialog-utils.c | 9 +-
e-util/e-event.c | 21 +-
e-util/e-file-request.c | 13 +-
e-util/e-html-utils.c | 51 ++-
e-util/e-import.c | 4 +-
e-util/e-mktemp.c | 18 +-
e-util/e-plugin-ui.c | 6 +-
e-util/e-plugin.c | 45 +-
e-util/e-stock-request.c | 20 +-
e-util/e-text-event-processor.c | 36 +-
e-util/e-unicode.c | 6 +-
e-util/e-util.c | 20 +-
em-format/e-mail-extension-registry.c | 4 +-
em-format/e-mail-formatter-attachment.c | 2 +-
em-format/e-mail-formatter-headers.c | 12 +-
em-format/e-mail-formatter-message-rfc822.c | 2 +-
em-format/e-mail-formatter-quote-headers.c | 22 +-
em-format/e-mail-formatter-quote-message-rfc822.c | 2 +-
em-format/e-mail-formatter-quote-text-plain.c | 6 +-
em-format/e-mail-formatter-secure-button.c | 20 +-
em-format/e-mail-formatter-text-enriched.c | 2 +-
em-format/e-mail-formatter-text-html.c | 2 +-
em-format/e-mail-formatter-text-plain.c | 6 +-
em-format/e-mail-formatter-utils.c | 14 +-
em-format/e-mail-formatter.c | 10 +-
em-format/e-mail-inline-filter.c | 4 +-
em-format/e-mail-parser-application-mbox.c | 2 +-
em-format/e-mail-parser-application-smime.c | 2 +-
em-format/e-mail-parser-inlinepgp-encrypted.c | 4 +-
em-format/e-mail-parser-inlinepgp-signed.c | 4 +-
em-format/e-mail-parser-message-deliverystatus.c | 2 +-
em-format/e-mail-parser-message-external.c | 16 +-
em-format/e-mail-parser-message-rfc822.c | 2 +-
em-format/e-mail-parser-multipart-alternative.c | 4 +-
em-format/e-mail-parser-multipart-appledouble.c | 4 +-
em-format/e-mail-parser-multipart-digest.c | 4 +-
em-format/e-mail-parser-multipart-encrypted.c | 10 +-
em-format/e-mail-parser-multipart-mixed.c | 4 +-
em-format/e-mail-parser-multipart-related.c | 6 +-
em-format/e-mail-parser-multipart-signed.c | 12 +-
em-format/e-mail-parser.c | 8 +-
em-format/e-mail-part-utils.c | 10 +-
filter/e-filter-code.c | 4 +-
filter/e-filter-color.c | 24 +-
filter/e-filter-datespec.c | 46 +-
filter/e-filter-element.c | 2 +-
filter/e-filter-file.c | 4 +-
filter/e-filter-input.c | 2 +-
filter/e-filter-int.c | 4 +-
filter/e-filter-option.c | 42 +-
filter/e-filter-option.h | 6 +-
filter/e-filter-part.c | 22 +-
filter/e-filter-rule.c | 26 +-
filter/e-rule-context.c | 10 +-
libemail-engine/e-mail-session-utils.c | 4 +-
libemail-engine/e-mail-session.c | 4 +-
libemail-engine/e-mail-utils.c | 30 +-
libemail-engine/mail-folder-cache.c | 29 +-
libemail-engine/mail-ops.c | 36 +-
libemail-engine/mail-tools.c | 8 +-
libemail-engine/mail-vfolder.c | 50 ++-
libemail-utils/em-filter-folder-element.c | 6 +-
libemail-utils/em-vfolder-context.c | 2 +-
libemail-utils/em-vfolder-rule.c | 46 +-
libemail-utils/mail-mt.c | 13 +-
libevolution-utils/e-alert.c | 26 +-
libevolution-utils/e-xml-utils.c | 15 +-
libevolution-utils/evolution-util.c | 5 +-
mail/e-http-request.c | 43 +-
mail/e-mail-backend.c | 2 +-
mail/e-mail-browser.c | 7 +-
mail/e-mail-config-confirm-page.c | 6 +-
mail/e-mail-config-welcome-page.c | 2 +-
mail/e-mail-display-popup-extension.c | 3 +-
mail/e-mail-display.c | 144 ++++---
mail/e-mail-label-manager.c | 2 +-
mail/e-mail-migrate.c | 2 +-
mail/e-mail-notebook-view.c | 13 +-
mail/e-mail-paned-view.c | 10 +-
mail/e-mail-printer.c | 96 +++--
mail/e-mail-reader-utils.c | 29 +-
mail/e-mail-reader.c | 23 +-
mail/e-mail-request.c | 14 +-
mail/e-mail-ui-session.c | 3 -
mail/em-composer-utils.c | 5 +-
mail/em-filter-editor-folder-element.c | 4 +-
mail/em-filter-editor.c | 3 +-
mail/em-filter-rule.c | 40 +-
mail/em-filter-source-element.c | 16 +-
mail/em-folder-tree.c | 5 +-
mail/em-folder-utils.c | 14 +-
mail/em-utils.c | 45 +-
mail/em-vfolder-editor-context.c | 2 +-
mail/em-vfolder-editor-rule.c | 44 ++-
mail/importers/elm-importer.c | 22 +-
mail/importers/evolution-mbox-importer.c | 11 +-
mail/importers/mail-importer.c | 10 +-
mail/importers/pine-importer.c | 34 +-
mail/mail-autofilter.c | 22 +-
mail/mail-send-recv.c | 22 +-
mail/mail-vfolder-ui.c | 6 +-
mail/message-list.c | 260 ++++++------
modules/addressbook/e-book-shell-view-private.c | 5 +-
.../audio-inline/e-mail-formatter-audio-inline.c | 16 +-
modules/audio-inline/e-mail-parser-audio-inline.c | 4 +-
.../backup-restore/e-mail-config-restore-page.c | 2 +-
modules/backup-restore/evolution-backup-tool.c | 2 +-
modules/bogofilter/evolution-bogofilter.c | 2 +-
.../evolution-cal-config-weather.c | 2 +-
modules/calendar/e-cal-shell-view-actions.c | 4 +-
modules/calendar/e-cal-shell-view-private.c | 110 ++++--
modules/calendar/e-cal-shell-view.c | 3 +-
modules/calendar/e-calendar-preferences.c | 5 +-
modules/calendar/e-memo-shell-view-private.c | 5 +-
modules/calendar/e-task-shell-view-private.c | 5 +-
modules/itip-formatter/e-mail-formatter-itip.c | 10 +-
modules/itip-formatter/e-mail-parser-itip.c | 6 +-
modules/itip-formatter/itip-view.c | 197 +++++----
modules/mail/e-mail-config-web-view.c | 3 +-
modules/mail/e-mail-shell-backend.c | 25 +-
modules/mail/e-mail-shell-view-actions.c | 6 +-
modules/mail/e-mail-shell-view-private.c | 26 +-
modules/mail/e-mail-shell-view.c | 9 +-
modules/mail/em-composer-prefs.c | 2 +-
modules/mail/em-mailer-prefs.c | 114 +++--
modules/mail/em-network-prefs.c | 18 +-
modules/online-accounts/camel-sasl-xoauth.c | 4 +-
modules/plugin-lib/e-plugin-lib.c | 7 +-
modules/plugin-manager/evolution-plugin-manager.c | 2 +-
.../e-mail-display-popup-prefer-plain.c | 34 +-
modules/prefer-plain/e-mail-parser-prefer-plain.c | 8 +-
modules/prefer-plain/plugin/config-ui.c | 2 +-
modules/spamassassin/evolution-spamassassin.c | 2 +-
modules/startup-wizard/e-startup-assistant.c | 4 +-
.../e-mail-display-popup-text-highlight.c | 34 +-
.../e-mail-formatter-text-highlight.c | 13 +-
.../text-highlight/e-mail-parser-text-highlight.c | 8 +-
modules/text-highlight/languages.c | 243 ++++++------
modules/text-highlight/languages.h | 2 +-
.../e-mail-parser-tnef-attachment.c | 450 ++++++++++----------
.../vcard-inline/e-mail-formatter-vcard-inline.c | 6 +-
modules/vcard-inline/e-mail-parser-vcard-inline.c | 2 +-
plugins/attachment-reminder/attachment-reminder.c | 2 +-
plugins/bbdb/bbdb.c | 2 +-
plugins/bbdb/gaimbuddies.c | 26 +-
plugins/dbx-import/dbx-importer.c | 32 +-
plugins/email-custom-header/email-custom-header.c | 4 +-
plugins/external-editor/external-editor.c | 12 +-
plugins/pst-import/pst-importer.c | 10 +-
plugins/publish-calendar/publish-calendar.c | 2 +-
plugins/publish-calendar/publish-location.c | 22 +-
plugins/save-calendar/csv-format.c | 12 +-
plugins/save-calendar/rdf-format.c | 12 +-
plugins/templates/templates.c | 6 +-
shell/e-shell-meego.c | 14 +-
shell/e-shell-settings.c | 14 +-
shell/e-shell-view.c | 6 +-
shell/e-shell-window-actions.c | 2 +-
shell/e-shell-window.c | 16 +-
shell/es-event.c | 2 +-
shell/main.c | 44 +-
smclient/eggsmclient-xsmp.c | 2 +-
smime/gui/ca-trust-dialog.c | 6 +-
smime/gui/cert-trust-dialog.c | 8 +-
smime/gui/certificate-manager.c | 6 +-
smime/gui/certificate-viewer.c | 4 +-
smime/gui/e-cert-selector.c | 14 +-
smime/lib/e-cert-db.c | 14 +-
smime/lib/e-cert.c | 20 +-
widgets/e-timezone-dialog/e-timezone-dialog.c | 4 +-
widgets/menus/gal-define-views-dialog.c | 2 +-
widgets/menus/gal-define-views-model.c | 2 +-
widgets/menus/gal-view-collection.c | 56 ++--
widgets/menus/gal-view-instance.c | 6 +-
widgets/menus/gal-view-new-dialog.c | 10 +-
widgets/misc/e-calendar-item.c | 6 +-
widgets/misc/e-canvas.c | 4 +-
widgets/misc/e-map.c | 4 +-
widgets/misc/e-preferences-window.c | 6 +-
widgets/misc/e-send-options.c | 2 +-
widgets/misc/e-spell-entry.c | 2 +-
widgets/misc/e-web-view.c | 2 +-
widgets/misc/ea-calendar-cell.c | 2 +-
widgets/misc/ea-calendar-item.c | 6 +-
widgets/misc/test-calendar.c | 4 +-
widgets/table/e-cell-combo.c | 8 +-
widgets/table/e-cell-hbox.c | 2 +-
widgets/table/e-cell-size.c | 2 +-
widgets/table/e-cell-text.c | 2 +-
widgets/table/e-popup-menu.c | 2 +-
widgets/table/e-table-column-specification.c | 34 +-
widgets/table/e-table-config.c | 10 +-
widgets/table/e-table-field-chooser-dialog.c | 2 +-
widgets/table/e-table-field-chooser-item.c | 4 +-
widgets/table/e-table-group-container.c | 14 +-
widgets/table/e-table-group-leaf.c | 2 +-
widgets/table/e-table-header-item.c | 16 +-
widgets/table/e-table-item.c | 70 ++--
widgets/table/e-table-model.c | 4 +-
widgets/table/e-table-one.c | 2 +-
widgets/table/e-table-sort-info.c | 12 +-
widgets/table/e-table-sorted.c | 4 +-
widgets/table/e-table-sorter.c | 2 +-
widgets/table/e-table-specification.c | 16 +-
widgets/table/e-table-state.c | 6 +-
widgets/table/e-table-subset.c | 14 +-
widgets/table/e-table-utils.c | 4 +-
widgets/table/e-table.c | 4 +-
widgets/table/e-tree-model.c | 4 +-
widgets/table/e-tree-sorted.c | 30 +-
widgets/table/e-tree-table-adapter.c | 12 +-
widgets/table/e-tree.c | 4 +-
widgets/table/gal-a11y-e-cell-tree.c | 2 +-
widgets/table/gal-a11y-e-table-item.c | 8 +-
widgets/text/e-reflow-model.c | 6 +-
widgets/text/e-reflow.c | 6 +-
widgets/text/gal-a11y-e-text.c | 2 +-
263 files changed, 2499 insertions(+), 2247 deletions(-)
---
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index e7d1390..8dc2621 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -233,11 +233,11 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
e_contact_editor_fullname->builder = builder;
- widget = e_builder_get_widget(builder, "dialog-checkfullname");
+ widget = e_builder_get_widget (builder, "dialog-checkfullname");
title = gtk_window_get_title (GTK_WINDOW (widget));
gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname), title);
- widget = e_builder_get_widget(builder, "table-checkfullname");
+ widget = e_builder_get_widget (builder, "table-checkfullname");
parent = gtk_widget_get_parent (widget);
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (parent), widget);
@@ -276,7 +276,7 @@ fill_in_field (EContactEditorFullname *editor,
if (string)
gtk_entry_set_text (entry, string);
else
- gtk_entry_set_text(entry, "");
+ gtk_entry_set_text (entry, "");
}
}
@@ -285,11 +285,11 @@ fill_in_info (EContactEditorFullname *editor)
{
EContactName *name = editor->name;
if (name) {
- fill_in_field(editor, "comboentry-title", name->prefixes);
- fill_in_field(editor, "entry-first", name->given);
- fill_in_field(editor, "entry-middle", name->additional);
- fill_in_field(editor, "entry-last", name->family);
- fill_in_field(editor, "comboentry-suffix", name->suffixes);
+ fill_in_field (editor, "comboentry-title", name->prefixes);
+ fill_in_field (editor, "entry-first", name->given);
+ fill_in_field (editor, "entry-middle", name->additional);
+ fill_in_field (editor, "entry-last", name->family);
+ fill_in_field (editor, "comboentry-suffix", name->suffixes);
}
}
@@ -320,9 +320,9 @@ extract_info (EContactEditorFullname *editor)
editor->name = name;
}
- name->prefixes = extract_field(editor, "comboentry-title" );
- name->given = extract_field(editor, "entry-first" );
- name->additional = extract_field(editor, "entry-middle");
- name->family = extract_field(editor, "entry-last" );
- name->suffixes = extract_field(editor, "comboentry-suffix");
+ name->prefixes = extract_field (editor, "comboentry-title" );
+ name->given = extract_field (editor, "entry-first" );
+ name->additional = extract_field (editor, "entry-middle");
+ name->family = extract_field (editor, "entry-last" );
+ name->suffixes = extract_field (editor, "comboentry-suffix");
}
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 44fd081..ca4b1cb 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -445,7 +445,7 @@ name_to_style (const EContactName *name,
*(stringptr++) = name->given;
}
*stringptr = NULL;
- string = g_strjoinv(", ", strings);
+ string = g_strjoinv (", ", strings);
break;
case 1:
stringptr = strings;
@@ -456,7 +456,7 @@ name_to_style (const EContactName *name,
*(stringptr++) = name->family;
}
*stringptr = NULL;
- string = g_strjoinv(" ", strings);
+ string = g_strjoinv (" ", strings);
break;
case 2:
midstrptr = midstring;
@@ -474,7 +474,7 @@ name_to_style (const EContactName *name,
*(stringptr++) = name->additional;
}
*stringptr = NULL;
- string = g_strjoinv(" ", strings);
+ string = g_strjoinv (" ", strings);
break;
case 3:
string = g_strdup (company);
@@ -489,17 +489,17 @@ name_to_style (const EContactName *name,
*(stringptr++) = name->given;
}
*stringptr = NULL;
- substring = g_strjoinv(", ", strings);
+ substring = g_strjoinv (", ", strings);
if (!(company && *company))
company = "";
if (style == 4)
- string = g_strdup_printf("%s (%s)", substring, company);
+ string = g_strdup_printf ("%s (%s)", substring, company);
else
- string = g_strdup_printf("%s (%s)", company, substring);
+ string = g_strdup_printf ("%s (%s)", company, substring);
g_free (substring);
break;
default:
- string = g_strdup("");
+ string = g_strdup ("");
}
return string;
}
@@ -509,7 +509,7 @@ file_as_get_style (EContactEditor *editor)
{
GtkEntry *file_as = GTK_ENTRY (
gtk_bin_get_child (GTK_BIN (
- e_builder_get_widget(editor->builder, "combo-file-as"))));
+ e_builder_get_widget (editor->builder, "combo-file-as"))));
GtkEntry *company_w = GTK_ENTRY (
e_builder_get_widget (editor->builder, "entry-company"));
gchar *filestring;
@@ -2027,7 +2027,7 @@ init_address_textview (EContactEditor *editor,
GtkTextBuffer *text_buffer;
textview_name = g_strdup_printf (
- "textview-%s-address", address_name [record]);
+ "textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, textview_name);
g_free (textview_name);
@@ -2047,7 +2047,7 @@ init_address_field (EContactEditor *editor,
GtkWidget *entry;
entry_name = g_strdup_printf (
- "entry-%s-%s", address_name [record], widget_field_name);
+ "entry-%s-%s", address_name[record], widget_field_name);
entry = e_builder_get_widget (editor->builder, entry_name);
g_free (entry_name);
@@ -2095,7 +2095,7 @@ fill_in_address_textview (EContactEditor *editor,
GtkTextBuffer *text_buffer;
GtkTextIter iter_end, iter_start;
- textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
+ textview_name = g_strdup_printf ("textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, textview_name);
g_free (textview_name);
@@ -2123,7 +2123,7 @@ fill_in_address_label_textview (EContactEditor *editor,
GtkTextBuffer *text_buffer;
textview_name = g_strdup_printf (
- "textview-%s-address", address_name [record]);
+ "textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, textview_name);
g_free (textview_name);
@@ -2141,7 +2141,7 @@ fill_in_address_field (EContactEditor *editor,
GtkWidget *entry;
entry_name = g_strdup_printf (
- "entry-%s-%s", address_name [record], widget_field_name);
+ "entry-%s-%s", address_name[record], widget_field_name);
entry = e_builder_get_widget (editor->builder, entry_name);
g_free (entry_name);
@@ -2200,7 +2200,7 @@ extract_address_textview (EContactEditor *editor,
GtkTextBuffer *text_buffer;
GtkTextIter iter_1, iter_2;
- textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
+ textview_name = g_strdup_printf ("textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, textview_name);
g_free (textview_name);
@@ -2242,7 +2242,7 @@ extract_address_field (EContactEditor *editor,
GtkWidget *entry;
entry_name = g_strdup_printf (
- "entry-%s-%s", address_name [record], widget_field_name);
+ "entry-%s-%s", address_name[record], widget_field_name);
entry = e_builder_get_widget (editor->builder, entry_name);
g_free (entry_name);
@@ -2366,11 +2366,11 @@ sensitize_address_textview (EContactEditor *editor,
GtkWidget *textview;
GtkWidget *label;
- widget_name = g_strdup_printf ("textview-%s-address", address_name [record]);
+ widget_name = g_strdup_printf ("textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, widget_name);
g_free (widget_name);
- widget_name = g_strdup_printf ("label-%s-address", address_name [record]);
+ widget_name = g_strdup_printf ("label-%s-address", address_name[record]);
label = e_builder_get_widget (editor->builder, widget_name);
g_free (widget_name);
@@ -2389,12 +2389,12 @@ sensitize_address_field (EContactEditor *editor,
GtkWidget *label;
widget_name = g_strdup_printf (
- "entry-%s-%s", address_name [record], widget_field_name);
+ "entry-%s-%s", address_name[record], widget_field_name);
entry = e_builder_get_widget (editor->builder, widget_name);
g_free (widget_name);
widget_name = g_strdup_printf (
- "label-%s-%s", address_name [record], widget_field_name);
+ "label-%s-%s", address_name[record], widget_field_name);
label = e_builder_get_widget (editor->builder, widget_name);
g_free (widget_name);
@@ -3266,7 +3266,7 @@ categories_clicked (GtkWidget *button,
{
gchar *categories = NULL;
GtkDialog *dialog;
- GtkWidget *entry = e_builder_get_widget(editor->builder, "entry-categories");
+ GtkWidget *entry = e_builder_get_widget (editor->builder, "entry-categories");
if (entry && GTK_IS_ENTRY (entry))
categories = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -3898,24 +3898,24 @@ setup_tab_order (GtkBuilder *builder)
GtkWidget *container;
GList *list = NULL;
/*
- container = e_builder_get_widget(builder, "table-contact-editor-general");
+ container = e_builder_get_widget (builder, "table-contact-editor-general");
*
if (container) {
- list = add_to_tab_order(list, builder, "entry-fullname");
- list = add_to_tab_order(list, builder, "entry-jobtitle");
- list = add_to_tab_order(list, builder, "entry-company");
- list = add_to_tab_order(list, builder, "combo-file-as");
- list = add_to_tab_order(list, builder, "entry-phone-1");
- list = add_to_tab_order(list, builder, "entry-phone-2");
- list = add_to_tab_order(list, builder, "entry-phone-3");
- list = add_to_tab_order(list, builder, "entry-phone-4");
+ list = add_to_tab_order (list, builder, "entry-fullname");
+ list = add_to_tab_order (list, builder, "entry-jobtitle");
+ list = add_to_tab_order (list, builder, "entry-company");
+ list = add_to_tab_order (list, builder, "combo-file-as");
+ list = add_to_tab_order (list, builder, "entry-phone-1");
+ list = add_to_tab_order (list, builder, "entry-phone-2");
+ list = add_to_tab_order (list, builder, "entry-phone-3");
+ list = add_to_tab_order (list, builder, "entry-phone-4");
*
- list = add_to_tab_order(list, builder, "entry-email1");
- list = add_to_tab_order(list, builder, "alignment-htmlmail");
- list = add_to_tab_order(list, builder, "entry-web");
- list = add_to_tab_order(list, builder, "entry-homepage");
- list = add_to_tab_order(list, builder, "button-fulladdr");
- list = add_to_tab_order(list, builder, "text-address");
+ list = add_to_tab_order (list, builder, "entry-email1");
+ list = add_to_tab_order (list, builder, "alignment-htmlmail");
+ list = add_to_tab_order (list, builder, "entry-web");
+ list = add_to_tab_order (list, builder, "entry-homepage");
+ list = add_to_tab_order (list, builder, "button-fulladdr");
+ list = add_to_tab_order (list, builder, "text-address");
list = g_list_reverse (list);
e_container_change_tab_order (GTK_CONTAINER (container), list);
g_list_free (list);
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 5ea618b..fd4c8ed 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -558,7 +558,7 @@ e_contact_quick_add (ESourceRegistry *registry,
g_strstrip (name);
len = strlen (name);
if ((name[0] == '\'' && name[len - 1] == '\'') ||
- (name[0] == '"' && name[len-1] == '"')) {
+ (name[0] == '"' && name[len - 1] == '"')) {
name[0] = ' ';
name[len - 1] = ' ';
}
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 9a55ffb..7c7f096 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -693,7 +693,7 @@ use_common_book_client (EBookClient *book_client,
contact_file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
if (contact_file_as) {
- query_parts [p++] = g_strdup_printf ("(contains \"file_as\" \"%s\")", contact_file_as);
+ query_parts[p++] = g_strdup_printf ("(contains \"file_as\" \"%s\")", contact_file_as);
g_free (contact_file_as);
}
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index cbcb376..cb2f605 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -273,7 +273,7 @@ dropdown_changed (GtkWidget *dropdown,
gchar *str;
str = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (dropdown));
- if (g_ascii_strcasecmp(str, ""))
+ if (g_ascii_strcasecmp (str, ""))
e_contact_set (data->match, data->field, str);
else
e_contact_set (data->match, data->field, NULL);
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index c6775d4..51886cf 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -268,7 +268,7 @@ static gpointer
addressbook_initialize_value (ETableModel *etc,
gint col)
{
- return g_strdup("");
+ return g_strdup ("");
}
static gboolean
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 7eefdf8..584ed9f 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -193,13 +193,13 @@ e_minicard_label_set_property (GObject *object,
e_canvas_item_grab_focus (e_minicard_label->field, FALSE);
break;
case PROP_FIELD:
- gnome_canvas_item_set( e_minicard_label->field, "text", g_value_get_string (value), NULL );
+ gnome_canvas_item_set ( e_minicard_label->field, "text", g_value_get_string (value), NULL );
break;
case PROP_FIELDNAME:
- gnome_canvas_item_set( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL );
+ gnome_canvas_item_set ( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL );
break;
case PROP_TEXT_MODEL:
- gnome_canvas_item_set( e_minicard_label->field, "model", g_value_get_object (value), NULL);
+ gnome_canvas_item_set ( e_minicard_label->field, "model", g_value_get_object (value), NULL);
break;
case PROP_MAX_FIELD_NAME_WIDTH:
e_minicard_label->max_field_name_length = g_value_get_double (value);
@@ -345,7 +345,7 @@ e_minicard_label_event (GnomeCanvasItem *item,
case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY: {
gboolean return_val;
- g_signal_emit_by_name(e_minicard_label->field, "event", event, &return_val);
+ g_signal_emit_by_name (e_minicard_label->field, "event", event, &return_val);
return return_val;
}
default:
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 690fe77..01899e8 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -397,7 +397,7 @@ e_minicard_view_event (GnomeCanvasItem *item,
if (((GdkEventButton *) event)->button == 1) {
gboolean editable;
- g_object_get(view->adapter, "editable", &editable, NULL);
+ g_object_get (view->adapter, "editable", &editable, NULL);
if (editable)
e_minicard_view_create_contact (view);
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 6528518..d0af511 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -330,7 +330,7 @@ e_minicard_set_property (GObject *object,
}
break;
case PROP_HAS_CURSOR:
- d(g_print("%s: PROP_HAS_CURSOR\n", G_STRFUNC));
+ d (g_print ("%s: PROP_HAS_CURSOR\n", G_STRFUNC));
if (e_minicard->has_cursor != g_value_get_boolean (value))
set_has_cursor (e_minicard, g_value_get_boolean (value));
break;
@@ -490,7 +490,7 @@ e_minicard_realize (GnomeCanvasItem *item)
e_minicard->header_text =
gnome_canvas_item_new ( group,
e_text_get_type (),
- "width", (double) MAX( e_minicard->width - 12, 0 ),
+ "width", (double) MAX ( e_minicard->width - 12, 0 ),
"clip", TRUE,
"use_ellipsis", TRUE,
"fill_color_gdk", &style->fg[GTK_STATE_NORMAL],
@@ -531,7 +531,7 @@ e_minicard_event (GnomeCanvasItem *item,
case GDK_FOCUS_CHANGE:
{
GdkEventFocus *focus_event = (GdkEventFocus *) event;
- d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out"));
+ d (g_print ("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out"));
if (focus_event->in) {
/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it. */
e_minicard->has_focus = TRUE;
@@ -721,7 +721,7 @@ add_field (EMinicard *e_minicard,
group = GNOME_CANVAS_GROUP ( e_minicard );
- name = g_strdup_printf("%s:", e_contact_pretty_name (field));
+ name = g_strdup_printf ("%s:", e_contact_pretty_name (field));
string = e_contact_get (e_minicard->contact, field);
new_item = e_minicard_label_new (group);
@@ -871,7 +871,7 @@ get_left_width (EMinicard *e_minicard,
if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
continue;
- name = g_strdup_printf("%s:", e_contact_pretty_name (field));
+ name = g_strdup_printf ("%s:", e_contact_pretty_name (field));
pango_layout_set_text (layout, name, -1);
pango_layout_get_pixel_size (layout, &this_width, NULL);
if (width < this_width)
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 6501bcc..d6c4238 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -517,7 +517,7 @@ eab_contact_display_class_init (EABContactDisplayClass *class)
EAB_CONTACT_DISPLAY_RENDER_NORMAL,
G_PARAM_READWRITE));
- g_object_class_install_property (
+ g_object_class_install_property (
object_class,
PROP_SHOW_MAPS,
g_param_spec_boolean (
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index 5b3021c..d04cc07 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -1171,18 +1171,18 @@ eab_contact_formatter_class_init (EABContactFormatterClass *class)
PROP_STYLE,
g_param_spec_object (
"style",
- NULL,
- NULL,
- GTK_TYPE_STYLE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ NULL,
+ NULL,
+ GTK_TYPE_STYLE,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (
object_class,
PROP_STATE,
g_param_spec_uint (
"state",
- NULL,
- NULL,
+ NULL,
+ NULL,
0,
G_MAXUINT,
0,
@@ -1201,7 +1201,7 @@ eab_contact_formatter_init (EABContactFormatter *formatter)
EABContactFormatter *
eab_contact_formatter_new (EABContactDisplayMode mode,
- gboolean render_maps)
+ gboolean render_maps)
{
return g_object_new (EAB_TYPE_CONTACT_FORMATTER,
"display-mode", mode,
@@ -1209,7 +1209,6 @@ eab_contact_formatter_new (EABContactDisplayMode mode,
NULL);
}
-
void
eab_contact_formatter_set_display_mode (EABContactFormatter *formatter,
EABContactDisplayMode mode)
@@ -1257,7 +1256,7 @@ eab_contact_formatter_get_render_maps (EABContactFormatter *formatter)
void
eab_contact_formatter_set_style (EABContactFormatter *formatter,
- GtkStyle *style)
+ GtkStyle *style)
{
g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
@@ -1284,7 +1283,7 @@ eab_contact_formatter_get_style (EABContactFormatter *formatter)
void
eab_contact_formatter_set_state (EABContactFormatter *formatter,
- GtkStateType state)
+ GtkStateType state)
{
g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
diff --git a/addressbook/gui/widgets/eab-contact-formatter.h b/addressbook/gui/widgets/eab-contact-formatter.h
index 4773a7b..31104b1 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.h
+++ b/addressbook/gui/widgets/eab-contact-formatter.h
@@ -58,14 +58,14 @@ struct _EABContactFormatterClass {
GType eab_contact_formatter_get_type ();
-EABContactFormatter*
+EABContactFormatter *
eab_contact_formatter_new (EABContactDisplayMode mode,
gboolean render_maps);
void eab_contact_formatter_set_style
(EABContactFormatter *formatter,
GtkStyle *context);
-GtkStyle*
+GtkStyle *
eab_contact_formatter_get_style
(EABContactFormatter *formatter);
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 9d693e1..7594ab1 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -103,27 +103,27 @@ static import_fields csv_fields_outlook[] = {
{"Company", E_CONTACT_ORG},
{"Department", E_CONTACT_ORG_UNIT},
{"Job Title", E_CONTACT_TITLE},
- {"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
- {"Business Street 2", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
- {"Business Street 3", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET},
- {"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
- {"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
- {"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
- {"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
- {"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
- {"Home Street 2", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
- {"Home Street 3", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
- {"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
- {"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
- {"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
- {"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
- {"Other Street", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
- {"Other Street 2", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
- {"Other Street 3", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
- {"Other City", NOMAP, FLAG_OTHER_ADDRESS|FLAG_CITY},
- {"Other State", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STATE},
- {"Other Postal Code", NOMAP, FLAG_OTHER_ADDRESS|FLAG_POSTAL_CODE},
- {"Other Country", NOMAP, FLAG_OTHER_ADDRESS|FLAG_COUNTRY},
+ {"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
+ {"Business Street 2", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
+ {"Business Street 3", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET},
+ {"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
+ {"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
+ {"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
+ {"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
+ {"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+ {"Home Street 2", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+ {"Home Street 3", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+ {"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
+ {"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
+ {"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
+ {"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
+ {"Other Street", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
+ {"Other Street 2", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
+ {"Other Street 3", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
+ {"Other City", NOMAP, FLAG_OTHER_ADDRESS | FLAG_CITY},
+ {"Other State", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STATE},
+ {"Other Postal Code", NOMAP, FLAG_OTHER_ADDRESS | FLAG_POSTAL_CODE},
+ {"Other Country", NOMAP, FLAG_OTHER_ADDRESS | FLAG_COUNTRY},
{"Assistant's Phone", E_CONTACT_PHONE_ASSISTANT},
{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
{"Business Phone", E_CONTACT_PHONE_BUSINESS},
@@ -148,7 +148,7 @@ static import_fields csv_fields_outlook[] = {
{"Assistant's Name", E_CONTACT_ASSISTANT},
{"Billing Information", NOMAP},
{"Birthday", NOMAP, FLAG_DATE_BDAY},
- {"Business Address PO Box", NOMAP, FLAG_WORK_ADDRESS|FLAG_POBOX},
+ {"Business Address PO Box", NOMAP, FLAG_WORK_ADDRESS | FLAG_POBOX},
{"Categories", E_CONTACT_CATEGORIES},
{"Children", NOMAP},
{"Directory Server", NOMAP},
@@ -164,7 +164,7 @@ static import_fields csv_fields_outlook[] = {
{"Gender", NOMAP},
{"Government ID Number", NOMAP},
{"Hobby", NOMAP},
- {"Home Address PO Box", NOMAP, FLAG_HOME_ADDRESS|FLAG_POBOX},
+ {"Home Address PO Box", NOMAP, FLAG_HOME_ADDRESS | FLAG_POBOX},
{"Initials", NOMAP},
{"Internet FREE/BUSY", E_CONTACT_FREEBUSY_URL},
{"Keywords", NOMAP},
@@ -175,7 +175,7 @@ static import_fields csv_fields_outlook[] = {
{"Notes", NOMAP},
{"Office Location", NOMAP},
{"Organizational ID Number", NOMAP},
- {"Other Address PO Box", NOMAP, FLAG_OTHER_ADDRESS|FLAG_POBOX},
+ {"Other Address PO Box", NOMAP, FLAG_OTHER_ADDRESS | FLAG_POBOX},
{"Priority", NOMAP},
{"Private", NOMAP},
{"Profession", NOMAP},
@@ -201,18 +201,18 @@ static import_fields csv_fields_mozilla[] = {
{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
{"Pager", E_CONTACT_PHONE_PAGER},
{"Mobile Phone", E_CONTACT_PHONE_MOBILE},
- {"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
- {"Home Street 2", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
- {"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
- {"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
- {"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
- {"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
- {"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
- {"Business Street 2", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
- {"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
- {"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
- {"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
- {"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
+ {"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+ {"Home Street 2", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+ {"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
+ {"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
+ {"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
+ {"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
+ {"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
+ {"Business Street 2", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
+ {"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
+ {"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
+ {"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
+ {"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
{"Job Title", E_CONTACT_TITLE},
{"Department", E_CONTACT_ORG_UNIT},
{"Company", E_CONTACT_ORG},
@@ -244,18 +244,18 @@ static import_fields csv_fields_evolution[] = {
{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
{"Pager", E_CONTACT_PHONE_PAGER},
{"Mobile Phone", E_CONTACT_PHONE_MOBILE},
- {"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
+ {"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
{"Home Street 2", NOMAP, FLAG_INVALID},
- {"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
- {"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
- {"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
- {"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
- {"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
+ {"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
+ {"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
+ {"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
+ {"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
+ {"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
{"Business Street 2", NOMAP, FLAG_INVALID },
- {"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
- {"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
- {"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
- {"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
+ {"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
+ {"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
+ {"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
+ {"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
{"Job Title", E_CONTACT_TITLE},
{"Office", E_CONTACT_OFFICE},
{"Company", E_CONTACT_ORG},
@@ -431,9 +431,9 @@ parseLine (CSVImporter *gci,
EContactAddress *home_address = NULL, *work_address = NULL, *other_address = NULL;
EContactDate *bday = NULL;
GString *home_street, *work_street, *other_street;
- home_street = g_string_new("");
- work_street = g_string_new("");
- other_street = g_string_new("");
+ home_street = g_string_new ("");
+ work_street = g_string_new ("");
+ other_street = g_string_new ("");
home_address = g_new0 (EContactAddress, 1);
work_address = g_new0 (EContactAddress, 1);
other_address = g_new0 (EContactAddress, 1);
@@ -506,7 +506,7 @@ parseLine (CSVImporter *gci,
case FLAG_HOME_ADDRESS | FLAG_STREET:
if (strlen (home_street->str) != 0) {
- home_street = g_string_append(home_street, ",\n");
+ home_street = g_string_append (home_street, ",\n");
}
home_street = g_string_append (home_street, value->str);
break;
@@ -528,7 +528,7 @@ parseLine (CSVImporter *gci,
case FLAG_WORK_ADDRESS | FLAG_STREET:
if (strlen (work_street->str) != 0) {
- work_street = g_string_append(work_street, ",\n");
+ work_street = g_string_append (work_street, ",\n");
}
work_street = g_string_append (work_street, value->str);
break;
@@ -550,7 +550,7 @@ parseLine (CSVImporter *gci,
case FLAG_OTHER_ADDRESS | FLAG_STREET:
if (strlen (other_street->str) != 0) {
- other_street = g_string_append(other_street, ",\n");
+ other_street = g_string_append (other_street, ",\n");
}
other_street = g_string_append (other_street, value->str);
break;
@@ -646,7 +646,7 @@ getNextCSVEntry (CSVImporter *gci,
gchar *buf;
gchar c;
- line = g_string_new("");
+ line = g_string_new ("");
while (1) {
c = fgetc (f);
if (c == EOF)
@@ -671,7 +671,7 @@ getNextCSVEntry (CSVImporter *gci,
if (gci->count == 0 && importer != MOZILLA_IMPORTER) {
gci->fields_map = map_fields (line->str, importer);
g_string_free (line, TRUE);
- line = g_string_new("");
+ line = g_string_new ("");
while (1) {
c = fgetc (f);
if (c == EOF)
@@ -695,7 +695,7 @@ getNextCSVEntry (CSVImporter *gci,
gci->count++;
}
- str = g_string_new("");
+ str = g_string_new ("");
str = g_string_append (str, line->str);
g_string_free (line, TRUE);
@@ -784,7 +784,7 @@ csv_getwidget (EImport *ei,
E_SOURCE_SELECTOR (selector), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
- primary = g_datalist_get_data(&target->data, "csv-source");
+ primary = g_datalist_get_data (&target->data, "csv-source");
if (primary == NULL) {
GList *list;
@@ -830,7 +830,7 @@ csv_supported (EImport *ei,
if (s->uri_src == NULL)
return TRUE;
- if (strncmp(s->uri_src, "file:///", 8) != 0)
+ if (strncmp (s->uri_src, "file:///", 8) != 0)
return FALSE;
ext = strrchr (s->uri_src, '.');
@@ -912,13 +912,13 @@ csv_import (EImport *ei,
file = g_fopen (filename, "r");
g_free (filename);
if (file == NULL) {
- g_message("Can't open .csv file");
+ g_message ("Can't open .csv file");
e_import_complete (ei, target);
return;
}
gci = g_malloc0 (sizeof (*gci));
- g_datalist_set_data(&target->data, "csv-data", gci);
+ g_datalist_set_data (&target->data, "csv-data", gci);
gci->import = g_object_ref (ei);
gci->target = target;
gci->file = file;
@@ -967,7 +967,7 @@ csv_cancel (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- CSVImporter *gci = g_datalist_get_data(&target->data, "csv-data");
+ CSVImporter *gci = g_datalist_get_data (&target->data, "csv-data");
if (gci)
gci->state = 1;
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index bf1c157..3adf2af 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -130,7 +130,7 @@ ldif_fields[] = {
static GString *
getValue (gchar **src)
{
- GString *dest = g_string_new("");
+ GString *dest = g_string_new ("");
gchar *s = *src;
gboolean need_base64 = (*s == ':');
@@ -582,7 +582,7 @@ ldif_getwidget (EImport *ei,
E_SOURCE_SELECTOR (selector), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
- primary = g_datalist_get_data(&target->data, "ldif-source");
+ primary = g_datalist_get_data (&target->data, "ldif-source");
if (primary == NULL) {
GList *list;
@@ -628,7 +628,7 @@ ldif_supported (EImport *ei,
if (s->uri_src == NULL)
return TRUE;
- if (strncmp(s->uri_src, "file:///", 8) != 0)
+ if (strncmp (s->uri_src, "file:///", 8) != 0)
return FALSE;
ext = strrchr (s->uri_src, '.');
@@ -696,17 +696,17 @@ ldif_import (EImport *ei,
filename = g_filename_from_uri (s->uri_src, NULL, NULL);
if (filename != NULL) {
- file = g_fopen(filename, "r");
+ file = g_fopen (filename, "r");
g_free (filename);
}
if (file == NULL) {
- g_message(G_STRLOC ":Can't open .ldif file");
+ g_message (G_STRLOC ":Can't open .ldif file");
e_import_complete (ei, target);
return;
}
gci = g_malloc0 (sizeof (*gci));
- g_datalist_set_data(&target->data, "ldif-data", gci);
+ g_datalist_set_data (&target->data, "ldif-data", gci);
gci->import = g_object_ref (ei);
gci->target = target;
gci->file = file;
@@ -730,7 +730,7 @@ ldif_cancel (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- LDIFImporter *gci = g_datalist_get_data(&target->data, "ldif-data");
+ LDIFImporter *gci = g_datalist_get_data (&target->data, "ldif-data");
if (gci)
gci->state = 2;
@@ -755,7 +755,7 @@ ldif_get_preview (EImport *ei,
return NULL;
}
- file = g_fopen(filename, "r");
+ file = g_fopen (filename, "r");
g_free (filename);
if (file == NULL) {
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index b20bdd1..2e452c2 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -133,7 +133,7 @@ vcard_import_contact (VCardImporter *gci,
GList *v = e_vcard_attribute_get_values (a);
if (v && v->data) {
- if (!strncmp ((gchar *)v->data, "<?xml", 5)) {
+ if (!strncmp ((gchar *) v->data, "<?xml", 5)) {
EDestination *dest = e_destination_import ((gchar *) v->data);
e_destination_export_to_vcard_attribute (dest, a);
@@ -174,12 +174,12 @@ vcard_import_contact (VCardImporter *gci,
vs = e_vcard_attribute_param_get_values (p);
for (v = vs; v; v = v->next) {
is_work_home = is_work_home ||
- !g_ascii_strcasecmp ((gchar *)v->data, "WORK") ||
- !g_ascii_strcasecmp ((gchar *)v->data, "HOME");
+ !g_ascii_strcasecmp ((gchar *) v->data, "WORK") ||
+ !g_ascii_strcasecmp ((gchar *) v->data, "HOME");
- if (!g_ascii_strcasecmp ((gchar *)v->data, "WORK") ||
- !g_ascii_strcasecmp ((gchar *)v->data, "HOME") ||
- !g_ascii_strcasecmp ((gchar *)v->data, "OTHER"))
+ if (!g_ascii_strcasecmp ((gchar *) v->data, "WORK") ||
+ !g_ascii_strcasecmp ((gchar *) v->data, "HOME") ||
+ !g_ascii_strcasecmp ((gchar *) v->data, "OTHER"))
no_location = FALSE;
else
location_only = FALSE;
@@ -227,8 +227,8 @@ vcard_import_contact (VCardImporter *gci,
vs = e_vcard_attribute_param_get_values (p);
for (v = vs; v; v = v->next) {
- if (!g_ascii_strcasecmp ((gchar *)v->data, "WORK") ||
- !g_ascii_strcasecmp ((gchar *)v->data, "HOME"))
+ if (!g_ascii_strcasecmp ((gchar *) v->data, "WORK") ||
+ !g_ascii_strcasecmp ((gchar *) v->data, "HOME"))
no_location = FALSE;
}
}
@@ -421,7 +421,7 @@ vcard_getwidget (EImport *ei,
E_SOURCE_SELECTOR (selector), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
- primary = g_datalist_get_data(&target->data, "vcard-source");
+ primary = g_datalist_get_data (&target->data, "vcard-source");
if (primary == NULL) {
GList *list;
@@ -463,7 +463,7 @@ vcard_supported (EImport *ei,
if (s->uri_src == NULL)
return TRUE;
- if (strncmp(s->uri_src, "file:///", 8) != 0)
+ if (strncmp (s->uri_src, "file:///", 8) != 0)
return FALSE;
filename = g_filename_from_uri (s->uri_src, NULL, NULL);
@@ -549,7 +549,7 @@ vcard_import (EImport *ei,
filename = g_filename_from_uri (s->uri_src, NULL, NULL);
if (filename == NULL) {
- g_message(G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+ g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
e_import_complete (ei, target);
return;
}
@@ -571,7 +571,7 @@ vcard_import (EImport *ei,
g_free (filename);
gci = g_malloc0 (sizeof (*gci));
- g_datalist_set_data(&target->data, "vcard-data", gci);
+ g_datalist_set_data (&target->data, "vcard-data", gci);
gci->import = g_object_ref (ei);
gci->target = target;
gci->encoding = encoding;
@@ -589,7 +589,7 @@ vcard_cancel (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- VCardImporter *gci = g_datalist_get_data(&target->data, "vcard-data");
+ VCardImporter *gci = g_datalist_get_data (&target->data, "vcard-data");
if (gci)
gci->state = 1;
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 72ee688..c535be4 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -468,7 +468,7 @@ e_contact_build_style (EContactPrintStyle *style)
xmlDocPtr styledoc;
gchar *filename;
- style->title = g_strdup("");
+ style->title = g_strdup ("");
style->type = E_CONTACT_PRINT_TYPE_CARDS;
style->sections_start_new_page = TRUE;
style->num_columns = 2;
@@ -502,9 +502,9 @@ e_contact_build_style (EContactPrintStyle *style)
style->header_font = pango_font_description_copy (style->body_font);
- style->left_header = g_strdup("");
- style->center_header = g_strdup("");
- style->right_header = g_strdup("");
+ style->left_header = g_strdup ("");
+ style->center_header = g_strdup ("");
+ style->right_header = g_strdup ("");
style->footer_font = pango_font_description_copy (style->body_font);
@@ -522,69 +522,69 @@ e_contact_build_style (EContactPrintStyle *style)
xmlNodePtr node;
for (node = stylenode->children; node; node = node->next) {
gchar *data = (gchar *) xmlNodeGetContent ( node );
- if (!strcmp( (gchar *)node->name, "title" )) {
+ if (!strcmp ( (gchar *) node->name, "title" )) {
get_string (data, &(style->title));
- } else if (!strcmp( (gchar *)node->name, "type" )) {
+ } else if (!strcmp ( (gchar *) node->name, "type" )) {
if (g_ascii_strcasecmp (data, "cards") == 0)
style->type = E_CONTACT_PRINT_TYPE_CARDS;
else if (g_ascii_strcasecmp (data, "memo_style") == 0)
style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;
else if (g_ascii_strcasecmp (data, "phone_list") == 0)
style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST;
- } else if (!strcmp( (gchar *)node->name, "sections_start_new_page" )) {
+ } else if (!strcmp ( (gchar *) node->name, "sections_start_new_page" )) {
style->sections_start_new_page = get_bool (data);
- } else if (!strcmp( (gchar *)node->name, "num_columns" )) {
+ } else if (!strcmp ( (gchar *) node->name, "num_columns" )) {
style->num_columns = get_integer (data);
- } else if (!strcmp( (gchar *)node->name, "blank_forms" )) {
+ } else if (!strcmp ( (gchar *) node->name, "blank_forms" )) {
style->blank_forms = get_integer (data);
- } else if (!strcmp( (gchar *)node->name, "letter_headings" )) {
+ } else if (!strcmp ( (gchar *) node->name, "letter_headings" )) {
style->letter_headings = get_bool (data);
- } else if (!strcmp( (gchar *)node->name, "headings_font" )) {
+ } else if (!strcmp ( (gchar *) node->name, "headings_font" )) {
get_font ( data, &(style->headings_font) );
- } else if (!strcmp( (gchar *)node->name, "body_font" )) {
+ } else if (!strcmp ( (gchar *) node->name, "body_font" )) {
get_font ( data, &(style->body_font) );
- } else if (!strcmp( (gchar *)node->name, "print_using_grey" )) {
+ } else if (!strcmp ( (gchar *) node->name, "print_using_grey" )) {
style->print_using_grey = get_bool (data);
- } else if (!strcmp( (gchar *)node->name, "paper_width" )) {
+ } else if (!strcmp ( (gchar *) node->name, "paper_width" )) {
style->paper_width = get_float (data);
- } else if (!strcmp( (gchar *)node->name, "paper_height" )) {
+ } else if (!strcmp ( (gchar *) node->name, "paper_height" )) {
style->paper_height = get_float (data);
- } else if (!strcmp( (gchar *)node->name, "top_margin" )) {
+ } else if (!strcmp ( (gchar *) node->name, "top_margin" )) {
style->top_margin = get_float (data);
- } else if (!strcmp( (gchar *)node->name, "left_margin" )) {
+ } else if (!strcmp ( (gchar *) node->name, "left_margin" )) {
style->left_margin = get_float (data);
- } else if (!strcmp( (gchar *)node->name, "bottom_margin" )) {
+ } else if (!strcmp ( (gchar *) node->name, "bottom_margin" )) {
style->bottom_margin = get_float (data);
- } else if (!strcmp( (gchar *)node->name, "right_margin" )) {
+ } else if (!strcmp ( (gchar *) node->name, "right_margin" )) {
style->right_margin = get_float (data);
- } else if (!strcmp( (gchar *)node->name, "page_width" )) {
+ } else if (!strcmp ( (gchar *) node->name, "page_width" )) {
style->page_width = get_float (data);
- } else if (!strcmp( (gchar *)node->name, "page_height" )) {
+ } else if (!strcmp ( (gchar *) node->name, "page_height" )) {
style->page_height = get_float (data);
- } else if (!strcmp( (gchar *)node->name, "orientation" )) {
+ } else if (!strcmp ( (gchar *) node->name, "orientation" )) {
if (data) {
style->orientation_portrait =
(g_ascii_strcasecmp (data, "landscape") != 0);
} else {
style->orientation_portrait = TRUE;
}
- } else if (!strcmp( (gchar *)node->name, "header_font" )) {
+ } else if (!strcmp ( (gchar *) node->name, "header_font" )) {
get_font ( data, &(style->header_font) );
- } else if (!strcmp( (gchar *)node->name, "left_header" )) {
+ } else if (!strcmp ( (gchar *) node->name, "left_header" )) {
get_string (data, &(style->left_header));
- } else if (!strcmp( (gchar *)node->name, "center_header" )) {
+ } else if (!strcmp ( (gchar *) node->name, "center_header" )) {
get_string (data, &(style->center_header));
- } else if (!strcmp( (gchar *)node->name, "right_header" )) {
+ } else if (!strcmp ( (gchar *) node->name, "right_header" )) {
get_string (data, &(style->right_header));
- } else if (!strcmp( (gchar *)node->name, "footer_font" )) {
+ } else if (!strcmp ( (gchar *) node->name, "footer_font" )) {
get_font ( data, &(style->footer_font) );
- } else if (!strcmp( (gchar *)node->name, "left_footer" )) {
+ } else if (!strcmp ( (gchar *) node->name, "left_footer" )) {
get_string (data, &(style->left_footer));
- } else if (!strcmp( (gchar *)node->name, "center_footer" )) {
+ } else if (!strcmp ( (gchar *) node->name, "center_footer" )) {
get_string (data, &(style->center_footer));
- } else if (!strcmp( (gchar *)node->name, "right_footer" )) {
+ } else if (!strcmp ( (gchar *) node->name, "right_footer" )) {
get_string (data, &(style->right_footer));
- } else if (!strcmp( (gchar *)node->name, "reverse_on_even_pages" )) {
+ } else if (!strcmp ( (gchar *) node->name, "reverse_on_even_pages" )) {
style->reverse_on_even_pages = get_bool (data);
}
if (data)
diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index 2f1ad05..148bfa9 100644
--- a/calendar/alarm-notify/alarm-queue.c
+++ b/calendar/alarm-notify/alarm-queue.c
@@ -1724,7 +1724,7 @@ popup_notification (time_t trigger,
if (!qa)
return;
if (!notify_is_initted ())
- notify_init("Evolution Alarm Notify");
+ notify_init ("Evolution Alarm Notify");
/* get a sensible description for the event */
e_cal_component_get_summary (comp, &text);
@@ -2048,7 +2048,7 @@ alarm_queue_init (gpointer data)
g_timeout_add_seconds (1800, (GSourceFunc) check_midnight_refresh, NULL);
#ifdef HAVE_LIBNOTIFY
- notify_init("Evolution Alarms");
+ notify_init ("Evolution Alarms");
#endif
alarm_queue_inited = TRUE;
diff --git a/calendar/alarm-notify/util.c b/calendar/alarm-notify/util.c
index 0eee6d5..d06df4d 100644
--- a/calendar/alarm-notify/util.c
+++ b/calendar/alarm-notify/util.c
@@ -67,17 +67,17 @@ calculate_time (time_t start,
hours = difference / 3600;
difference %= 3600;
- times[i++] = g_strdup_printf (ngettext("%d hour", "%d hours", hours), hours);
+ times[i++] = g_strdup_printf (ngettext ("%d hour", "%d hours", hours), hours);
}
if (difference >= 60) {
minutes = difference / 60;
difference %= 60;
- times[i++] = g_strdup_printf (ngettext("%d minute", "%d minutes", minutes), minutes);
+ times[i++] = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes);
}
if (i == 0 || difference != 0) {
/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
- times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference);
+ times[i++] = g_strdup_printf (ngettext ("%d second", "%d seconds", difference), (gint) difference);
}
times[i] = NULL;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index dbf3cd0..31fdf6f 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -3620,7 +3620,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
camel_mime_part_get_content_id (mime_part));
disp = camel_mime_part_get_disposition (mime_part);
- if (disp && !g_ascii_strcasecmp(disp, "inline"))
+ if (disp && !g_ascii_strcasecmp (disp, "inline"))
cal_mime_attach->disposition = TRUE;
attach_list = g_slist_append (attach_list, cal_mime_attach);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index d8d0711..f590b9f 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1918,9 +1918,9 @@ event_page_set_delegate (EventPage *page,
g_return_if_fail (IS_EVENT_PAGE (page));
if (set)
- gtk_label_set_text_with_mnemonic ((GtkLabel *)page->priv->attendees_label, _("_Delegatees"));
+ gtk_label_set_text_with_mnemonic ((GtkLabel *) page->priv->attendees_label, _("_Delegatees"));
else
- gtk_label_set_text_with_mnemonic ((GtkLabel *)page->priv->attendees_label, _("Atte_ndees"));
+ gtk_label_set_text_with_mnemonic ((GtkLabel *) page->priv->attendees_label, _("Atte_ndees"));
}
static void
@@ -2223,7 +2223,7 @@ remove_clicked_cb (GtkButton *btn,
g_warning ("Cannot delete attendee\n");
continue;
} else if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL) {
- g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia));
+ g_warning ("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address (ia));
continue;
}
@@ -3420,19 +3420,19 @@ init_widgets (EventPage *epage)
switch (priv->alarm_units) {
case E_DURATION_DAYS:
if (priv->alarm_interval != 1) {
- combo_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
+ combo_label = g_strdup_printf (ngettext ("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
}
break;
case E_DURATION_HOURS:
if (priv->alarm_interval != 1) {
- combo_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
+ combo_label = g_strdup_printf (ngettext ("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
}
break;
case E_DURATION_MINUTES:
if (priv->alarm_interval != 15) {
- combo_label = g_strdup_printf (ngettext("%d minute before appointment", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
+ combo_label = g_strdup_printf (ngettext ("%d minute before appointment", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
}
break;
}
@@ -3736,8 +3736,8 @@ event_page_get_alarm_page (EventPage *epage)
priv = epage->priv;
- tmp = GW("dialog-vbox1");
- alarm_page = GW("vbox2");
+ tmp = GW ("dialog-vbox1");
+ alarm_page = GW ("vbox2");
g_object_ref (alarm_page);
gtk_container_remove ((GtkContainer *) tmp, alarm_page);
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 6e46de1..14c1a23 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -862,7 +862,7 @@ get_widgets (MemoPage *mpage)
priv->main = GW ("memo-page");
if (!priv->main) {
- g_warning("couldn't find memo-page!");
+ g_warning ("couldn't find memo-page!");
return FALSE;
}
@@ -1171,7 +1171,7 @@ get_to_entry (ENameSelector *name_selector)
name_selector_model = e_name_selector_peek_model (name_selector);
e_name_selector_model_add_section (name_selector_model, "To", _("To"), NULL);
- name_selector_entry = (ENameSelectorEntry *)e_name_selector_peek_section_list (name_selector, "To");
+ name_selector_entry = (ENameSelectorEntry *) e_name_selector_peek_section_list (name_selector, "To");
return GTK_WIDGET (name_selector_entry);
}
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 297e1f4..9f1542c 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1284,7 +1284,7 @@ remove_clicked_cb (GtkButton *btn,
g_warning ("Cannot delete attendee\n");
continue;
} else if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL) {
- g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia));
+ g_warning ("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address (ia));
continue;
}
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index e03a9f2..bbfb663 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -355,31 +355,31 @@ get_alarm_duration_string (struct icaldurationtype *duration)
if (duration->days >= 1) {
/* Translator: Entire string is like "Pop up an alert %d days before start of appointment" */
- g_string_printf (string, ngettext("%d day", "%d days", duration->days), duration->days);
+ g_string_printf (string, ngettext ("%d day", "%d days", duration->days), duration->days);
have_something = TRUE;
}
if (duration->weeks >= 1) {
/* Translator: Entire string is like "Pop up an alert %d weeks before start of appointment" */
- g_string_printf (string, ngettext("%d week","%d weeks", duration->weeks), duration->weeks);
+ g_string_printf (string, ngettext ("%d week","%d weeks", duration->weeks), duration->weeks);
have_something = TRUE;
}
if (duration->hours >= 1) {
/* Translator: Entire string is like "Pop up an alert %d hours before start of appointment" */
- g_string_printf (string, ngettext("%d hour", "%d hours", duration->hours), duration->hours);
+ g_string_printf (string, ngettext ("%d hour", "%d hours", duration->hours), duration->hours);
have_something = TRUE;
}
if (duration->minutes >= 1) {
/* Translator: Entire string is like "Pop up an alert %d minutes before start of appointment" */
- g_string_printf (string, ngettext("%d minute", "%d minutes", duration->minutes), duration->minutes);
+ g_string_printf (string, ngettext ("%d minute", "%d minutes", duration->minutes), duration->minutes);
have_something = TRUE;
}
if (duration->seconds >= 1) {
/* Translator: Entire string is like "Pop up an alert %d seconds before start of appointment" */
- g_string_printf (string, ngettext("%d second", "%d seconds", duration->seconds), duration->seconds);
+ g_string_printf (string, ngettext ("%d second", "%d seconds", duration->seconds), duration->seconds);
have_something = TRUE;
}
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 0eef0d2..99263ff 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -96,9 +96,9 @@ clear_comp_info (ECalComponentPreview *preview)
static gboolean
update_comp_info (ECalComponentPreview *preview,
ECalClient *client,
- ECalComponent *comp,
- icaltimezone *zone,
- gboolean use_24_hour_format)
+ ECalComponent *comp,
+ icaltimezone *zone,
+ gboolean use_24_hour_format)
{
ECalComponentPreviewPrivate *priv;
gboolean changed;
@@ -195,7 +195,7 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
static void
cal_component_preview_write_html (ECalComponentPreview *preview,
- GString *buffer)
+ GString *buffer)
{
ECalClient *client;
ECalComponent *comp;
@@ -413,7 +413,6 @@ load_comp (ECalComponentPreview *preview)
return;
}
-
buffer = g_string_sized_new (4096);
cal_component_preview_write_html (preview, buffer);
e_web_view_load_string (E_WEB_VIEW (preview), buffer->str);
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 7ce31d2..09a5894 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -126,7 +126,7 @@ ecmm_set_value_at (ETableModel *etm,
comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
if (!comp_data) {
- g_warning("couldn't get component data: row == %d", row);
+ g_warning ("couldn't get component data: row == %d", row);
return;
}
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 273e452..246d3dc 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1572,7 +1572,7 @@ ecm_initialize_value (ETableModel *etm,
switch (col) {
case E_CAL_MODEL_FIELD_CATEGORIES :
- return g_strdup (priv->default_category?priv->default_category:"");
+ return g_strdup (priv->default_category ? priv->default_category:"");
case E_CAL_MODEL_FIELD_CLASSIFICATION :
case E_CAL_MODEL_FIELD_DESCRIPTION :
case E_CAL_MODEL_FIELD_SUMMARY :
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 795aaca..a2eb33c 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -2040,7 +2040,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
tmp = calculate_time (t_start, t_end);
/* To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"*/
- tmp2 = g_strdup_printf(_("Time: %s %s"), tmp1, tmp);
+ tmp2 = g_strdup_printf (_("Time: %s %s"), tmp1, tmp);
if (zone && !cal_comp_util_compare_event_timezones (newcomp, client, default_zone)) {
g_free (tmp);
g_free (tmp1);
@@ -2181,7 +2181,7 @@ e_calendar_view_get_icalcomponent_summary (ECalClient *client,
void
e_calendar_view_emit_user_created (ECalendarView *cal_view,
- ECalClient *where_was_created)
+ ECalClient *where_was_created)
{
g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 2b8f7a8..76d3b01 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1115,7 +1115,7 @@ e_day_view_init (EDayView *day_view)
"clip", TRUE,
"max_lines", 1,
"editable", TRUE,
- "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
+ "fill_color_rgba", GNOME_CANVAS_COLOR (0, 0, 0),
NULL);
gnome_canvas_item_hide (day_view->drag_long_event_item);
@@ -1192,7 +1192,7 @@ e_day_view_init (EDayView *day_view)
"line_wrap", TRUE,
"clip", TRUE,
"editable", TRUE,
- "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
+ "fill_color_rgba", GNOME_CANVAS_COLOR (0, 0, 0),
NULL);
gnome_canvas_item_hide (day_view->drag_item);
@@ -2931,7 +2931,7 @@ e_day_view_recalc_work_week (EDayView *day_view)
if (!day_view->work_week_view)
return;
- e_day_view_recalc_work_week_days_shown (day_view);
+ e_day_view_recalc_work_week_days_shown (day_view);
/* If the date isn't set, just return. */
if (day_view->lower == 0 && day_view->upper == 0)
@@ -3350,7 +3350,7 @@ e_day_view_on_time_canvas_scroll (GtkWidget *widget,
GdkEventScroll *scroll,
EDayView *day_view)
{
- GtkWidget *tool_window = g_object_get_data ((GObject *)day_view, "tooltip-window");
+ GtkWidget *tool_window = g_object_get_data ((GObject *) day_view, "tooltip-window");
if (tool_window) {
gtk_widget_destroy (tool_window);
@@ -6286,8 +6286,8 @@ tooltip_destroy (EDayView *day_view,
if (item) {
EDayViewEvent *pevent;
- gint event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num"));
- gint day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day"));
+ gint event_num = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "event-num"));
+ gint day = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "event-day"));
pevent = tooltip_get_view_event (day_view, day, event_num);
if (pevent) {
@@ -6451,14 +6451,14 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
case GDK_MOTION_NOTIFY:
{
EDayViewEvent *pevent;
- gint event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num"));
- gint day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day"));
+ gint event_num = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "event-num"));
+ gint day = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "event-day"));
pevent = tooltip_get_view_event (day_view, day, event_num);
pevent->x = ((GdkEventMotion *) event)->x_root;
pevent->y = ((GdkEventMotion *) event)->y_root;
- pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (day_view), "tooltip-window");
+ pevent->tooltip = (GtkWidget *) g_object_get_data (G_OBJECT (day_view), "tooltip-window");
if (pevent->tooltip) {
e_calendar_view_move_tip (pevent->tooltip, pevent->x + 16, pevent->y + 16);
@@ -6531,8 +6531,8 @@ e_day_view_event_move (ECalendarView *cal_view,
end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);
start_time = icaltime_from_timet (start_dt, 0);
end_time = icaltime_from_timet (end_dt, 0);
- icaltime_adjust (&start_time ,-1,0,0,0);
- icaltime_adjust (&end_time ,-1,0,0,0);
+ icaltime_adjust (&start_time ,-1,0,0,0);
+ icaltime_adjust (&end_time ,-1,0,0,0);
start_dt = icaltime_as_timet (start_time);
end_dt = icaltime_as_timet (end_time);
break;
@@ -6543,8 +6543,8 @@ e_day_view_event_move (ECalendarView *cal_view,
end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);
start_time = icaltime_from_timet (start_dt, 0);
end_time = icaltime_from_timet (end_dt, 0);
- icaltime_adjust (&start_time ,1,0,0,0);
- icaltime_adjust (&end_time ,1,0,0,0);
+ icaltime_adjust (&start_time ,1,0,0,0);
+ icaltime_adjust (&end_time ,1,0,0,0);
start_dt = icaltime_as_timet (start_time);
end_dt = icaltime_as_timet (end_time);
break;
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 68da397..19358ef 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -405,7 +405,7 @@ attendee_edited_cb (GtkCellRenderer *renderer,
}
attendee = e_meeting_store_add_attendee_with_defaults (model);
- e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *)l->data));
+ e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *) l->data));
e_meeting_attendee_set_cn (attendee, g_strdup (m->data));
if (existing_attendee) {
/* FIXME Should we copy anything else? */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 4810f0c..711c4b1 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -649,7 +649,7 @@ month_scrol_by_week_changed_cb (GSettings *settings,
if (week_view->multi_week_view && week_view->month_scroll_by_week != calendar_config_get_month_scroll_by_week ()) {
week_view->multi_week_view = FALSE;
- e_week_view_set_multi_week_view (week_view, TRUE);
+ e_week_view_set_multi_week_view (week_view, TRUE);
}
}
@@ -3015,7 +3015,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
G_PRIORITY_DEFAULT, 500,
(GSourceFunc) e_calendar_view_get_tooltips,
data, (GDestroyNotify) g_free);
- g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
+ g_object_set_data ((GObject *) view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
return TRUE;
} else {
@@ -3024,7 +3024,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
case GDK_MOTION_NOTIFY:
pevent->x = ((GdkEventMotion *) event)->x_root;
pevent->y = ((GdkEventMotion *) event)->y_root;
- pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (view), "tooltip-window");
+ pevent->tooltip = (GtkWidget *) g_object_get_data (G_OBJECT (view), "tooltip-window");
if (pevent->tooltip) {
e_calendar_view_move_tip (pevent->tooltip, pevent->x + 16, pevent->y + 16);
@@ -3168,7 +3168,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
NULL);
}
- g_object_set_data ((GObject *)span->background_item, "event-num", GINT_TO_POINTER (event_num));
+ g_object_set_data ((GObject *) span->background_item, "event-num", GINT_TO_POINTER (event_num));
g_signal_connect (
span->background_item, "event",
G_CALLBACK (tooltip_event_cb), week_view);
@@ -3657,7 +3657,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
|| !e_week_view_find_event_from_item (week_view, item, &nevent, &nspan))
return FALSE;
- g_object_set_data ((GObject *)item, "event-num", GINT_TO_POINTER (nevent));
+ g_object_set_data ((GObject *) item, "event-num", GINT_TO_POINTER (nevent));
pevent = tooltip_get_view_event (week_view, -1, nevent);
@@ -3675,7 +3675,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
G_PRIORITY_DEFAULT, 500,
(GSourceFunc) e_calendar_view_get_tooltips,
data, (GDestroyNotify) g_free);
- g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
+ g_object_set_data ((GObject *) week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
return TRUE;
}
@@ -3686,7 +3686,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
case GDK_MOTION_NOTIFY:
pevent->x = ((GdkEventMotion *) gdkevent)->x_root;
pevent->y = ((GdkEventMotion *) gdkevent)->y_root;
- pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (week_view), "tooltip-window");
+ pevent->tooltip = (GtkWidget *) g_object_get_data (G_OBJECT (week_view), "tooltip-window");
if (pevent->tooltip) {
e_calendar_view_move_tip (pevent->tooltip, pevent->x + 16, pevent->y + 16);
@@ -3757,8 +3757,8 @@ static gboolean e_week_view_event_move (ECalendarView *cal_view, ECalViewMoveDir
break;
}
- icaltime_adjust (&start_time ,adjust_days,0,0,0);
- icaltime_adjust (&end_time ,adjust_days,0,0,0);
+ icaltime_adjust (&start_time ,adjust_days,0,0,0);
+ icaltime_adjust (&end_time ,adjust_days,0,0,0);
start_dt = icaltime_as_timet_with_zone (start_time,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
end_dt = icaltime_as_timet_with_zone (end_time,
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index cd77794..220e441 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -313,7 +313,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_string);
#ifdef ACC_DEBUG
- printf("EvoAcc: name for event accobj=%p, is %s\n",
+ printf ("EvoAcc: name for event accobj=%p, is %s\n",
(gpointer) accessible, new_name);
#endif
g_free (name_string);
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 415e72b..d7c7008 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -228,9 +228,9 @@ ea_cal_view_event_changed_cb (ECalendarView *cal_view,
}
if (event_atk_obj) {
#ifdef ACC_DEBUG
- printf ("AccDebug: event=%p changed\n", (gpointer)event);
+ printf ("AccDebug: event=%p changed\n", (gpointer) event);
#endif
- g_object_notify (G_OBJECT(event_atk_obj), "accessible-name");
+ g_object_notify (G_OBJECT (event_atk_obj), "accessible-name");
g_signal_emit_by_name (event_atk_obj, "visible_data_changed");
}
@@ -274,7 +274,7 @@ ea_cal_view_event_added_cb (ECalendarView *cal_view,
if (index < 0)
return;
#ifdef ACC_DEBUG
- printf ("AccDebug: event=%p added\n", (gpointer)event);
+ printf ("AccDebug: event=%p added\n", (gpointer) event);
#endif
g_signal_emit_by_name (atk_obj, "children_changed::add",
index, event_atk_obj, NULL);
diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c
index 0215435..2aa7daa 100644
--- a/calendar/gui/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
@@ -188,7 +188,7 @@ ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
/* focus out */
ea_event = NULL;
#ifdef ACC_DEBUG
- printf ("EvoAcc: focus notify on day main item %p\n", (gpointer)object);
+ printf ("EvoAcc: focus notify on day main item %p\n", (gpointer) object);
#endif
atk_focus_tracker_notify (ea_event);
}
diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index 419e114..8410e00 100644
--- a/calendar/gui/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
@@ -85,7 +85,7 @@ e_day_view_cell_new (EDayView *day_view,
cell->column = column;
#ifdef ACC_DEBUG
- printf ("EvoAcc: e_day_view_cell created %p\n", (gpointer)cell);
+ printf ("EvoAcc: e_day_view_cell created %p\n", (gpointer) cell);
#endif
return cell;
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index 4c5ffb0..c053258 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -113,7 +113,7 @@ ea_day_view_new (GtkWidget *widget)
atk_object_initialize (accessible, widget);
#ifdef ACC_DEBUG
- printf ("EvoAcc: ea_day_view created %p\n", (gpointer)accessible);
+ printf ("EvoAcc: ea_day_view created %p\n", (gpointer) accessible);
#endif
return accessible;
diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c
index 3c7ef01..b7ffb20 100644
--- a/calendar/gui/ea-gnome-calendar.c
+++ b/calendar/gui/ea-gnome-calendar.c
@@ -134,7 +134,7 @@ ea_gnome_calendar_new (GtkWidget *widget)
G_CALLBACK (ea_gcal_dates_change_cb), accessible);
#ifdef ACC_DEBUG
- printf ("EvoAcc: ea-gnome-calendar created: %p\n", (gpointer)accessible);
+ printf ("EvoAcc: ea-gnome-calendar created: %p\n", (gpointer) accessible);
#endif
return accessible;
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index fce7a9d..e8fffd8 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -85,7 +85,7 @@ e_week_view_cell_new (EWeekView *week_view,
cell->column = column;
#ifdef ACC_DEBUG
- printf ("EvoAcc: e_week_view_cell created %p\n", (gpointer)cell);
+ printf ("EvoAcc: e_week_view_cell created %p\n", (gpointer) cell);
#endif
return cell;
diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index e33d630..2fe8b23 100644
--- a/calendar/gui/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
@@ -1097,25 +1097,25 @@ table_interface_get_column_description (AtkTable *table,
switch (in_col) {
case 0:
- g_snprintf(buffer,128,"Monday");
+ g_snprintf (buffer,128,"Monday");
break;
case 1:
- g_snprintf(buffer,128,"Tuesday");
+ g_snprintf (buffer,128,"Tuesday");
break;
case 2:
- g_snprintf(buffer,128,"Wednesday");
+ g_snprintf (buffer,128,"Wednesday");
break;
case 3:
- g_snprintf(buffer,128,"Thursday");
+ g_snprintf (buffer,128,"Thursday");
break;
case 4:
- g_snprintf(buffer,128,"Friday");
+ g_snprintf (buffer,128,"Friday");
break;
case 5:
- g_snprintf(buffer,128,"Saturday");
+ g_snprintf (buffer,128,"Saturday");
break;
case 6:
- g_snprintf(buffer,128,"Sunday");
+ g_snprintf (buffer,128,"Sunday");
break;
default:
break;
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index 679f201..fad2648 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -115,7 +115,7 @@ ea_week_view_new (GtkWidget *widget)
atk_object_initialize (accessible, widget);
#ifdef ACC_DEBUG
- printf ("EvoAcc: ea_week_view created %p\n", (gpointer)accessible);
+ printf ("EvoAcc: ea_week_view created %p\n", (gpointer) accessible);
#endif
return accessible;
@@ -250,7 +250,7 @@ ea_week_view_get_n_children (AtkObject *accessible)
count++;
#ifdef ACC_DEBUG
- printf("AccDebug: week view %p has %d children\n", (gpointer)week_view, count);
+ printf ("AccDebug: week view %p has %d children\n", (gpointer) week_view, count);
#endif
return count;
}
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 7975d27..dbd779b 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1273,7 +1273,7 @@ gnome_calendar_set_search_query (GnomeCalendar *gcal,
start = start_range;
end = end_range;
- d(g_print ("Changing the queries %s \n", sexp));
+ d (g_print ("Changing the queries %s \n", sexp));
gnome_calendar_update_query (gcal);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index b5d350c..350fb5d 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -753,7 +753,7 @@ comp_to_list (ESourceRegistry *registry,
e_destination_set_email (
destination, itip_strip_mailto (att->value));
g_ptr_array_add (array, destination);
- d(printf ("itip-utils.c: comp_to_list: name: %s, email: %s\n",
+ d (printf ("itip-utils.c: comp_to_list: name: %s, email: %s\n",
e_destination_get_name (destination),
e_destination_get_email (destination)));
}
@@ -1112,10 +1112,10 @@ comp_server_send (ECalComponentItipMethod method,
GError *error = NULL;
top_level = comp_toplevel_with_zones (method, comp, cal_client, zones);
- d(printf ("itip-utils.c: comp_server_send: calling e_cal_send_objects... \n"));
+ d (printf ("itip-utils.c: comp_server_send: calling e_cal_send_objects... \n"));
if (!e_cal_client_send_objects_sync (cal_client, top_level, users, &returned_icalcomp, NULL, &error)) {
/* FIXME Really need a book problem status code */
- d(printf ("itip-utils.c: return value from e_cal_send_objects is: %d", error->code));
+ d (printf ("itip-utils.c: return value from e_cal_send_objects is: %d", error->code));
if (error) {
if (g_error_matches (error, E_CAL_CLIENT_ERROR, E_CAL_CLIENT_ERROR_OBJECT_ID_ALREADY_EXISTS)) {
e_notice (
@@ -1133,7 +1133,7 @@ comp_server_send (ECalComponentItipMethod method,
retval = FALSE;
}
} else {
- d(printf ("itip-utils.c: e_cal_send_objects returned without errors\n"));
+ d (printf ("itip-utils.c: e_cal_send_objects returned without errors\n"));
}
g_clear_error (&error);
@@ -1690,7 +1690,7 @@ itip_send_comp (ESourceRegistry *registry,
/* Give the server a chance to manipulate the comp */
if (method != E_CAL_COMPONENT_METHOD_PUBLISH) {
- d(printf ("itip-utils.c: itip_send_comp: calling comp_server_send... \n"));
+ d (printf ("itip-utils.c: itip_send_comp: calling comp_server_send... \n"));
if (!comp_server_send (method, send_comp, cal_client, zones, &users))
goto cleanup;
}
@@ -2187,7 +2187,7 @@ itip_publish_comp (ECalClient *cal_client,
/* send message to server */
soup_session_send_message (session, msg);
if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
- g_warning(G_STRLOC ": Could not publish Free/Busy: %d: %s",
+ g_warning (G_STRLOC ": Could not publish Free/Busy: %d: %s",
msg->status_code,
msg->reason_phrase);
g_object_unref (msg);
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index f67ab91..ed0f401 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -93,17 +93,17 @@ calculate_time (time_t start,
hours = difference / 3600;
difference %= 3600;
- times[i++] = g_strdup_printf (ngettext("%d hour", "%d hours", hours), hours);
+ times[i++] = g_strdup_printf (ngettext ("%d hour", "%d hours", hours), hours);
}
if (difference >= 60) {
minutes = difference / 60;
difference %= 60;
- times[i++] = g_strdup_printf (ngettext("%d minute", "%d minutes", minutes), minutes);
+ times[i++] = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes);
}
if (i == 0 || difference != 0) {
/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
- times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference);
+ times[i++] = g_strdup_printf (ngettext ("%d second", "%d seconds", difference), (gint) difference);
}
times[i] = NULL;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index a81b709..d0d8713 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -608,24 +608,24 @@ format_date (struct tm *tm,
fmt[0] = 0;
if (flags & DATE_DAYNAME) {
- strcat(fmt, "%A");
+ strcat (fmt, "%A");
}
if (flags & DATE_DAY) {
if (flags & DATE_DAYNAME)
- strcat(fmt, " ");
+ strcat (fmt, " ");
strcat (fmt, gettext (days[tm->tm_mday - 1]));
}
if (flags & DATE_MONTH) {
if (flags & (DATE_DAY | DATE_DAYNAME))
- strcat(fmt, " ");
- strcat(fmt, "%B");
+ strcat (fmt, " ");
+ strcat (fmt, "%B");
if ((flags & (DATE_DAY | DATE_YEAR)) == (DATE_DAY | DATE_YEAR))
- strcat(fmt, ",");
+ strcat (fmt, ",");
}
if (flags & DATE_YEAR) {
if (flags & (DATE_DAY | DATE_DAYNAME | DATE_MONTH))
- strcat(fmt, " ");
- strcat(fmt, "%Y");
+ strcat (fmt, " ");
+ strcat (fmt, "%Y");
}
e_utf8_strftime (buffer, bufflen, fmt, tm);
buffer[bufflen - 1] = '\0';
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index f2b65f0..265656d 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -361,7 +361,7 @@ ivcal_getwidget (EImport *ei,
sd->selector = selector;
sd->notebook = nb;
sd->page = i;
- g_object_set_data_full((GObject *)rb, "selector-data", sd, g_free);
+ g_object_set_data_full ((GObject *) rb, "selector-data", sd, g_free);
g_signal_connect (
rb, "toggled",
G_CALLBACK (button_toggled_cb), sd);
@@ -369,8 +369,8 @@ ivcal_getwidget (EImport *ei,
if (!group)
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb));
if (first == NULL) {
- g_datalist_set_data_full(&target->data, "primary-source", g_object_ref (source), g_object_unref);
- g_datalist_set_data(&target->data, "primary-type", GINT_TO_POINTER(import_type_map[i]));
+ g_datalist_set_data_full (&target->data, "primary-source", g_object_ref (source), g_object_unref);
+ g_datalist_set_data (&target->data, "primary-type", GINT_TO_POINTER (import_type_map[i]));
first = rb;
}
}
@@ -443,7 +443,7 @@ ivcal_opened (GObject *source_object,
ici->cal_client = E_CAL_CLIENT (client);
- e_import_status(ici->import, ici->target, _("Importing..."), 0);
+ e_import_status (ici->import, ici->target, _("Importing..."), 0);
ici->idle_id = g_idle_add (ivcal_import_items, ici);
}
@@ -455,10 +455,10 @@ ivcal_import (EImport *ei,
EClientSourceType type;
ICalImporter *ici = g_malloc0 (sizeof (*ici));
- type = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "primary-type"));
+ type = GPOINTER_TO_INT (g_datalist_get_data (&target->data, "primary-type"));
ici->import = ei;
- g_datalist_set_data(&target->data, "ivcal-data", ici);
+ g_datalist_set_data (&target->data, "ivcal-data", ici);
g_object_ref (ei);
ici->target = target;
ici->icalcomp = icalcomp;
@@ -477,7 +477,7 @@ ivcal_cancel (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- ICalImporter *ici = g_datalist_get_data(&target->data, "ivcal-data");
+ ICalImporter *ici = g_datalist_get_data (&target->data, "ivcal-data");
if (ici)
g_cancellable_cancel (ici->cancellable);
@@ -505,7 +505,7 @@ ical_supported (EImport *ei,
if (s->uri_src == NULL)
return TRUE;
- if (strncmp(s->uri_src, "file:///", 8) != 0)
+ if (strncmp (s->uri_src, "file:///", 8) != 0)
return FALSE;
filename = g_filename_from_uri (s->uri_src, NULL, NULL);
@@ -641,7 +641,7 @@ vcal_supported (EImport *ei,
if (s->uri_src == NULL)
return TRUE;
- if (strncmp(s->uri_src, "file:///", 8) != 0)
+ if (strncmp (s->uri_src, "file:///", 8) != 0)
return FALSE;
filename = g_filename_from_uri (s->uri_src, NULL, NULL);
@@ -807,7 +807,7 @@ gnome_calendar_supported (EImport *ei,
if (target->type != E_IMPORT_TARGET_HOME)
return FALSE;
- filename = g_build_filename(g_get_home_dir (), "user-cal.vcf", NULL);
+ filename = g_build_filename (g_get_home_dir (), "user-cal.vcf", NULL);
res = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
g_free (filename);
@@ -995,15 +995,15 @@ gnome_calendar_import (EImport *ei,
/* This is pretty shitty, everything runs in the gui thread and can block
* for quite some time */
- do_calendar = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "gnomecal-do-cal"));
- do_tasks = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "gnomecal-do-tasks"));
+ do_calendar = GPOINTER_TO_INT (g_datalist_get_data (&target->data, "gnomecal-do-cal"));
+ do_tasks = GPOINTER_TO_INT (g_datalist_get_data (&target->data, "gnomecal-do-tasks"));
/* If neither is selected, just return. */
if (!do_calendar && !do_tasks)
return;
/* Load the Gnome Calendar file and convert to iCalendar. */
- filename = g_build_filename(g_get_home_dir (), "user-cal.vcf", NULL);
+ filename = g_build_filename (g_get_home_dir (), "user-cal.vcf", NULL);
icalcomp = load_vcalendar_file (filename);
g_free (filename);
@@ -1018,7 +1018,7 @@ gnome_calendar_import (EImport *ei,
ici->icalcomp = icalcomp;
icalcomp = NULL;
- g_datalist_set_data_full(&target->data, "gnomecal-data", ici, free_ici);
+ g_datalist_set_data_full (&target->data, "gnomecal-data", ici, free_ici);
prepare_events (ici->icalcomp, &ici->tasks);
if (do_calendar) {
@@ -1043,14 +1043,14 @@ static void
calendar_toggle_cb (GtkToggleButton *tb,
EImportTarget *target)
{
- g_datalist_set_data(&target->data, "gnomecal-do-cal", GINT_TO_POINTER(gtk_toggle_button_get_active(tb)));
+ g_datalist_set_data (&target->data, "gnomecal-do-cal", GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
}
static void
tasks_toggle_cb (GtkToggleButton *tb,
EImportTarget *target)
{
- g_datalist_set_data(&target->data, "gnomecal-do-tasks", GINT_TO_POINTER(gtk_toggle_button_get_active(tb)));
+ g_datalist_set_data (&target->data, "gnomecal-do-tasks", GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
}
static GtkWidget *
@@ -1067,8 +1067,8 @@ gnome_calendar_getwidget (EImport *ei,
done_tasks = g_settings_get_boolean (settings, "gnome-calendar-done-tasks");
g_object_unref (settings);
- g_datalist_set_data(&target->data, "gnomecal-do-cal", GINT_TO_POINTER(!done_cal));
- g_datalist_set_data(&target->data, "gnomecal-do-tasks", GINT_TO_POINTER(!done_tasks));
+ g_datalist_set_data (&target->data, "gnomecal-do-cal", GINT_TO_POINTER (!done_cal));
+ g_datalist_set_data (&target->data, "gnomecal-do-tasks", GINT_TO_POINTER (!done_tasks));
hbox = gtk_hbox_new (FALSE, 2);
@@ -1096,7 +1096,7 @@ gnome_calendar_cancel (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- ICalIntelligentImporter *ici = g_datalist_get_data(&target->data, "gnomecal-data");
+ ICalIntelligentImporter *ici = g_datalist_get_data (&target->data, "gnomecal-data");
if (ici)
g_cancellable_cancel (ici->cancellable);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 168a843..e6c6442 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -221,7 +221,7 @@ emcu_part_to_html (CamelSession *session,
g_object_unref (formatter);
g_object_unref (part_list);
- camel_stream_write((CamelStream *) mem, "", 1, cancellable, NULL);
+ camel_stream_write ((CamelStream *) mem, "", 1, cancellable, NULL);
g_object_unref (mem);
text = (gchar *) buf->data;
@@ -239,7 +239,7 @@ emcu_remove_xevolution_headers (CamelMimeMessage *message)
struct _camel_header_raw *scan, *list = NULL;
for (scan = ((CamelMimePart *) message)->headers; scan; scan = scan->next)
- if (!strncmp(scan->name, "X-Evolution", 11))
+ if (!strncmp (scan->name, "X-Evolution", 11))
camel_header_raw_append (&list, scan->name, scan->value, scan->offset);
for (scan = list; scan; scan = scan->next)
@@ -4858,7 +4858,7 @@ e_msg_composer_can_close (EMsgComposer *composer,
widget = GTK_WIDGET (composer);
/* this means that there is an async operation running,
- in which case the composer cannot be closed */
+ * in which case the composer cannot be closed */
if (!gtk_action_group_get_sensitive (composer->priv->async_actions))
return FALSE;
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 7da480a..2baadca 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -132,7 +132,7 @@ config_finalize (GObject *object)
priv = E_CONFIG_GET_PRIVATE (object);
- d(printf("finalising EConfig %p\n", object));
+ d (printf ("finalising EConfig %p\n", object));
g_free (E_CONFIG (object)->id);
@@ -650,7 +650,7 @@ ec_rebuild (EConfig *emp)
gboolean is_assistant;
GList *link;
- d(printf("target changed, rebuilding:\n"));
+ d (printf ("target changed, rebuilding:\n"));
/* TODO: This code is pretty complex, and will probably just
* become more complex with time. It could possibly be split
@@ -683,7 +683,7 @@ ec_rebuild (EConfig *emp)
const gchar *translated_label = NULL;
GtkWidget *w;
- d(printf(" '%s'\n", item->path));
+ d (printf (" '%s'\n", item->path));
if (item->label != NULL)
translated_label = gettext (item->label);
@@ -713,7 +713,7 @@ ec_rebuild (EConfig *emp)
gtk_widget_show (sectionnode->frame);
}
- d(printf("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno));
+ d (printf ("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno));
}
/* If the last page doesn't contain anything, hide it */
@@ -728,7 +728,7 @@ ec_rebuild (EConfig *emp)
pageno--;
} else
gtk_widget_show (pagenode->frame);
- d(printf("%s page '%s' [section=%d]\n", pagenode->empty?"hiding":"showing", pagenode->item->path, pageno));
+ d (printf ("%s page '%s' [section=%d]\n", pagenode->empty?"hiding":"showing", pagenode->item->path, pageno));
}
/* Now process the item */
@@ -741,13 +741,13 @@ ec_rebuild (EConfig *emp)
* cross-checked with the code's defined
* type. */
if (root != NULL) {
- g_warning("EConfig book/assistant redefined at: %s", item->path);
+ g_warning ("EConfig book/assistant redefined at: %s", item->path);
break;
}
if (wn->widget == NULL) {
if (item->type != emp->type) {
- g_warning("EConfig book/assistant type mismatch");
+ g_warning ("EConfig book/assistant type mismatch");
break;
}
if (item->factory) {
@@ -804,11 +804,11 @@ ec_rebuild (EConfig *emp)
case E_CONFIG_PAGE_START:
case E_CONFIG_PAGE_FINISH:
if (root == NULL) {
- g_warning("EConfig page defined before container widget: %s", item->path);
+ g_warning ("EConfig page defined before container widget: %s", item->path);
break;
}
if (emp->type != E_CONFIG_ASSISTANT) {
- g_warning("EConfig assistant start/finish pages can't be used on E_CONFIG_BOOKs");
+ g_warning ("EConfig assistant start/finish pages can't be used on E_CONFIG_BOOKs");
break;
}
@@ -874,12 +874,12 @@ ec_rebuild (EConfig *emp)
any sections automatically added inside it. */
sectionno = 0;
if (root == NULL) {
- g_warning("EConfig page defined before container widget: %s", item->path);
+ g_warning ("EConfig page defined before container widget: %s", item->path);
break;
}
if (item->type == E_CONFIG_PAGE_PROGRESS &&
emp->type != E_CONFIG_ASSISTANT) {
- g_warning("EConfig assistant progress pages can't be used on E_CONFIG_BOOKs");
+ g_warning ("EConfig assistant progress pages can't be used on E_CONFIG_BOOKs");
break;
}
@@ -927,10 +927,10 @@ ec_rebuild (EConfig *emp)
} else
page = wn->widget;
- d(printf("page %d:%s widget %p\n", pageno, item->path, page));
+ d (printf ("page %d:%s widget %p\n", pageno, item->path, page));
if (wn->widget && wn->widget != page) {
- d(printf("destroy old widget for page '%s' (%p)\n", item->path, wn->widget));
+ d (printf ("destroy old widget for page '%s' (%p)\n", item->path, wn->widget));
gtk_widget_destroy (wn->widget);
}
@@ -959,7 +959,7 @@ ec_rebuild (EConfig *emp)
itemno = 0;
n_visible_widgets = 0;
- d(printf("Building section %s - '%s' - %s factory\n", item->path, item->label, item->factory ? "with" : "without"));
+ d (printf ("Building section %s - '%s' - %s factory\n", item->path, item->label, item->factory ? "with" : "without"));
if (item->factory) {
/* For sections, we pass an extra argument to the usual EConfigItemFactoryFunc.
@@ -985,31 +985,32 @@ ec_rebuild (EConfig *emp)
* see emph_construct_item().
*/
n_visible_widgets++;
- d(printf (" n_visible_widgets++ because there is a section factory -> frame=%p\n", section));
+ d (printf (" n_visible_widgets++ because there is a section factory -> frame=%p\n", section));
}
if (section
&& ((item->type == E_CONFIG_SECTION && !GTK_IS_BOX (section))
|| (item->type == E_CONFIG_SECTION_TABLE && !GTK_IS_TABLE (section))))
- g_warning("EConfig section type is wrong");
+ g_warning ("EConfig section type is wrong");
} else {
GtkWidget *frame;
GtkWidget *label = NULL;
if (wn->frame) {
- d(printf("Item %s, clearing generated section widget\n", wn->item->path));
+ d (printf ("Item %s, clearing generated section widget\n", wn->item->path));
gtk_widget_destroy (wn->frame);
wn->widget = NULL;
wn->frame = NULL;
}
if (translated_label != NULL) {
- gchar *txt = g_markup_printf_escaped("<span weight=\"bold\">%s</span>", translated_label);
+ gchar *txt = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>", translated_label);
- label = g_object_new (gtk_label_get_type (),
- "label", txt,
- "use_markup", TRUE,
- "xalign", 0.0, NULL);
+ label = g_object_new (
+ gtk_label_get_type (),
+ "label", txt,
+ "use_markup", TRUE,
+ "xalign", 0.0, NULL);
g_free (txt);
}
@@ -1021,25 +1022,26 @@ ec_rebuild (EConfig *emp)
gtk_table_set_row_spacings ((GtkTable *) section, 6);
}
- frame = g_object_new (gtk_frame_get_type (),
- "shadow_type", GTK_SHADOW_NONE,
- "label_widget", label,
- "child", g_object_new(gtk_alignment_get_type(),
- "left_padding", 12,
- "top_padding", 6,
- "child", section, NULL),
- NULL);
+ frame = g_object_new (
+ gtk_frame_get_type (),
+ "shadow_type", GTK_SHADOW_NONE,
+ "label_widget", label,
+ "child", g_object_new (gtk_alignment_get_type (),
+ "left_padding", 12,
+ "top_padding", 6,
+ "child", section, NULL),
+ NULL);
gtk_widget_show_all (frame);
gtk_box_pack_start ((GtkBox *) page, frame, FALSE, FALSE, 0);
wn->frame = frame;
}
nopage:
if (wn->widget && wn->widget != section) {
- d(printf("destroy old widget for section '%s'\n", item->path));
+ d (printf ("destroy old widget for section '%s'\n", item->path));
gtk_widget_destroy (wn->widget);
}
- d(printf("Item %s, setting section widget\n", wn->item->path));
+ d (printf ("Item %s, setting section widget\n", wn->item->path));
sectionno++;
wn->widget = section;
@@ -1062,24 +1064,17 @@ ec_rebuild (EConfig *emp)
if (section == NULL) {
wn->widget = NULL;
wn->frame = NULL;
- g_warning("EConfig item has no parent section: %s", item->path);
+ g_warning ("EConfig item has no parent section: %s", item->path);
} else if ((item->type == E_CONFIG_ITEM && !GTK_IS_BOX (section))
|| (item->type == E_CONFIG_ITEM_TABLE && !GTK_IS_TABLE (section)))
- g_warning("EConfig item parent type is incorrect: %s", item->path);
+ g_warning ("EConfig item parent type is incorrect: %s", item->path);
else if (item->factory)
w = item->factory (
emp, item, section, wn->widget,
0, wn->context->data);
- d(printf("item %d:%s widget %p\n", itemno, item->path, w));
-
- d(printf (" item %s: (%s - %s)\n",
- item->path,
- g_type_name_from_instance ((GTypeInstance *) w),
- gtk_widget_get_visible (w) ? "visible" : "invisible"));
-
if (wn->widget && wn->widget != w) {
- d(printf("destroy old widget for item '%s'\n", item->path));
+ d (printf ("destroy old widget for item '%s'\n", item->path));
gtk_widget_destroy (wn->widget);
}
@@ -1099,7 +1094,7 @@ ec_rebuild (EConfig *emp)
/* If the last section doesn't contain any visible widgets, hide it */
if (sectionnode != NULL && sectionnode->frame != NULL) {
- d(printf ("Section %s - %d visible widgets (frame=%p)\n", sectionnode->item->path, n_visible_widgets, sectionnode->frame));
+ d (printf ("Section %s - %d visible widgets (frame=%p)\n", sectionnode->item->path, n_visible_widgets, sectionnode->frame));
if ((sectionnode->empty = (itemno == 0 || n_visible_widgets == 0))) {
if (sectionnode->real_frame)
gtk_widget_hide (sectionnode->real_frame);
@@ -1115,7 +1110,7 @@ ec_rebuild (EConfig *emp)
if (sectionnode->frame)
gtk_widget_show (sectionnode->frame);
}
- d(printf("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno));
+ d (printf ("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno));
}
/* If the last page doesn't contain anything, hide it */
@@ -1125,7 +1120,7 @@ ec_rebuild (EConfig *emp)
pageno--;
} else
gtk_widget_show (pagenode->frame);
- d(printf("%s page '%s' [section=%d]\n", pagenode->empty?"hiding":"showing", pagenode->item->path, pageno));
+ d (printf ("%s page '%s' [section=%d]\n", pagenode->empty?"hiding":"showing", pagenode->item->path, pageno));
}
if (book) {
@@ -1735,7 +1730,7 @@ ech_check (EConfig *ec,
hdata.config = ec;
hdata.target = ec->target;
- hdata.pageid = pageid?pageid:"";
+ hdata.pageid = pageid ? pageid:"";
return GPOINTER_TO_INT (e_plugin_invoke (group->hook->hook.plugin, group->check, &hdata));
}
@@ -1746,7 +1741,7 @@ ech_config_factory (EConfig *emp,
{
EConfigHookGroup *group = data;
- d(printf("config factory called %s\n", group->id?group->id:"all menus"));
+ d (printf ("config factory called %s\n", group->id ? group->id:"all menus"));
if (emp->target->type != group->target_type
|| !group->hook->hook.plugin->enabled)
@@ -1890,13 +1885,13 @@ emph_construct_item (EPluginHook *eph,
{
struct _EConfigItem *item;
- d(printf(" loading config item\n"));
+ d (printf (" loading config item\n"));
item = g_malloc0 (sizeof (*item));
- if ((item->type = e_plugin_hook_id(root, ech_item_types, "type")) == -1)
+ if ((item->type = e_plugin_hook_id (root, ech_item_types, "type")) == -1)
goto error;
- item->path = e_plugin_xml_prop(root, "path");
- item->label = e_plugin_xml_prop_domain(root, "label", eph->plugin->domain);
- item->user_data = e_plugin_xml_prop(root, "factory");
+ item->path = e_plugin_xml_prop (root, "path");
+ item->label = e_plugin_xml_prop_domain (root, "label", eph->plugin->domain);
+ item->user_data = e_plugin_xml_prop (root, "factory");
if (item->path == NULL
|| (item->label == NULL && item->user_data == NULL))
@@ -1909,11 +1904,11 @@ emph_construct_item (EPluginHook *eph,
else if (item->type == E_CONFIG_SECTION_TABLE)
item->factory = (EConfigItemFactoryFunc) ech_config_section_factory;
- d(printf(" path=%s label=%s factory=%s\n", item->path, item->label, (gchar *)item->user_data));
+ d (printf (" path=%s label=%s factory=%s\n", item->path, item->label, (gchar *) item->user_data));
return item;
error:
- d(printf("error!\n"));
+ d (printf ("error!\n"));
emph_free_item (item);
return NULL;
}
@@ -1928,10 +1923,10 @@ emph_construct_menu (EPluginHook *eph,
EConfigHookClass *class = (EConfigHookClass *) G_OBJECT_GET_CLASS (eph);
gchar *tmp;
- d(printf(" loading menu\n"));
+ d (printf (" loading menu\n"));
menu = g_malloc0 (sizeof (*menu));
- tmp = (gchar *)xmlGetProp(root, (const guchar *)"target");
+ tmp = (gchar *) xmlGetProp (root, (const guchar *)"target");
if (tmp == NULL)
goto error;
map = g_hash_table_lookup (class->target_map, tmp);
@@ -1940,19 +1935,21 @@ emph_construct_menu (EPluginHook *eph,
goto error;
menu->target_type = map->id;
- menu->id = e_plugin_xml_prop(root, "id");
+ menu->id = e_plugin_xml_prop (root, "id");
if (menu->id == NULL) {
- g_warning("Plugin '%s' missing 'id' field in group for '%s'\n", eph->plugin->name,
- ((EPluginHookClass *) G_OBJECT_GET_CLASS (eph))->id);
+ g_warning (
+ "Plugin '%s' missing 'id' field in group for '%s'\n",
+ eph->plugin->name,
+ ((EPluginHookClass *) G_OBJECT_GET_CLASS (eph))->id);
goto error;
}
- menu->check = e_plugin_xml_prop(root, "check");
- menu->commit = e_plugin_xml_prop(root, "commit");
- menu->abort = e_plugin_xml_prop(root, "abort");
+ menu->check = e_plugin_xml_prop (root, "check");
+ menu->commit = e_plugin_xml_prop (root, "commit");
+ menu->abort = e_plugin_xml_prop (root, "abort");
menu->hook = (EConfigHook *) eph;
node = root->children;
while (node) {
- if (0 == strcmp((gchar *)node->name, "item")) {
+ if (0 == strcmp ((gchar *) node->name, "item")) {
struct _EConfigItem *item;
item = emph_construct_item (eph, menu, node, map);
@@ -1976,7 +1973,7 @@ emph_construct (EPluginHook *eph,
xmlNodePtr node;
EConfigClass *class;
- d(printf("loading config hook\n"));
+ d (printf ("loading config hook\n"));
if (((EPluginHookClass *) e_config_hook_parent_class)->construct (eph, ep, root) == -1)
return -1;
@@ -1985,7 +1982,7 @@ emph_construct (EPluginHook *eph,
node = root->children;
while (node) {
- if (strcmp((gchar *)node->name, "group") == 0) {
+ if (strcmp ((gchar *) node->name, "group") == 0) {
EConfigHookGroup *group;
group = emph_construct_menu (eph, node);
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index fabd195..7a481d3 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -50,12 +50,9 @@ e_notice (gpointer parent,
va_start (args, format);
str = g_strdup_vprintf (format, args);
- dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- type,
- GTK_BUTTONS_OK,
- "%s",
- str);
+ dialog = gtk_message_dialog_new (
+ NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+ type, GTK_BUTTONS_OK, "%s", str);
va_end (args);
g_free (str);
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 409c23c..c9d046c 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -229,7 +229,7 @@ e_event_emit (EEvent *event,
EEventPrivate *p = event->priv;
GSList *events;
- d(printf("emit event %s\n", id));
+ d (printf ("emit event %s\n", id));
if (event->target != NULL) {
g_warning ("Event already in progress.\n");
@@ -264,9 +264,6 @@ e_event_emit (EEvent *event,
struct _event_info *info = events->data;
EEventItem *item = info->item;
- d(printf("event '%s' mask %08x target %08x\n",
- item->id, item->enable, target->mask));
-
if (item->enable & target->mask)
continue;
@@ -429,7 +426,7 @@ emph_construct_item (EPluginHook *eph,
item = g_malloc0 (sizeof (*item));
- tmp = (gchar *)xmlGetProp(root, (const guchar *)"target");
+ tmp = (gchar *) xmlGetProp (root, (const guchar *)"target");
if (tmp == NULL)
goto error;
map = g_hash_table_lookup (class->target_map, tmp);
@@ -437,13 +434,13 @@ emph_construct_item (EPluginHook *eph,
if (map == NULL)
goto error;
item->target_type = map->id;
- item->type = e_plugin_hook_id(root, emph_item_types, "type");
+ item->type = e_plugin_hook_id (root, emph_item_types, "type");
if (item->type == -1)
item->type = E_EVENT_PASS;
- item->priority = e_plugin_xml_int(root, "priority", 0);
- item->id = e_plugin_xml_prop(root, "id");
- item->enable = e_plugin_hook_mask(root, map->mask_bits, "enable");
- item->user_data = e_plugin_xml_prop(root, "handle");
+ item->priority = e_plugin_xml_int (root, "priority", 0);
+ item->id = e_plugin_xml_prop (root, "id");
+ item->enable = e_plugin_hook_mask (root, map->mask_bits, "enable");
+ item->user_data = e_plugin_xml_prop (root, "handle");
if (item->user_data == NULL || item->id == NULL)
goto error;
@@ -465,7 +462,7 @@ emph_construct (EPluginHook *eph,
EEventHookClass *class;
GSList *items = NULL;
- d(printf("loading event hook\n"));
+ d (printf ("loading event hook\n"));
if (((EPluginHookClass *) e_event_hook_parent_class)->
construct (eph, ep, root) == -1)
@@ -476,7 +473,7 @@ emph_construct (EPluginHook *eph,
node = root->children;
while (node) {
- if (strcmp((gchar *)node->name, "event") == 0) {
+ if (strcmp ((gchar *) node->name, "event") == 0) {
EEventItem *item;
item = emph_construct_item (eph, node, class);
diff --git a/e-util/e-file-request.c b/e-util/e-file-request.c
index 4b84aad..724680a 100644
--- a/e-util/e-file-request.c
+++ b/e-util/e-file-request.c
@@ -95,7 +95,7 @@ file_request_send_async (SoupRequest *request,
{
GSimpleAsyncResult *simple;
- d(printf("received request for %s\n", soup_uri_to_string (uri, FALSE)));
+ d (printf ("received request for %s\n", soup_uri_to_string (uri, FALSE)));
/* WebKit won't allow us to load data through local file:// protocol
* when using "remote" mail:// protocol, so we have evo-file://
@@ -120,9 +120,11 @@ file_request_send_finish (SoupRequest *request,
GAsyncResult *result,
GError **error)
{
+ GSimpleAsyncResult *simple;
GInputStream *stream;
- stream = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result));
+ simple = G_SIMPLE_ASYNC_RESULT (result);
+ stream = g_simple_async_result_get_op_res_gpointer (simple);
/* Reset the stream before passing it back to webkit */
if (stream && G_IS_SEEKABLE (stream))
@@ -139,7 +141,8 @@ file_request_get_content_length (SoupRequest *request)
{
EFileRequest *efr = E_FILE_REQUEST (request);
- d(printf("Content-Length: %d bytes\n", efr->priv->content_length));
+ d (printf ("Content-Length: %d bytes\n", efr->priv->content_length));
+
return efr->priv->content_length;
}
@@ -148,12 +151,12 @@ file_request_get_content_type (SoupRequest *request)
{
EFileRequest *efr = E_FILE_REQUEST (request);
- d(printf("Content-Type: %s\n", efr->priv->content_type));
+ d (printf ("Content-Type: %s\n", efr->priv->content_type));
return efr->priv->content_type;
}
-static const char *data_schemes[] = { "evo-file", NULL };
+static const gchar *data_schemes[] = { "evo-file", NULL };
static void
e_file_request_class_init (EFileRequestClass *class)
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 3a863da..5e4de66 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -158,7 +158,7 @@ is_citation (const guchar *c,
/* A line that starts with a ">" is a citation, unless it's
* just mbox From-mangling...
*/
- if (strncmp ((const gchar *)c, ">From ", 6) != 0)
+ if (strncmp ((const gchar *) c, ">From ", 6) != 0)
return TRUE;
/* If the previous line was a citation, then say this
@@ -281,36 +281,37 @@ e_text_to_html_full (const gchar *input,
(flags & E_TEXT_TO_HTML_CONVERT_URLS)) {
gchar *tmpurl = NULL, *refurl = NULL, *dispurl = NULL;
- if (!g_ascii_strncasecmp ((gchar *)cur, "http://";, 7) ||
- !g_ascii_strncasecmp ((gchar *)cur, "https://";, 8) ||
- !g_ascii_strncasecmp ((gchar *)cur, "ftp://";, 6) ||
- !g_ascii_strncasecmp ((gchar *)cur, "nntp://";, 7) ||
- !g_ascii_strncasecmp ((gchar *)cur, "mailto:";, 7) ||
- !g_ascii_strncasecmp ((gchar *)cur, "news:";, 5) ||
- !g_ascii_strncasecmp ((gchar *)cur, "file:", 5) ||
- !g_ascii_strncasecmp ((gchar *)cur, "callto:", 7) ||
- !g_ascii_strncasecmp ((gchar *)cur, "h323:", 5) ||
- !g_ascii_strncasecmp ((gchar *)cur, "sip:", 4) ||
- !g_ascii_strncasecmp ((gchar *)cur, "webcal:", 7)) {
+ if (!g_ascii_strncasecmp ((gchar *) cur, "http://";, 7) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "https://";, 8) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "ftp://";, 6) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "nntp://";, 7) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "mailto:";, 7) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "news:";, 5) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "file:", 5) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "callto:", 7) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "h323:", 5) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "sip:", 4) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "webcal:", 7)) {
tmpurl = url_extract (&cur, TRUE);
if (tmpurl) {
refurl = e_text_to_html (tmpurl, 0);
dispurl = g_strdup (refurl);
}
- } else if (!g_ascii_strncasecmp ((gchar *)cur, "www.", 4) &&
+ } else if (!g_ascii_strncasecmp ((gchar *) cur, "www.", 4) &&
is_url_char (*(cur + 4))) {
tmpurl = url_extract (&cur, FALSE);
if (tmpurl) {
dispurl = e_text_to_html (tmpurl, 0);
- refurl = g_strdup_printf ("http://%s";,
- dispurl);
+ refurl = g_strdup_printf (
+ "http://%s";, dispurl);
}
}
if (tmpurl) {
- out = check_size (&buffer, &buffer_size, out,
- strlen (refurl) +
- strlen (dispurl) + 15);
+ out = check_size (
+ &buffer, &buffer_size, out,
+ strlen (refurl) +
+ strlen (dispurl) + 15);
out += sprintf (out,
"<a href=\"%s\">%s</a>",
refurl, dispurl);
@@ -331,8 +332,9 @@ e_text_to_html_full (const gchar *input,
addr = email_address_extract (&cur, &out, linestart);
if (addr) {
dispaddr = e_text_to_html (addr, 0);
- outaddr = g_strdup_printf ("<a href=\"mailto:%s\";>%s</a>",
- addr, dispaddr);
+ outaddr = g_strdup_printf (
+ "<a href=\"mailto:%s\";>%s</a>",
+ addr, dispaddr);
out = check_size (&buffer, &buffer_size, out, strlen (outaddr));
out += sprintf (out, "%s", outaddr);
col += strlen (addr);
@@ -396,8 +398,8 @@ e_text_to_html_full (const gchar *input,
if (flags & (E_TEXT_TO_HTML_CONVERT_SPACES |
E_TEXT_TO_HTML_CONVERT_NL)) {
do {
- out = check_size (&buffer, &buffer_size,
- out, 7);
+ out = check_size (
+ &buffer, &buffer_size, out, 7);
strcpy (out, " ");
out += 6;
col++;
@@ -428,7 +430,7 @@ e_text_to_html_full (const gchar *input,
if (flags & E_TEXT_TO_HTML_ESCAPE_8BIT)
*out++ = '?';
else
- out += g_snprintf(out, 9, "&#%d;", u);
+ out += g_snprintf (out, 9, "&#%d;", u);
}
col++;
break;
@@ -541,7 +543,8 @@ main (gint argc,
if ((url && (!url_tests[i].url || strcmp (url, url_tests[i].url) != 0)) ||
(!url && url_tests[i].url)) {
- printf ("FAILED on \"%s\" -> %s\n (got %s)\n\n",
+ printf (
+ "FAILED on \"%s\" -> %s\n (got %s)\n\n",
url_tests[i].text,
url_tests[i].url ? url_tests[i].url : "(nothing)",
url ? url : "(nothing)");
diff --git a/e-util/e-import.c b/e-util/e-import.c
index ab3afc9..8b80689 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -498,7 +498,7 @@ emph_construct_importer (EPluginHook *eph,
d (printf (" loading import item\n"));
item = g_malloc0 (sizeof (*item));
- tmp = (gchar *)xmlGetProp (root, (const guchar *)"target");
+ tmp = (gchar *) xmlGetProp (root, (const guchar *)"target");
if (tmp == NULL)
goto error;
map = g_hash_table_lookup (class->target_map, tmp);
@@ -552,7 +552,7 @@ emph_construct (EPluginHook *eph,
node = root->children;
while (node) {
- if (strcmp ((gchar *)node->name, "importer") == 0) {
+ if (strcmp ((gchar *) node->name, "importer") == 0) {
struct _EImportHookImporter *ihook;
ihook = emph_construct_importer (eph, node);
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index af9327f..9b68ccc 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -59,7 +59,7 @@ expire_dir_rec (const gchar *base,
struct stat st;
gint count = 0;
- d(printf("expire dir '%s'\n", base));
+ d (printf ("expire dir '%s'\n", base));
dir = g_dir_open (base, 0, NULL);
if (dir == NULL)
@@ -70,23 +70,23 @@ expire_dir_rec (const gchar *base,
while ((d = g_dir_read_name (dir))) {
g_string_truncate (path, len);
- g_string_append_printf(path, "/%s", d);
- d(printf("Checking '%s' for expiry\n", path->str));
+ g_string_append_printf (path, "/%s", d);
+ d (printf ("Checking '%s' for expiry\n", path->str));
if (g_stat (path->str, &st) == 0
&& st.st_atime + TEMP_EXPIRE < now) {
if (S_ISDIR (st.st_mode)) {
if (expire_dir_rec (path->str, now) == 0) {
- d(printf("Removing dir '%s'\n", path->str));
+ d (printf ("Removing dir '%s'\n", path->str));
g_rmdir (path->str);
} else {
count++;
}
} else if (g_unlink (path->str) == -1) {
- d(printf("expiry failed: %s\n", g_strerror(errno)));
+ d (printf ("expiry failed: %s\n", g_strerror (errno)));
count++;
} else {
- d(printf("expired %s\n", path->str));
+ d (printf ("expired %s\n", path->str));
}
} else {
count++;
@@ -95,7 +95,7 @@ expire_dir_rec (const gchar *base,
g_string_free (path, TRUE);
g_dir_close (dir);
- d(printf("expire dir '%s' %d remaining files\n", base, count));
+ d (printf ("expire dir '%s' %d remaining files\n", base, count));
return count;
}
@@ -120,7 +120,7 @@ get_dir (gboolean make)
}
g_free (tmpdir);
#else
- path = g_string_new("/tmp/evolution-");
+ path = g_string_new ("/tmp/evolution-");
g_string_append_printf (path, "%d", (gint) getuid ());
if (make) {
gint ret;
@@ -155,7 +155,7 @@ get_dir (gboolean make)
}
#endif
- d(printf("temp dir '%s'\n", path ? path->str : "(null)"));
+ d (printf ("temp dir '%s'\n", path ? path->str : "(null)"));
/* fire off an expiry attempt no more often than TEMP_SCAN seconds */
if (path && (last + TEMP_SCAN) < now) {
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index 1e66716..6e36654 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -526,8 +526,10 @@ e_plugin_ui_hook_init (EPluginUIHook *hook)
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
- registry = g_hash_table_new_full (g_direct_hash, g_direct_equal,
- NULL, (GDestroyNotify) g_hash_table_destroy);
+ registry = g_hash_table_new_full (
+ g_direct_hash, g_direct_equal,
+ (GDestroyNotify) NULL,
+ (GDestroyNotify) g_hash_table_destroy);
hook->priv = E_PLUGIN_UI_HOOK_GET_PRIVATE (hook);
hook->priv->ui_definitions = ui_definitions;
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 9519074..3550aad 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -142,14 +142,15 @@ ep_construct (EPlugin *ep,
gint res = -1;
gchar *localedir;
- ep->domain = e_plugin_xml_prop(root, "domain");
+ ep->domain = e_plugin_xml_prop (root, "domain");
if (ep->domain
- && (localedir = e_plugin_xml_prop(root, "localedir"))) {
+ && (localedir = e_plugin_xml_prop (root, "localedir"))) {
#ifdef G_OS_WIN32
gchar *mapped_localedir =
- e_util_replace_prefix (EVOLUTION_PREFIX,
- e_util_get_prefix (),
- localedir);
+ e_util_replace_prefix (
+ EVOLUTION_PREFIX,
+ e_util_get_prefix (),
+ localedir);
g_free (localedir);
localedir = mapped_localedir;
#endif
@@ -157,14 +158,14 @@ ep_construct (EPlugin *ep,
g_free (localedir);
}
- ep->name = e_plugin_xml_prop_domain(root, "name", ep->domain);
+ ep->name = e_plugin_xml_prop_domain (root, "name", ep->domain);
node = root->children;
while (node) {
- if (strcmp((gchar *)node->name, "hook") == 0) {
+ if (strcmp ((gchar *) node->name, "hook") == 0) {
EPluginHook *hook;
EPluginHookClass *type;
- gchar *class = e_plugin_xml_prop(node, "class");
+ gchar *class = e_plugin_xml_prop (node, "class");
if (class == NULL) {
g_warning (
@@ -176,7 +177,7 @@ ep_construct (EPlugin *ep,
if (ep->enabled
&& eph_types != NULL
- && (type = g_hash_table_lookup (
+ && (type = g_hash_table_lookup (
eph_types, class)) != NULL) {
g_free (class);
hook = g_object_new (G_OBJECT_CLASS_TYPE (type), NULL);
@@ -193,12 +194,12 @@ ep_construct (EPlugin *ep,
} else {
g_free (class);
}
- } else if (strcmp((gchar *)node->name, "description") == 0) {
+ } else if (strcmp ((gchar *) node->name, "description") == 0) {
ep->description =
e_plugin_xml_content_domain (node, ep->domain);
- } else if (strcmp((gchar *)node->name, "author") == 0) {
- gchar *name = e_plugin_xml_prop(node, "name");
- gchar *email = e_plugin_xml_prop(node, "email");
+ } else if (strcmp ((gchar *) node->name, "author") == 0) {
+ gchar *name = e_plugin_xml_prop (node, "name");
+ gchar *email = e_plugin_xml_prop (node, "email");
if (name || email) {
EPluginAuthor *epa = g_malloc0 (sizeof (*epa));
@@ -319,22 +320,22 @@ ep_load_plugin (xmlNodePtr root,
EPluginClass *class;
EPlugin *ep;
- id = e_plugin_xml_prop(root, "id");
+ id = e_plugin_xml_prop (root, "id");
if (id == NULL) {
- g_warning("Invalid e-plugin entry in '%s': no id", pdoc->filename);
+ g_warning ("Invalid e-plugin entry in '%s': no id", pdoc->filename);
return NULL;
}
if (g_hash_table_lookup (ep_plugins, id)) {
- g_warning("Plugin '%s' already defined", id);
+ g_warning ("Plugin '%s' already defined", id);
g_free (id);
return NULL;
}
- prop = (gchar *)xmlGetProp(root, (const guchar *)"type");
+ prop = (gchar *) xmlGetProp (root, (const guchar *)"type");
if (prop == NULL) {
g_free (id);
- g_warning("Invalid e-plugin entry in '%s': no type", pdoc->filename);
+ g_warning ("Invalid e-plugin entry in '%s': no type", pdoc->filename);
return NULL;
}
@@ -373,8 +374,8 @@ ep_load (const gchar *filename,
return -1;
root = xmlDocGetRootElement (doc);
- if (strcmp((gchar *)root->name, "e-plugin-list") != 0) {
- g_warning("No <e-plugin-list> root element: %s", filename);
+ if (strcmp ((gchar *) root->name, "e-plugin-list") != 0) {
+ g_warning ("No <e-plugin-list> root element: %s", filename);
xmlFreeDoc (doc);
return -1;
}
@@ -384,7 +385,7 @@ ep_load (const gchar *filename,
pdoc->filename = g_strdup (filename);
for (root = root->children; root; root = root->next) {
- if (strcmp((gchar *)root->name, "e-plugin") == 0) {
+ if (strcmp ((gchar *) root->name, "e-plugin") == 0) {
gchar *plugin_load_level, *is_system_plugin;
plugin_load_level = NULL;
@@ -517,7 +518,7 @@ e_plugin_load_plugins (void)
const gchar *d;
const gchar *path = EVOLUTION_PLUGINDIR;
- pd(printf("scanning plugin dir '%s'\n", path));
+ pd (printf ("scanning plugin dir '%s'\n", path));
dir = g_dir_open (path, 0, NULL);
if (dir == NULL) {
diff --git a/e-util/e-stock-request.c b/e-util/e-stock-request.c
index 9ee06e9..8736dba 100644
--- a/e-util/e-stock-request.c
+++ b/e-util/e-stock-request.c
@@ -117,7 +117,7 @@ handle_stock_request (GSimpleAsyncResult *res,
pixbuf, &buffer,
&buff_len, "png", NULL, NULL);
- request->priv->content_type = g_strdup("image/png");
+ request->priv->content_type = g_strdup ("image/png");
request->priv->content_length = buff_len;
g_object_unref (pixbuf);
@@ -134,7 +134,7 @@ handle_stock_request (GSimpleAsyncResult *res,
pixbuf, &buffer,
&buff_len, "png", NULL, NULL);
- request->priv->content_type = g_strdup("image/png");
+ request->priv->content_type = g_strdup ("image/png");
request->priv->content_length = buff_len;
g_object_unref (pixbuf);
@@ -180,7 +180,7 @@ stock_request_send_async (SoupRequest *request,
{
GSimpleAsyncResult *simple;
- d(printf("received request for %s\n", soup_uri_to_string (uri, FALSE)));
+ d (printf ("received request for %s\n", soup_uri_to_string (uri, FALSE)));
simple = g_simple_async_result_new (
G_OBJECT (request), callback, user_data,
@@ -197,12 +197,14 @@ stock_request_send_async (SoupRequest *request,
static GInputStream *
stock_request_send_finish (SoupRequest *request,
- GAsyncResult *result,
- GError **error)
+ GAsyncResult *result,
+ GError **error)
{
+ GSimpleAsyncResult *simple;
GInputStream *stream;
- stream = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result));
+ simple = G_SIMPLE_ASYNC_RESULT (result);
+ stream = g_simple_async_result_get_op_res_gpointer (simple);
/* Reset the stream before passing it back to webkit */
if (stream && G_IS_SEEKABLE (stream))
@@ -219,7 +221,7 @@ stock_request_get_content_length (SoupRequest *request)
{
EStockRequest *esr = E_STOCK_REQUEST (request);
- d(printf("Content-Length: %d bytes\n", esr->priv->content_length));
+ d (printf ("Content-Length: %d bytes\n", esr->priv->content_length));
return esr->priv->content_length;
}
@@ -228,12 +230,12 @@ stock_request_get_content_type (SoupRequest *request)
{
EStockRequest *esr = E_STOCK_REQUEST (request);
- d(printf("Content-Type: %s\n", esr->priv->content_type));
+ d (printf ("Content-Type: %s\n", esr->priv->content_type));
return esr->priv->content_type;
}
-static const char *data_schemes[] = { "gtk-stock", NULL };
+static const gchar *data_schemes[] = { "gtk-stock", NULL };
static void
e_stock_request_class_init (EStockRequestClass *class)
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index c457300..a5da781 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -65,26 +65,28 @@ e_text_event_processor_class_init (ETextEventProcessorClass *class)
object_class->set_property = e_text_event_processor_set_property;
object_class->get_property = e_text_event_processor_get_property;
- e_tep_signals[E_TEP_EVENT] =
- g_signal_new ("command",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ETextEventProcessorClass, command),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
-
- g_object_class_install_property (object_class, PROP_ALLOW_NEWLINES,
- g_param_spec_boolean ("allow_newlines",
- "Allow newlines",
- "Allow newlines",
- FALSE,
- G_PARAM_READWRITE));
+ e_tep_signals[E_TEP_EVENT] = g_signal_new (
+ "command",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ETextEventProcessorClass, command),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1,
+ G_TYPE_POINTER);
+
+ g_object_class_install_property (
+ object_class,
+ PROP_ALLOW_NEWLINES,
+ g_param_spec_boolean (
+ "allow_newlines",
+ "Allow newlines",
+ "Allow newlines",
+ FALSE,
+ G_PARAM_READWRITE));
class->event = NULL;
class->command = NULL;
-
}
static void
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index d922441..3ba257d 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -199,7 +199,7 @@ e_utf8_to_charset_string_sized (const gchar *charset,
if (!string) return NULL;
- ic = camel_iconv_open(charset, "utf-8");
+ ic = camel_iconv_open (charset, "utf-8");
ret = e_utf8_to_iconv_string_sized (ic, string, bytes);
camel_iconv_close (ic);
@@ -215,7 +215,7 @@ e_utf8_from_locale_string_sized (const gchar *string,
if (!string) return NULL;
- ic = camel_iconv_open("utf-8", camel_iconv_locale_charset());
+ ic = camel_iconv_open ("utf-8", camel_iconv_locale_charset ());
ret = e_utf8_from_iconv_string_sized (ic, string, bytes);
camel_iconv_close (ic);
@@ -340,7 +340,7 @@ e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent,
return ret_val;
}
- combined_name = g_strdup_printf("_%s", prop_name);
+ combined_name = g_strdup_printf ("_%s", prop_name);
prop = xmlGetProp ((xmlNode *) parent, (guchar *) combined_name);
if (prop != NULL) {
ret_val = g_strdup (gettext ((gchar *) prop));
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 707f0d0..80c0de5 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -838,7 +838,7 @@ e_color_to_value (GdkColor *color)
* e_rgba_to_value:
* @rgba: a #GdkRGBA
*
-
+ *
* Converts #GdkRGBA to a 24-bit RGB color value
*
* Returns: a 24-bit color value
@@ -856,7 +856,10 @@ e_rgba_to_value (GdkRGBA *rgba)
green = 255 * rgba->green;
blue = 255 * rgba->blue;
- return (guint32) ((((red & 0xFF) << 16) | ((green & 0xFF) << 8) | (blue & 0xFF)) & 0xffffff);
+ return (guint32)
+ ((((red & 0xFF) << 16) |
+ ((green & 0xFF) << 8) |
+ (blue & 0xFF)) & 0xffffff);
}
static gint
@@ -903,7 +906,7 @@ e_format_number (gint number)
number /= divider;
break;
case CHAR_MAX:
- group = g_strdup_printf("%d", number);
+ group = g_strdup_printf ("%d", number);
number = 0;
break;
}
@@ -933,7 +936,7 @@ e_format_number (gint number)
g_list_free (list);
return value;
} else {
- return g_strdup("0");
+ return g_strdup ("0");
}
}
@@ -1034,7 +1037,7 @@ e_strftime_fix_am_pm (gchar *str,
gchar *ffmt;
gsize ret;
- if (strstr(fmt, "%p")==NULL && strstr(fmt, "%P")==NULL) {
+ if (strstr (fmt, "%p") == NULL && strstr (fmt, "%P") == NULL) {
/* No AM/PM involved - can use the fmt string directly */
ret = e_strftime (str, max, fmt, tm);
} else {
@@ -1049,12 +1052,12 @@ e_strftime_fix_am_pm (gchar *str,
/* No AM/PM defined by locale
* must change to 24 hour clock. */
ffmt = g_strdup (fmt);
- for (sp=ffmt; (sp=strstr(sp, "%l")); sp++) {
+ for (sp = ffmt; (sp = strstr (sp, "%l")); sp++) {
/* Maybe this should be 'k', but I have never
* seen a 24 clock actually use that format. */
sp[1]='H';
}
- for (sp=ffmt; (sp=strstr(sp, "%I")); sp++) {
+ for (sp = ffmt; (sp = strstr (sp, "%I")); sp++) {
sp[1]='H';
}
ret = e_strftime (str, max, ffmt, tm);
@@ -1392,7 +1395,8 @@ e_binding_transform_color_to_string (GBinding *binding,
/* encode color manually, because css styles expect colors in #rrggbb,
* not in #rrrrggggbbbb, which is a result of gdk_color_to_string()
*/
- string = g_strdup_printf ("#%02x%02x%02x",
+ string = g_strdup_printf (
+ "#%02x%02x%02x",
(gint) color->red * 256 / 65536,
(gint) color->green * 256 / 65536,
(gint) color->blue * 256 / 65536);
diff --git a/em-format/e-mail-extension-registry.c b/em-format/e-mail-extension-registry.c
index 12bca01..00d6b55 100644
--- a/em-format/e-mail-extension-registry.c
+++ b/em-format/e-mail-extension-registry.c
@@ -129,7 +129,7 @@ e_mail_extension_registry_add_extension (EMailExtensionRegistry *reg,
}
if (camel_debug ("emformat:registry")) {
- printf("Added extension '%s' for type '%s'\n",
+ printf ("Added extension '%s' for type '%s'\n",
G_OBJECT_TYPE_NAME (extension), types[i]);
}
}
@@ -165,7 +165,7 @@ e_mail_extension_registry_remove_extension (EMailExtensionRegistry *reg,
g_queue_remove (queue, extension);
if (camel_debug ("emformat:registry")) {
- printf("Removed extension '%s' from type '%s'\n",
+ printf ("Removed extension '%s' from type '%s'\n",
G_OBJECT_TYPE_NAME (extension), types[i]);
}
}
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index d94e552..2117cf7 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -82,7 +82,7 @@ find_attachment_store (GSList *parts,
do {
GSList *iter;
- d(printf("Looking up attachment bar as %s\n", id));
+ d (printf ("Looking up attachment bar as %s\n", id));
for (iter = parts; iter; iter = iter->next) {
EMailPart *p = iter->data;
diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c
index c646828..c1a9285 100644
--- a/em-format/e-mail-formatter-headers.c
+++ b/em-format/e-mail-formatter-headers.c
@@ -173,12 +173,12 @@ write_contact_picture (CamelMimePart *part,
if (size >= 0) {
g_string_append_printf (
buffer,
- "<img width=\"%d\" src=\"evo-file://%s\" />",
+ "<img width=\"%d\" src=\"evo-file://%s\" />",
size, camel_mime_part_get_filename (part));
} else {
g_string_append_printf (
buffer,
- "<img src=\"evo-file://%s\" />",
+ "<img src=\"evo-file://%s\" />",
camel_mime_part_get_filename (part));
}
}
@@ -240,7 +240,7 @@ static void
format_full_headers (EMailFormatter *formatter,
GString *buffer,
CamelMedium *part,
- guint32 mode,
+ guint32 mode,
guint32 flags,
GCancellable *cancellable)
{
@@ -283,7 +283,7 @@ format_full_headers (EMailFormatter *formatter,
if (!(addrs = camel_header_address_decode (header->value, hdr_charset)))
break;
- html = g_string_new("");
+ html = g_string_new ("");
name = e_mail_formatter_format_address (
formatter, html, addrs, header->name, FALSE,
~(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE));
@@ -300,7 +300,7 @@ format_full_headers (EMailFormatter *formatter,
if (!(addrs = camel_header_address_decode (header->value, hdr_charset)))
break;
- html = g_string_new("");
+ html = g_string_new ("");
name = e_mail_formatter_format_address (
formatter, html, addrs, header->name, FALSE,
!(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE));
@@ -411,7 +411,7 @@ format_full_headers (EMailFormatter *formatter,
e_mail_formatter_format_header (
formatter, buffer, part,
&xmailer, h->flags, charset);
- if (strstr(use_header->value, "Evolution"))
+ if (strstr (use_header->value, "Evolution"))
have_icon = TRUE;
} else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) {
gchar *cp = header->value;
diff --git a/em-format/e-mail-formatter-message-rfc822.c b/em-format/e-mail-formatter-message-rfc822.c
index 11079d2..9ec393c 100644
--- a/em-format/e-mail-formatter-message-rfc822.c
+++ b/em-format/e-mail-formatter-message-rfc822.c
@@ -35,7 +35,7 @@
#include <string.h>
-static const gchar* formatter_mime_types[] = { "message/rfc822",
+static const gchar * formatter_mime_types[] = { "message/rfc822",
"application/vnd.evolution.rfc822.end",
NULL };
diff --git a/em-format/e-mail-formatter-quote-headers.c b/em-format/e-mail-formatter-quote-headers.c
index 064e4b2..9d0ea33 100644
--- a/em-format/e-mail-formatter-quote-headers.c
+++ b/em-format/e-mail-formatter-quote-headers.c
@@ -62,14 +62,13 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_FORMATTER_EXTENSION,
e_mail_formatter_quote_formatter_extension_interface_init))
-
static void
emfqe_format_text_header (EMailFormatter *emf,
- GString *buffer,
- const gchar *label,
- const gchar *value,
- guint32 flags,
- gint is_html)
+ GString *buffer,
+ const gchar *label,
+ const gchar *value,
+ guint32 flags,
+ gint is_html)
{
const gchar *html;
gchar *mhtml = NULL;
@@ -104,11 +103,11 @@ static const gchar *addrspec_hdrs[] = {
static void
emfqe_format_header (EMailFormatter *formatter,
- GString *buffer,
- CamelMedium *part,
- struct _camel_header_raw *header,
- guint32 flags,
- const gchar *charset)
+ GString *buffer,
+ CamelMedium *part,
+ struct _camel_header_raw *header,
+ guint32 flags,
+ const gchar *charset)
{
CamelMimeMessage *msg = (CamelMimeMessage *) part;
gchar *name, *buf, *value = NULL;
@@ -193,7 +192,6 @@ emfqe_format_header (EMailFormatter *formatter,
g_free (value);
}
-
static gboolean
emqfe_headers_format (EMailFormatterExtension *extension,
EMailFormatter *formatter,
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c b/em-format/e-mail-formatter-quote-message-rfc822.c
index 531815d..ae2433f 100644
--- a/em-format/e-mail-formatter-quote-message-rfc822.c
+++ b/em-format/e-mail-formatter-quote-message-rfc822.c
@@ -35,7 +35,7 @@
#include <string.h>
-static const gchar* formatter_mime_types[] = { "message/rfc822",
+static const gchar * formatter_mime_types[] = { "message/rfc822",
"application/vnd.evolution.rfc822.end",
NULL };
diff --git a/em-format/e-mail-formatter-quote-text-plain.c b/em-format/e-mail-formatter-quote-text-plain.c
index 90ed572..4da491c 100644
--- a/em-format/e-mail-formatter-quote-text-plain.c
+++ b/em-format/e-mail-formatter-quote-text-plain.c
@@ -89,9 +89,9 @@ emqfe_text_plain_format (EMailFormatterExtension *extension,
/* Check for RFC 2646 flowed text. */
type = camel_mime_part_get_content_type (part->part);
- if (camel_content_type_is(type, "text", "plain")
- && (format = camel_content_type_param(type, "format"))
- && !g_ascii_strcasecmp(format, "flowed"))
+ if (camel_content_type_is (type, "text", "plain")
+ && (format = camel_content_type_param (type, "format"))
+ && !g_ascii_strcasecmp (format, "flowed"))
text_flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED;
filtered_stream = camel_stream_filter_new (stream);
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c
index 6cc34d0..48d037c 100644
--- a/em-format/e-mail-formatter-secure-button.c
+++ b/em-format/e-mail-formatter-secure-button.c
@@ -113,7 +113,7 @@ static void
viewcert_clicked (GtkWidget *button,
GtkWidget *parent)
{
- CamelCipherCertInfo *info = g_object_get_data((GObject *) button, "e-cert-info");
+ CamelCipherCertInfo *info = g_object_get_data ((GObject *) button, "e-cert-info");
ECert *ec = NULL;
if (info->cert_data)
@@ -134,7 +134,7 @@ viewcert_clicked (GtkWidget *button,
g_object_unref (ec);
} else {
- g_warning("can't find certificate for %s <%s>",
+ g_warning ("can't find certificate for %s <%s>",
info->name ? info->name : "",
info->email ? info->email : "");
}
@@ -169,7 +169,7 @@ add_cert_table (GtkWidget *grid,
if (info->name) {
if (info->email && strcmp (info->name, info->email) != 0)
- l = la = g_strdup_printf("%s <%s>", info->name, info->email);
+ l = la = g_strdup_printf ("%s <%s>", info->name, info->email);
else
l = info->name;
} else {
@@ -187,9 +187,9 @@ add_cert_table (GtkWidget *grid,
g_free (la);
gtk_table_attach (table, w, 0, 1, n, n + 1, GTK_FILL, GTK_FILL, 3, 3);
#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
- w = gtk_button_new_with_mnemonic(_("_View Certificate"));
+ w = gtk_button_new_with_mnemonic (_("_View Certificate"));
gtk_table_attach (table, w, 1, 2, n, n + 1, 0, 0, 3, 3);
- g_object_set_data((GObject *)w, "e-cert-info", info);
+ g_object_set_data ((GObject *) w, "e-cert-info", info);
g_signal_connect (
w, "clicked",
G_CALLBACK (viewcert_clicked), grid);
@@ -274,9 +274,9 @@ secure_button_clicked_cb (GtkWidget *widget,
builder = gtk_builder_new ();
e_load_ui_builder_definition (builder, "mail-dialogs.ui");
- dialog = e_builder_get_widget(builder, "message_security_dialog");
+ dialog = e_builder_get_widget (builder, "message_security_dialog");
- grid = e_builder_get_widget(builder, "signature_grid");
+ grid = e_builder_get_widget (builder, "signature_grid");
w = gtk_label_new (_(smime_sign_table[part->validity->sign.status].description));
gtk_misc_set_alignment ((GtkMisc *) w, 0.0, 0.5);
gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
@@ -293,7 +293,7 @@ secure_button_clicked_cb (GtkWidget *widget,
"vscrollbar_policy", GTK_POLICY_AUTOMATIC,
"shadow_type", GTK_SHADOW_IN,
"expand", TRUE,
- "child", g_object_new(gtk_text_view_get_type(),
+ "child", g_object_new (gtk_text_view_get_type (),
"buffer", buffer,
"cursor_visible", FALSE,
"editable", FALSE,
@@ -312,7 +312,7 @@ secure_button_clicked_cb (GtkWidget *widget,
gtk_widget_show_all (grid);
- grid = e_builder_get_widget(builder, "encryption_grid");
+ grid = e_builder_get_widget (builder, "encryption_grid");
w = gtk_label_new (_(smime_encrypt_table[part->validity->encrypt.status].description));
gtk_misc_set_alignment ((GtkMisc *) w, 0.0, 0.5);
gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
@@ -329,7 +329,7 @@ secure_button_clicked_cb (GtkWidget *widget,
"vscrollbar_policy", GTK_POLICY_AUTOMATIC,
"shadow_type", GTK_SHADOW_IN,
"expand", TRUE,
- "child", g_object_new(gtk_text_view_get_type(),
+ "child", g_object_new (gtk_text_view_get_type (),
"buffer", buffer,
"cursor_visible", FALSE,
"editable", FALSE,
diff --git a/em-format/e-mail-formatter-text-enriched.c b/em-format/e-mail-formatter-text-enriched.c
index 56dcdef..cd01b4d 100644
--- a/em-format/e-mail-formatter-text-enriched.c
+++ b/em-format/e-mail-formatter-text-enriched.c
@@ -73,7 +73,7 @@ emfe_text_enriched_format (EMailFormatterExtension *extension,
if (g_cancellable_is_cancelled (cancellable))
return FALSE;
- if (!g_strcmp0(part->mime_type, "text/richtext")) {
+ if (!g_strcmp0 (part->mime_type, "text/richtext")) {
filter_flags = CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT;
}
diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c
index e5d25a3..f4fb3ea 100644
--- a/em-format/e-mail-formatter-text-html.c
+++ b/em-format/e-mail-formatter-text-html.c
@@ -219,7 +219,7 @@ emfe_text_html_format (EMailFormatterExtension *extension,
} while (pos);
if (tags)
- printf("\n\n**%s**\n\n", (gchar *) tags->data);
+ printf ("\n\n**%s**\n\n", (gchar *) tags->data);
/* Something's wrong, let's write the entire HTML and hope
* that WebKit can handle it */
diff --git a/em-format/e-mail-formatter-text-plain.c b/em-format/e-mail-formatter-text-plain.c
index e7147e8..7fd63b5 100644
--- a/em-format/e-mail-formatter-text-plain.c
+++ b/em-format/e-mail-formatter-text-plain.c
@@ -100,9 +100,9 @@ emfe_text_plain_format (EMailFormatterExtension *extension,
return FALSE;
/* Check for RFC 2646 flowed text. */
- if (camel_content_type_is(dw->mime_type, "text", "plain")
- && (format = camel_content_type_param(dw->mime_type, "format"))
- && !g_ascii_strcasecmp(format, "flowed"))
+ if (camel_content_type_is (dw->mime_type, "text", "plain")
+ && (format = camel_content_type_param (dw->mime_type, "format"))
+ && !g_ascii_strcasecmp (format, "flowed"))
filter_flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED;
rgb = e_color_to_value ((GdkColor *)
diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c
index 994b257..883d985 100644
--- a/em-format/e-mail-formatter-utils.c
+++ b/em-format/e-mail-formatter-utils.c
@@ -130,7 +130,7 @@ e_mail_formatter_format_address (EMailFormatter *formatter,
/* rfc2368 for mailto syntax and url encoding extras */
if ((real = camel_header_encode_phrase ((guchar *) a->name))) {
- mailaddr = g_strdup_printf("%s <%s>", real, a->v.addr);
+ mailaddr = g_strdup_printf ("%s <%s>", real, a->v.addr);
g_free (real);
mailto = camel_url_encode (mailaddr, "?=&()");
g_free (mailaddr);
@@ -288,7 +288,7 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
g_free (buf);
- html = g_string_new("");
+ html = g_string_new ("");
img = e_mail_formatter_format_address (formatter, html, addrs, (gchar *) label,
(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS),
!(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE));
@@ -311,7 +311,7 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
g_free (buf);
flags |= E_MAIL_FORMATTER_HEADER_FLAG_BOLD;
- } else if (!strcmp(name, "X-evolution-mailer")) {
+ } else if (!strcmp (name, "X-evolution-mailer")) {
/* pseudo-header */
label = _("Mailer");
txt = value = camel_header_format_ctext (header->value, charset);
@@ -363,7 +363,7 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
}
flags |= E_MAIL_FORMATTER_HEADER_FLAG_HTML |
E_MAIL_FORMATTER_HEADER_FLAG_BOLD;
- } else if (!strcmp(name, "Newsgroups")) {
+ } else if (!strcmp (name, "Newsgroups")) {
struct _camel_header_newsgroup *ng, *scan;
GString *html;
@@ -376,17 +376,17 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
g_free (buf);
- html = g_string_new("");
+ html = g_string_new ("");
scan = ng;
while (scan) {
if (flags & E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS)
g_string_append_printf (html, "%s", scan->newsgroup);
else
- g_string_append_printf(html, "<a href=\"news:%s\";>%s</a>",
+ g_string_append_printf (html, "<a href=\"news:%s\";>%s</a>",
scan->newsgroup, scan->newsgroup);
scan = scan->next;
if (scan)
- g_string_append_printf(html, ", ");
+ g_string_append_printf (html, ", ");
}
camel_header_newsgroups_free (ng);
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 2177916..ac16647 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -865,7 +865,7 @@ e_mail_formatter_format_finished (EMailFormatter *formatter,
g_return_val_if_fail (E_IS_MAIL_FORMATTER (formatter), NULL);
g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL);
- context = g_object_get_data (G_OBJECT (result), "context");
+ context = g_object_get_data (G_OBJECT (result), "context");
g_free (context->message_uid);
g_object_unref (context->message);
@@ -935,7 +935,7 @@ e_mail_formatter_format_as (EMailFormatter *formatter,
ok = FALSE;
- d(printf("(%d) Formatting for part %s of type %s (found %d formatters)\n",
+ d (printf ("(%d) Formatting for part %s of type %s (found %d formatters)\n",
_call_i, part->id, as_mime_type,
formatters ? g_queue_get_length (formatters) : 0));
@@ -952,9 +952,9 @@ e_mail_formatter_format_as (EMailFormatter *formatter,
extension, formatter, context,
part, stream, cancellable);
- d(printf("\t(%d) trying %s...%s\n", _call_i,
+ d (printf ("\t(%d) trying %s...%s\n", _call_i,
G_OBJECT_TYPE_NAME (extension),
- ok ? "OK" : "failed"));
+ ok ? "OK" : "failed"));
if (ok)
break;
@@ -995,7 +995,7 @@ e_mail_formatter_format_text (EMailFormatter *formatter,
charset = formatter->priv->charset;
} else if (dw->mime_type
&& (charset = camel_content_type_param (dw->mime_type, "charset"))
- && g_ascii_strncasecmp(charset, "iso-8859-", 9) == 0) {
+ && g_ascii_strncasecmp (charset, "iso-8859-", 9) == 0) {
CamelStream *null;
/* Since a few Windows mailers like to claim they sent
diff --git a/em-format/e-mail-inline-filter.c b/em-format/e-mail-inline-filter.c
index aa65708..0c2e6b8 100644
--- a/em-format/e-mail-inline-filter.c
+++ b/em-format/e-mail-inline-filter.c
@@ -184,9 +184,9 @@ inline_filter_add_part (EMailInlineFilter *emif,
camel_mime_part_set_filename (part, emif->filename);
/* pre-snoop the mime type of unknown objects, and poke and hack it into place */
- if (camel_content_type_is(dw->mime_type, "application", "octet-stream")
+ if (camel_content_type_is (dw->mime_type, "application", "octet-stream")
&& (mimetype = e_mail_part_snoop_type (part))
- && strcmp(mimetype, "application/octet-stream") != 0) {
+ && strcmp (mimetype, "application/octet-stream") != 0) {
camel_data_wrapper_set_mime_type (dw, mimetype);
camel_mime_part_set_content_type (part, mimetype);
if (emif->filename)
diff --git a/em-format/e-mail-parser-application-mbox.c b/em-format/e-mail-parser-application-mbox.c
index c4c6b50..500b6bb 100644
--- a/em-format/e-mail-parser-application-mbox.c
+++ b/em-format/e-mail-parser-application-mbox.c
@@ -57,7 +57,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "application/mbox",
+static const gchar * parser_mime_types[] = { "application/mbox",
NULL };
static GSList *
diff --git a/em-format/e-mail-parser-application-smime.c b/em-format/e-mail-parser-application-smime.c
index 877e8cb..11513e3 100644
--- a/em-format/e-mail-parser-application-smime.c
+++ b/em-format/e-mail-parser-application-smime.c
@@ -57,7 +57,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "application/xpkcs7mime",
+static const gchar * parser_mime_types[] = { "application/xpkcs7mime",
"application/x-pkcs7-mime",
"application/pkcs7-mime",
"application/pkcs7-signature",
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c
index e3c064a..ebdc274 100644
--- a/em-format/e-mail-parser-inlinepgp-encrypted.c
+++ b/em-format/e-mail-parser-inlinepgp-encrypted.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "application/x-inlinepgp-encrypted",
+static const gchar * parser_mime_types[] = { "application/x-inlinepgp-encrypted",
NULL };
static GSList *
@@ -97,7 +97,7 @@ empe_inlinepgp_encrypted_parse (EMailParserExtension *extension,
parts = g_slist_concat (parts,
e_mail_parser_parse_part_as (parser,
part, part_id,
- "application/vnd.evolution.source",
+ "application/vnd.evolution.source",
cancellable));
g_object_unref (cipher);
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c
index 53ecaf8..82b8c98 100644
--- a/em-format/e-mail-parser-inlinepgp-signed.c
+++ b/em-format/e-mail-parser-inlinepgp-signed.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "application/x-inlinepgp-signed",
+static const gchar * parser_mime_types[] = { "application/x-inlinepgp-signed",
NULL };
static GSList *
@@ -100,7 +100,7 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension,
parts = g_slist_concat (parts,
e_mail_parser_parse_part_as (
parser, part, part_id,
- "application/vnd.evolution.source",
+ "application/vnd.evolution.source",
cancellable));
g_object_unref (cipher);
diff --git a/em-format/e-mail-parser-message-deliverystatus.c b/em-format/e-mail-parser-message-deliverystatus.c
index b4aeaf3..3a86a93 100644
--- a/em-format/e-mail-parser-message-deliverystatus.c
+++ b/em-format/e-mail-parser-message-deliverystatus.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "message/delivery-status",
+static const gchar * parser_mime_types[] = { "message/delivery-status",
"message/feedback-report",
"message/disposition-notification",
NULL };
diff --git a/em-format/e-mail-parser-message-external.c b/em-format/e-mail-parser-message-external.c
index 3c99e2d..99b6b8b 100644
--- a/em-format/e-mail-parser-message-external.c
+++ b/em-format/e-mail-parser-message-external.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "message/external-body",
+static const gchar * parser_mime_types[] = { "message/external-body",
NULL };
static GSList *
@@ -89,8 +89,8 @@ empe_msg_external_parse (EMailParserExtension *extension,
goto addPart;
}
- if (!g_ascii_strcasecmp(access_type, "ftp") ||
- !g_ascii_strcasecmp(access_type, "anon-ftp")) {
+ if (!g_ascii_strcasecmp (access_type, "ftp") ||
+ !g_ascii_strcasecmp (access_type, "anon-ftp")) {
const gchar *name, *site, *dir, *mode;
gchar *path;
gchar ftype[16];
@@ -104,12 +104,12 @@ empe_msg_external_parse (EMailParserExtension *extension,
/* Generate the path. */
if (dir)
- path = g_strdup_printf("/%s/%s", *dir=='/'?dir+1:dir, name);
+ path = g_strdup_printf ("/%s/%s", *dir == '/' ? dir + 1 : dir, name);
else
- path = g_strdup_printf("/%s", *name=='/'?name+1:name);
+ path = g_strdup_printf ("/%s", *name == '/' ? name + 1 : name);
if (mode && *mode)
- sprintf(ftype, ";type=%c", *mode);
+ sprintf (ftype, ";type=%c", *mode);
else
ftype[0] = 0;
@@ -126,9 +126,9 @@ empe_msg_external_parse (EMailParserExtension *extension,
url = g_filename_to_uri (name, NULL, NULL);
if (site)
- desc = g_strdup_printf(_("Pointer to local file (%s) valid at site \"%s\""), name, site);
+ desc = g_strdup_printf (_("Pointer to local file (%s) valid at site \"%s\""), name, site);
else
- desc = g_strdup_printf(_("Pointer to local file (%s)"), name);
+ desc = g_strdup_printf (_("Pointer to local file (%s)"), name);
} else if (!g_ascii_strcasecmp (access_type, "URL")) {
const gchar *urlparam;
gchar *s, *d;
diff --git a/em-format/e-mail-parser-message-rfc822.c b/em-format/e-mail-parser-message-rfc822.c
index c80dfd2..4632c6e 100644
--- a/em-format/e-mail-parser-message-rfc822.c
+++ b/em-format/e-mail-parser-message-rfc822.c
@@ -58,7 +58,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "message/rfc822",
+static const gchar * parser_mime_types[] = { "message/rfc822",
"message/news",
NULL };
diff --git a/em-format/e-mail-parser-multipart-alternative.c b/em-format/e-mail-parser-multipart-alternative.c
index 2239279..74826da 100644
--- a/em-format/e-mail-parser-multipart-alternative.c
+++ b/em-format/e-mail-parser-multipart-alternative.c
@@ -54,7 +54,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "multipart/alternative", NULL };
+static const gchar * parser_mime_types[] = { "multipart/alternative", NULL };
static gboolean
related_display_part_is_attachment (CamelMimePart *part)
@@ -146,7 +146,7 @@ empe_mp_alternative_parse (EMailParserExtension *extension,
if (best) {
gint len = part_id->len;
- g_string_append_printf(part_id, ".alternative.%d", bestid);
+ g_string_append_printf (part_id, ".alternative.%d", bestid);
parts = e_mail_parser_parse_part (
parser, best, part_id, cancellable);
diff --git a/em-format/e-mail-parser-multipart-appledouble.c b/em-format/e-mail-parser-multipart-appledouble.c
index 65b619f..f8e1cf3 100644
--- a/em-format/e-mail-parser-multipart-appledouble.c
+++ b/em-format/e-mail-parser-multipart-appledouble.c
@@ -50,7 +50,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "multipart/appledouble", NULL };
+static const gchar * parser_mime_types[] = { "multipart/appledouble", NULL };
static GSList *
empe_mp_appledouble_parse (EMailParserExtension *extension,
@@ -80,7 +80,7 @@ empe_mp_appledouble_parse (EMailParserExtension *extension,
gint len;
/* try the data fork for something useful, doubtful but who knows */
len = part_id->len;
- g_string_append_printf(part_id, ".appledouble.1");
+ g_string_append_printf (part_id, ".appledouble.1");
parts = e_mail_parser_parse_part (
parser, mime_part, part_id, cancellable);
diff --git a/em-format/e-mail-parser-multipart-digest.c b/em-format/e-mail-parser-multipart-digest.c
index 3b20ba8..e723b7e 100644
--- a/em-format/e-mail-parser-multipart-digest.c
+++ b/em-format/e-mail-parser-multipart-digest.c
@@ -53,7 +53,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "multipart/digest",
+static const gchar * parser_mime_types[] = { "multipart/digest",
NULL };
static GSList *
@@ -91,7 +91,7 @@ empe_mp_digest_parse (EMailParserExtension *extension,
if (!subpart)
continue;
- g_string_append_printf(part_id, ".digest.%d", i);
+ g_string_append_printf (part_id, ".digest.%d", i);
ct = camel_mime_part_get_content_type (subpart);
diff --git a/em-format/e-mail-parser-multipart-encrypted.c b/em-format/e-mail-parser-multipart-encrypted.c
index 7cf7242..e85bcd2 100644
--- a/em-format/e-mail-parser-multipart-encrypted.c
+++ b/em-format/e-mail-parser-multipart-encrypted.c
@@ -52,7 +52,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init))
-static const gchar* parser_mime_types[] = { "multipart/encrypted", NULL };
+static const gchar * parser_mime_types[] = { "multipart/encrypted", NULL };
static GSList *
empe_mp_encrypted_parse (EMailParserExtension *extension,
@@ -84,7 +84,7 @@ empe_mp_encrypted_parse (EMailParserExtension *extension,
parts,
e_mail_parser_parse_part_as (
parser, part, part_id,
- "application/vnd.evolution/source",
+ "application/vnd.evolution/source",
cancellable));
return parts;
@@ -92,7 +92,7 @@ empe_mp_encrypted_parse (EMailParserExtension *extension,
/* Currently we only handle RFC2015-style PGP encryption. */
protocol = camel_content_type_param (
- ((CamelDataWrapper *)mpe)->mime_type, "protocol");
+ ((CamelDataWrapper *) mpe)->mime_type, "protocol");
if (!protocol || g_ascii_strcasecmp (protocol, "application/pgp-encrypted") != 0) {
parts = e_mail_parser_error (
parser, cancellable,
@@ -102,7 +102,7 @@ empe_mp_encrypted_parse (EMailParserExtension *extension,
parts,
e_mail_parser_parse_part_as (
parser, part, part_id,
- "multipart/mixed", cancellable));
+ "multipart/mixed", cancellable));
return parts;
}
@@ -126,7 +126,7 @@ empe_mp_encrypted_parse (EMailParserExtension *extension,
parts = g_slist_concat (parts,
e_mail_parser_parse_part_as (
parser, part, part_id,
- "multipart/mixed", cancellable));
+ "multipart/mixed", cancellable));
g_object_unref (opart);
g_object_unref (context);
diff --git a/em-format/e-mail-parser-multipart-mixed.c b/em-format/e-mail-parser-multipart-mixed.c
index 33663d8..e00174c 100644
--- a/em-format/e-mail-parser-multipart-mixed.c
+++ b/em-format/e-mail-parser-multipart-mixed.c
@@ -54,7 +54,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "multipart/mixed",
+static const gchar * parser_mime_types[] = { "multipart/mixed",
"multipart/report",
"multipart/*",
NULL };
@@ -92,7 +92,7 @@ empe_mp_mixed_parse (EMailParserExtension *extension,
subpart = camel_multipart_get_part (mp, i);
- g_string_append_printf(part_id, ".mixed.%d", i);
+ g_string_append_printf (part_id, ".mixed.%d", i);
new_parts = e_mail_parser_parse_part (
parser, subpart, part_id, cancellable);
diff --git a/em-format/e-mail-parser-multipart-related.c b/em-format/e-mail-parser-multipart-related.c
index 548c136..e72b61e 100644
--- a/em-format/e-mail-parser-multipart-related.c
+++ b/em-format/e-mail-parser-multipart-related.c
@@ -54,7 +54,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "multipart/related",
+static const gchar * parser_mime_types[] = { "multipart/related",
NULL };
static GSList *
@@ -90,7 +90,7 @@ empe_mp_related_parse (EMailParserExtension *extension,
/* The to-be-displayed part goes first */
partidlen = part_id->len;
- g_string_append_printf(part_id, ".related.%d", displayid);
+ g_string_append_printf (part_id, ".related.%d", displayid);
parts = e_mail_parser_parse_part (
parser, display_part, part_id, cancellable);
@@ -107,7 +107,7 @@ empe_mp_related_parse (EMailParserExtension *extension,
if (body_part == display_part)
continue;
- g_string_append_printf(part_id, ".related.%d", i);
+ g_string_append_printf (part_id, ".related.%d", i);
list = e_mail_parser_parse_part (
parser, body_part, part_id, cancellable);
diff --git a/em-format/e-mail-parser-multipart-signed.c b/em-format/e-mail-parser-multipart-signed.c
index 5dc07eb..bd6e1e2 100644
--- a/em-format/e-mail-parser-multipart-signed.c
+++ b/em-format/e-mail-parser-multipart-signed.c
@@ -52,7 +52,7 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "multipart/signed",
+static const gchar * parser_mime_types[] = { "multipart/signed",
"application/pgp-signature",
NULL };
@@ -108,13 +108,13 @@ empe_mp_signed_parse (EMailParserExtension *extension,
/* FIXME: duplicated in em-format-html-display.c */
if (mps->protocol) {
#ifdef ENABLE_SMIME
- if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0
- || g_ascii_strcasecmp("application/pkcs7-signature", mps->protocol) == 0) {
+ if (g_ascii_strcasecmp ("application/x-pkcs7-signature", mps->protocol) == 0
+ || g_ascii_strcasecmp ("application/pkcs7-signature", mps->protocol) == 0) {
cipher = camel_smime_context_new (session);
validity_type = E_MAIL_PART_VALIDITY_SMIME;
} else {
#endif
- if (g_ascii_strcasecmp("application/pgp-signature", mps->protocol) == 0) {
+ if (g_ascii_strcasecmp ("application/pgp-signature", mps->protocol) == 0) {
cipher = camel_gpg_context_new (session);
validity_type = E_MAIL_PART_VALIDITY_PGP;
}
@@ -131,7 +131,7 @@ empe_mp_signed_parse (EMailParserExtension *extension,
parts = g_slist_concat (parts,
e_mail_parser_parse_part_as (
parser, part, part_id,
- "multipart/mixed", cancellable));
+ "multipart/mixed", cancellable));
return parts;
}
@@ -166,7 +166,7 @@ empe_mp_signed_parse (EMailParserExtension *extension,
GSList *mail_parts, *iter;
subpart = camel_multipart_get_part (CAMEL_MULTIPART (mps), i);
- g_string_append_printf(part_id, ".signed.%d", i);
+ g_string_append_printf (part_id, ".signed.%d", i);
mail_parts = e_mail_parser_parse_part (
parser, subpart, part_id, cancellable);
diff --git a/em-format/e-mail-parser.c b/em-format/e-mail-parser.c
index d6ea080..3b1b2a2 100644
--- a/em-format/e-mail-parser.c
+++ b/em-format/e-mail-parser.c
@@ -311,13 +311,13 @@ e_mail_parser_parse_sync (EMailParser *parser,
if (camel_debug_start ("emformat:parser")) {
GSList *iter;
- printf("%s finished with EMailPartList:\n",
+ printf ("%s finished with EMailPartList:\n",
G_OBJECT_TYPE_NAME (parser));
for (iter = parts_list->list; iter; iter = iter->next) {
EMailPart *part = iter->data;
if (!part) continue;
- printf(" id: %s | cid: %s | mime_type: %s | is_hidden: %d | is_attachment: %d\n",
+ printf (" id: %s | cid: %s | mime_type: %s | is_hidden: %d | is_attachment: %d\n",
part->id, part->cid, part->mime_type,
part->is_hidden ? 1 : 0, part->is_attachment ? 1 : 0);
}
@@ -402,13 +402,13 @@ e_mail_parser_parse_finish (EMailParser *parser,
if (camel_debug_start ("emformat:parser")) {
GSList *iter;
- printf("%s finished with EMailPartList:\n",
+ printf ("%s finished with EMailPartList:\n",
G_OBJECT_TYPE_NAME (parser));
for (iter = parts_list->list; iter; iter = iter->next) {
EMailPart *part = iter->data;
if (!part) continue;
- printf(" id: %s | cid: %s | mime_type: %s | is_hidden: %d | is_attachment: %d\n",
+ printf (" id: %s | cid: %s | mime_type: %s | is_hidden: %d | is_attachment: %d\n",
part->id, part->cid, part->mime_type,
part->is_hidden ? 1 : 0, part->is_attachment ? 1 : 0);
}
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index 858209b..0d96d56 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -111,8 +111,8 @@ e_mail_part_snoop_type (CamelMimePart *part)
if (magic_type) {
if (name_type
- && (!strcmp(magic_type, "text/plain")
- || !strcmp(magic_type, "application/octet-stream")))
+ && (!strcmp (magic_type, "text/plain")
+ || !strcmp (magic_type, "application/octet-stream")))
res = name_type;
else
res = magic_type;
@@ -141,7 +141,7 @@ e_mail_part_snoop_type (CamelMimePart *part)
}
}
- d(printf("Snooped mime type %s\n", res));
+ d (printf ("Snooped mime type %s\n", res));
return res;
/* We used to load parts to check their type, we don't anymore,
@@ -172,7 +172,7 @@ e_mail_part_is_attachment (CamelMimePart *part)
if (!dw)
return 0;
- d(printf("checking is attachment %s/%s\n", dw->mime_type->type, dw->mime_type->subtype));
+ d (printf ("checking is attachment %s/%s\n", dw->mime_type->type, dw->mime_type->subtype));
return !(camel_content_type_is (dw->mime_type, "multipart", "*")
|| camel_content_type_is (
dw->mime_type, "application", "x-pkcs7-mime")
@@ -484,7 +484,7 @@ e_mail_part_describe (CamelMimePart *part,
const gchar *filename, *description;
gchar *content_type, *desc;
- stext = g_string_new("");
+ stext = g_string_new ("");
content_type = g_content_type_from_mime_type (mime_type);
desc = g_content_type_get_description (
content_type != NULL ? content_type : mime_type);
diff --git a/filter/e-filter-code.c b/filter/e-filter-code.c
index 0476f06..394f682 100644
--- a/filter/e-filter-code.c
+++ b/filter/e-filter-code.c
@@ -44,7 +44,7 @@ filter_code_build_code (EFilterElement *element,
gboolean is_rawcode = fi && fi->type && g_str_equal (fi->type, "rawcode");
if (!is_rawcode)
- g_string_append(out, "(match-all ");
+ g_string_append (out, "(match-all ");
l = fi->values;
while (l) {
@@ -95,7 +95,7 @@ e_filter_code_new (gboolean raw_code)
if (fc && raw_code) {
xmlFree (((EFilterInput *) fc)->type);
- ((EFilterInput *) fc)->type = (gchar *)xmlStrdup ((xmlChar *)"rawcode");
+ ((EFilterInput *) fc)->type = (gchar *) xmlStrdup ((xmlChar *)"rawcode");
}
return fc;
diff --git a/filter/e-filter-color.c b/filter/e-filter-color.c
index 1540841..3b39cab 100644
--- a/filter/e-filter-color.c
+++ b/filter/e-filter-color.c
@@ -63,10 +63,10 @@ filter_color_xml_encode (EFilterElement *element)
g_snprintf (spec, sizeof (spec), "#%04x%04x%04x",
fc->color.red, fc->color.green, fc->color.blue);
- value = xmlNewNode(NULL, (xmlChar *)"value");
- xmlSetProp(value, (xmlChar *)"type", (xmlChar *)"colour");
- xmlSetProp(value, (xmlChar *)"name", (xmlChar *)element->name);
- xmlSetProp(value, (xmlChar *)"spec", (xmlChar *)spec);
+ value = xmlNewNode (NULL, (xmlChar *)"value");
+ xmlSetProp (value, (xmlChar *)"type", (xmlChar *)"colour");
+ xmlSetProp (value, (xmlChar *)"name", (xmlChar *) element->name);
+ xmlSetProp (value, (xmlChar *)"spec", (xmlChar *) spec);
return value;
}
@@ -79,22 +79,22 @@ filter_color_xml_decode (EFilterElement *element,
xmlChar *prop;
xmlFree (element->name);
- element->name = (gchar *)xmlGetProp(node, (xmlChar *)"name");
+ element->name = (gchar *) xmlGetProp (node, (xmlChar *)"name");
- prop = xmlGetProp(node, (xmlChar *)"spec");
+ prop = xmlGetProp (node, (xmlChar *)"spec");
if (prop != NULL) {
gdk_color_parse ((gchar *) prop, &fc->color);
xmlFree (prop);
} else {
/* try reading the old RGB properties */
- prop = xmlGetProp(node, (xmlChar *)"red");
- sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.red);
+ prop = xmlGetProp (node, (xmlChar *)"red");
+ sscanf ((gchar *) prop, "%" G_GINT16_MODIFIER "x", &fc->color.red);
xmlFree (prop);
- prop = xmlGetProp(node, (xmlChar *)"green");
- sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.green);
+ prop = xmlGetProp (node, (xmlChar *)"green");
+ sscanf ((gchar *) prop, "%" G_GINT16_MODIFIER "x", &fc->color.green);
xmlFree (prop);
- prop = xmlGetProp(node, (xmlChar *)"blue");
- sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue);
+ prop = xmlGetProp (node, (xmlChar *)"blue");
+ sscanf ((gchar *) prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue);
xmlFree (prop);
}
diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c
index 58685e0..2464dd2 100644
--- a/filter/e-filter-datespec.c
+++ b/filter/e-filter-datespec.c
@@ -66,20 +66,20 @@ typedef struct {
/* Don't delete this code, since it is needed so that xgettext can extract the translations.
* Please, keep these strings in sync with the strings in the timespans array */
- ngettext("1 second ago", "%d seconds ago", 1);
- ngettext("1 second in the future", "%d seconds in the future", 1);
- ngettext("1 minute ago", "%d minutes ago", 1);
- ngettext("1 minute in the future", "%d minutes in the future", 1);
- ngettext("1 hour ago", "%d hours ago", 1);
- ngettext("1 hour in the future", "%d hours in the future", 1);
- ngettext("1 day ago", "%d days ago", 1);
- ngettext("1 day in the future", "%d days in the future", 1);
- ngettext("1 week ago", "%d weeks ago", 1);
- ngettext("1 week in the future", "%d weeks in the future", 1)
- ngettext("1 month ago", "%d months ago", 1);
- ngettext("1 month in the future", "%d months in the future", 1);
- ngettext("1 year ago", "%d years ago", 1);
- ngettext("1 year in the future", "%d years in the future", 1);
+ ngettext ("1 second ago", "%d seconds ago", 1);
+ ngettext ("1 second in the future", "%d seconds in the future", 1);
+ ngettext ("1 minute ago", "%d minutes ago", 1);
+ ngettext ("1 minute in the future", "%d minutes in the future", 1);
+ ngettext ("1 hour ago", "%d hours ago", 1);
+ ngettext ("1 hour in the future", "%d hours in the future", 1);
+ ngettext ("1 day ago", "%d days ago", 1);
+ ngettext ("1 day in the future", "%d days in the future", 1);
+ ngettext ("1 week ago", "%d weeks ago", 1);
+ ngettext ("1 week in the future", "%d weeks in the future", 1)
+ ngettext ("1 month ago", "%d months ago", 1);
+ ngettext ("1 month in the future", "%d months in the future", 1);
+ ngettext ("1 year ago", "%d years ago", 1);
+ ngettext ("1 year in the future", "%d years in the future", 1);
#endif
@@ -139,7 +139,7 @@ set_button (EFilterDatespec *fds)
localtime_r (&fds->value, &tm);
/* strftime for date filter display, only needs to show a day date (i.e. no time) */
- strftime(buf, sizeof(buf), _("%d-%b-%Y"), &tm);
+ strftime (buf, sizeof (buf), _("%d-%b-%Y"), &tm);
break; }
case FDST_X_AGO:
if (fds->value == 0)
@@ -363,17 +363,17 @@ filter_datespec_xml_encode (EFilterElement *element)
EFilterDatespec *fds = E_FILTER_DATESPEC (element);
gchar str[32];
- d(printf ("Encoding datespec as xml\n"));
+ d (printf ("Encoding datespec as xml\n"));
value = xmlNewNode (NULL, (xmlChar *)"value");
- xmlSetProp (value, (xmlChar *)"name", (xmlChar *)element->name);
+ xmlSetProp (value, (xmlChar *)"name", (xmlChar *) element->name);
xmlSetProp (value, (xmlChar *)"type", (xmlChar *)"datespec");
work = xmlNewChild (value, NULL, (xmlChar *)"datespec", NULL);
sprintf (str, "%d", fds->type);
- xmlSetProp (work, (xmlChar *)"type", (xmlChar *)str);
- sprintf (str, "%d", (gint)fds->value);
- xmlSetProp (work, (xmlChar *)"value", (xmlChar *)str);
+ xmlSetProp (work, (xmlChar *)"type", (xmlChar *) str);
+ sprintf (str, "%d", (gint) fds->value);
+ xmlSetProp (work, (xmlChar *)"value", (xmlChar *) str);
return value;
}
@@ -386,14 +386,14 @@ filter_datespec_xml_decode (EFilterElement *element,
xmlNodePtr n;
xmlChar *val;
- d(printf ("Decoding datespec from xml %p\n", element));
+ d (printf ("Decoding datespec from xml %p\n", element));
xmlFree (element->name);
- element->name = (gchar *)xmlGetProp (node, (xmlChar *)"name");
+ element->name = (gchar *) xmlGetProp (node, (xmlChar *)"name");
n = node->children;
while (n) {
- if (!strcmp ((gchar *)n->name, "datespec")) {
+ if (!strcmp ((gchar *) n->name, "datespec")) {
val = xmlGetProp (n, (xmlChar *)"type");
fds->type = atoi ((gchar *) val);
xmlFree (val);
diff --git a/filter/e-filter-element.c b/filter/e-filter-element.c
index 8062500..e00651e 100644
--- a/filter/e-filter-element.c
+++ b/filter/e-filter-element.c
@@ -61,7 +61,7 @@ static void
filter_element_xml_create (EFilterElement *element,
xmlNodePtr node)
{
- element->name = (gchar *)xmlGetProp (node, (xmlChar *) "name");
+ element->name = (gchar *) xmlGetProp (node, (xmlChar *) "name");
}
static EFilterElement *
diff --git a/filter/e-filter-file.c b/filter/e-filter-file.c
index cb84e98..e0c6c72 100644
--- a/filter/e-filter-file.c
+++ b/filter/e-filter-file.c
@@ -146,8 +146,8 @@ filter_file_xml_decode (EFilterElement *element,
gchar *name, *str, *type;
xmlNodePtr child;
- name = (gchar *)xmlGetProp (node, (xmlChar *) "name");
- type = (gchar *)xmlGetProp (node, (xmlChar *) "type");
+ name = (gchar *) xmlGetProp (node, (xmlChar *) "name");
+ type = (gchar *) xmlGetProp (node, (xmlChar *) "type");
xmlFree (element->name);
element->name = name;
diff --git a/filter/e-filter-input.c b/filter/e-filter-input.c
index e81ae4c..b13f910 100644
--- a/filter/e-filter-input.c
+++ b/filter/e-filter-input.c
@@ -200,7 +200,7 @@ filter_input_xml_decode (EFilterElement *element,
while (child != NULL) {
if (!strcmp ((gchar *) child->name, type)) {
if (!(str = (gchar *) xmlNodeGetContent (child)))
- str = (gchar *)xmlStrdup ((xmlChar *)"");
+ str = (gchar *) xmlStrdup ((xmlChar *)"");
input->values = g_list_append (input->values, g_strdup (str));
xmlFree (str);
diff --git a/filter/e-filter-int.c b/filter/e-filter-int.c
index be0a5f1..ba4eacd 100644
--- a/filter/e-filter-int.c
+++ b/filter/e-filter-int.c
@@ -112,11 +112,11 @@ filter_int_xml_decode (EFilterElement *element,
gchar *name, *type;
gchar *intval;
- name = (gchar *)xmlGetProp (node, (xmlChar *)"name");
+ name = (gchar *) xmlGetProp (node, (xmlChar *)"name");
xmlFree (element->name);
element->name = name;
- type = (gchar *)xmlGetProp (node, (xmlChar *)"type");
+ type = (gchar *) xmlGetProp (node, (xmlChar *)"type");
g_free (filter_int->type);
filter_int->type = g_strdup (type);
xmlFree (type);
diff --git a/filter/e-filter-option.c b/filter/e-filter-option.c
index dd6d9b8..e11d384 100644
--- a/filter/e-filter-option.c
+++ b/filter/e-filter-option.c
@@ -103,8 +103,8 @@ filter_option_get_dynamic_options (EFilterOption *option)
static void
filter_option_generate_code (EFilterOption *option,
- GString *out,
- EFilterPart *part)
+ GString *out,
+ EFilterPart *part)
{
GModule *module;
void (*code_gen_func) (EFilterElement *element, GString *out, EFilterPart *part);
@@ -172,22 +172,22 @@ filter_option_xml_create (EFilterElement *element,
n = node->children;
while (n) {
- if (!strcmp ((gchar *)n->name, "option")) {
+ if (!strcmp ((gchar *) n->name, "option")) {
gchar *tmp, *value, *title = NULL, *code = NULL, *code_gen_func = NULL;
- value = (gchar *)xmlGetProp (n, (xmlChar *)"value");
+ value = (gchar *) xmlGetProp (n, (xmlChar *)"value");
work = n->children;
while (work) {
- if (!strcmp ((gchar *)work->name, "title") ||
- !strcmp ((gchar *)work->name, "_title")) {
+ if (!strcmp ((gchar *) work->name, "title") ||
+ !strcmp ((gchar *) work->name, "_title")) {
if (!title) {
if (!(tmp = (gchar *) xmlNodeGetContent (work)))
- tmp = (gchar *)xmlStrdup ((xmlChar *)"");
+ tmp = (gchar *) xmlStrdup ((xmlChar *)"");
title = g_strdup (tmp);
xmlFree (tmp);
}
- } else if (!strcmp ((gchar *)work->name, "code")) {
+ } else if (!strcmp ((gchar *) work->name, "code")) {
if (code || code_gen_func) {
g_warning ("Element 'code' defined twice in '%s'",
element->name);
@@ -195,20 +195,20 @@ filter_option_xml_create (EFilterElement *element,
xmlChar *fn;
/* if element 'code' has attribute 'func', then
- the content of the element is ignored and only
- the 'func' is used to generate actual rule code;
- The function prototype is:
- void code_gen_func (EFilterElement *element, GString *out, EFilterPart *part);
- where @element is the one on which was called,
- @out is GString where to add the code, and
- @part is part which contains @element and other options of it.
+ * the content of the element is ignored and only
+ * the 'func' is used to generate actual rule code;
+ * The function prototype is:
+ * void code_gen_func (EFilterElement *element, GString *out, EFilterPart *part);
+ * where @element is the one on which was called,
+ * @out is GString where to add the code, and
+ * @part is part which contains @element and other options of it.
*/
fn = xmlGetProp (work, (xmlChar *)"func");
if (fn && *fn) {
code_gen_func = g_strdup ((const gchar *) fn);
} else {
if (!(tmp = (gchar *) xmlNodeGetContent (work)))
- tmp = (gchar *)xmlStrdup ((xmlChar *)"");
+ tmp = (gchar *) xmlStrdup ((xmlChar *)"");
code = g_strdup (tmp);
xmlFree (tmp);
@@ -225,7 +225,7 @@ filter_option_xml_create (EFilterElement *element,
g_free (title);
g_free (code);
g_free (code_gen_func);
- } else if (g_str_equal ((gchar *)n->name, "dynamic")) {
+ } else if (g_str_equal ((gchar *) n->name, "dynamic")) {
if (option->dynamic_func) {
g_warning (
"Only one 'dynamic' node is "
@@ -296,7 +296,7 @@ filter_option_xml_encode (EFilterElement *element)
xmlSetProp (value, (xmlChar *) "name", (xmlChar *) element->name);
xmlSetProp (value, (xmlChar *) "type", (xmlChar *) option->type);
if (option->current)
- xmlSetProp (value, (xmlChar *) "value", (xmlChar *)option->current->value);
+ xmlSetProp (value, (xmlChar *) "value", (xmlChar *) option->current->value);
return value;
}
@@ -309,9 +309,9 @@ filter_option_xml_decode (EFilterElement *element,
gchar *value;
xmlFree (element->name);
- element->name = (gchar *)xmlGetProp (node, (xmlChar *)"name");
+ element->name = (gchar *) xmlGetProp (node, (xmlChar *)"name");
- value = (gchar *)xmlGetProp (node, (xmlChar *)"value");
+ value = (gchar *) xmlGetProp (node, (xmlChar *)"value");
if (value) {
option->current = find_option (option, value);
xmlFree (value);
@@ -514,7 +514,7 @@ e_filter_option_add (EFilterOption *option,
const gchar *value,
const gchar *title,
const gchar *code,
- const gchar *code_gen_func,
+ const gchar *code_gen_func,
gboolean is_dynamic)
{
struct _filter_option *op;
diff --git a/filter/e-filter-option.h b/filter/e-filter-option.h
index 84b98bd..f241f09 100644
--- a/filter/e-filter-option.h
+++ b/filter/e-filter-option.h
@@ -56,11 +56,11 @@ struct _filter_option {
gchar *value; /* value, if it has one */
gchar *code; /* used to string code segments together */
gchar *code_gen_func; /* function to generate the code;
- either @code or @code_gen_func is non-NULL,
- never both */
+ * either @code or @code_gen_func is non-NULL,
+ * never both */
gboolean is_dynamic; /* whether is the option dynamic, FALSE if static;
- dynamic means "generated by EFilterOption::dynamic_func" */
+ * dynamic means "generated by EFilterOption::dynamic_func" */
};
struct _EFilterOption {
diff --git a/filter/e-filter-part.c b/filter/e-filter-part.c
index 2154699..ea18f59 100644
--- a/filter/e-filter-part.c
+++ b/filter/e-filter-part.c
@@ -153,15 +153,15 @@ e_filter_part_xml_create (EFilterPart *part,
g_return_val_if_fail (node != NULL, FALSE);
g_return_val_if_fail (E_IS_RULE_CONTEXT (context), FALSE);
- str = (gchar *)xmlGetProp (node, (xmlChar *)"name");
+ str = (gchar *) xmlGetProp (node, (xmlChar *)"name");
part->name = g_strdup (str);
if (str)
xmlFree (str);
n = node->children;
while (n) {
- if (!strcmp ((gchar *)n->name, "input")) {
- type = (gchar *)xmlGetProp (n, (xmlChar *)"type");
+ if (!strcmp ((gchar *) n->name, "input")) {
+ type = (gchar *) xmlGetProp (n, (xmlChar *)"type");
if (type != NULL
&& (el = e_rule_context_new_element (context, type)) != NULL) {
e_filter_element_xml_create (el, n);
@@ -170,15 +170,15 @@ e_filter_part_xml_create (EFilterPart *part,
} else {
g_warning ("Invalid xml format, missing/unknown input type");
}
- } else if (!strcmp ((gchar *)n->name, "title") ||
- !strcmp ((gchar *)n->name, "_title")) {
+ } else if (!strcmp ((gchar *) n->name, "title") ||
+ !strcmp ((gchar *) n->name, "_title")) {
if (!part->title) {
str = (gchar *) xmlNodeGetContent (n);
part->title = g_strdup (str);
if (str)
xmlFree (str);
}
- } else if (!strcmp ((gchar *)n->name, "code")) {
+ } else if (!strcmp ((gchar *) n->name, "code")) {
if (!part->code) {
str = (gchar *) xmlNodeGetContent (n);
part->code = g_strdup (str);
@@ -203,7 +203,7 @@ e_filter_part_xml_encode (EFilterPart *part)
g_return_val_if_fail (E_IS_FILTER_PART (part), NULL);
node = xmlNewNode (NULL, (xmlChar *)"part");
- xmlSetProp (node, (xmlChar *)"name", (xmlChar *)part->name);
+ xmlSetProp (node, (xmlChar *)"name", (xmlChar *) part->name);
for (link = part->elements; link != NULL; link = g_list_next (link)) {
EFilterElement *element = link->data;
@@ -483,7 +483,7 @@ e_filter_part_expand_code (EFilterPart *part,
start = source;
while (start && (newstart = strstr (start, "${"))
- && (end = strstr (newstart+2, "}")) ) {
+ && (end = strstr (newstart + 2, "}")) ) {
EFilterElement *element;
len = end - newstart - 2;
@@ -496,15 +496,15 @@ e_filter_part_expand_code (EFilterPart *part,
element = e_filter_part_find_element (part, name);
if (element != NULL) {
- g_string_append_printf (out, "%.*s", (gint)(newstart-start), start);
+ g_string_append_printf (out, "%.*s", (gint)(newstart - start), start);
e_filter_element_format_sexp (element, out);
#if 0
} else if ((val = g_hash_table_lookup (part->globals, name))) {
- g_string_append_printf (out, "%.*s", newstart-start, start);
+ g_string_append_printf (out, "%.*s", newstart - start, start);
camel_sexp_encode_string (out, val);
#endif
} else {
- g_string_append_printf (out, "%.*s", (gint)(end-start+1), start);
+ g_string_append_printf (out, "%.*s", (gint)(end - start + 1), start);
}
start = end + 1;
}
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index cff0b8b..4d27ab1 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -289,7 +289,7 @@ more_parts (GtkWidget *button,
gtk_widget_grab_focus (w);
/* also scroll down to see new part */
- w = (GtkWidget*) g_object_get_data (G_OBJECT (button), "scrolled-window");
+ w = (GtkWidget *) g_object_get_data (G_OBJECT (button), "scrolled-window");
if (w) {
GtkAdjustment *adjustment;
@@ -340,8 +340,8 @@ filter_rule_load_set (xmlNodePtr node,
work = node->children;
while (work) {
- if (!strcmp ((gchar *)work->name, "part")) {
- rulename = (gchar *)xmlGetProp (work, (xmlChar *)"name");
+ if (!strcmp ((gchar *) work->name, "part")) {
+ rulename = (gchar *) xmlGetProp (work, (xmlChar *)"name");
part = e_rule_context_find_part (context, rulename);
if (part) {
part = e_filter_part_clone (part);
@@ -480,7 +480,7 @@ filter_rule_xml_encode (EFilterRule *rule)
}
if (rule->source) {
- xmlSetProp (node, (xmlChar *)"source", (xmlChar *)rule->source);
+ xmlSetProp (node, (xmlChar *)"source", (xmlChar *) rule->source);
} else {
/* set to the default filter type */
xmlSetProp (node, (xmlChar *)"source", (xmlChar *)"incoming");
@@ -520,7 +520,7 @@ filter_rule_xml_decode (EFilterRule *rule,
g_free (rule->name);
rule->name = NULL;
- grouping = (gchar *)xmlGetProp (node, (xmlChar *)"enabled");
+ grouping = (gchar *) xmlGetProp (node, (xmlChar *)"enabled");
if (!grouping)
rule->enabled = TRUE;
else {
@@ -528,7 +528,7 @@ filter_rule_xml_decode (EFilterRule *rule,
xmlFree (grouping);
}
- grouping = (gchar *)xmlGetProp (node, (xmlChar *)"grouping");
+ grouping = (gchar *) xmlGetProp (node, (xmlChar *)"grouping");
if (!strcmp (grouping, "any"))
rule->grouping = E_FILTER_GROUP_ANY;
else
@@ -537,7 +537,7 @@ filter_rule_xml_decode (EFilterRule *rule,
rule->threading = E_FILTER_THREAD_NONE;
if (context->flags & E_RULE_CONTEXT_THREADING
- && (grouping = (gchar *)xmlGetProp (node, (xmlChar *)"threading"))) {
+ && (grouping = (gchar *) xmlGetProp (node, (xmlChar *)"threading"))) {
if (!strcmp (grouping, "all"))
rule->threading = E_FILTER_THREAD_ALL;
else if (!strcmp (grouping, "replies"))
@@ -550,7 +550,7 @@ filter_rule_xml_decode (EFilterRule *rule,
}
g_free (rule->source);
- source = (gchar *)xmlGetProp (node, (xmlChar *)"source");
+ source = (gchar *) xmlGetProp (node, (xmlChar *)"source");
if (source) {
rule->source = g_strdup (source);
xmlFree (source);
@@ -561,10 +561,10 @@ filter_rule_xml_decode (EFilterRule *rule,
work = node->children;
while (work) {
- if (!strcmp ((gchar *)work->name, "partset")) {
+ if (!strcmp ((gchar *) work->name, "partset")) {
filter_rule_load_set (work, rule, context);
- } else if (!strcmp ((gchar *)work->name, "title") ||
- !strcmp ((gchar *)work->name, "_title")) {
+ } else if (!strcmp ((gchar *) work->name, "title") ||
+ !strcmp ((gchar *) work->name, "_title")) {
if (!rule->name) {
gchar *str, *decstr = NULL;
@@ -666,8 +666,8 @@ ensure_scrolled_width_cb (GtkAdjustment *adj,
static void
ensure_scrolled_height_cb (GtkAdjustment *adj,
- GParamSpec *param_spec,
- GtkScrolledWindow *scrolled_window)
+ GParamSpec *param_spec,
+ GtkScrolledWindow *scrolled_window)
{
GtkWidget *toplevel;
GdkScreen *screen;
diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c
index c9079bc..0f41b52 100644
--- a/filter/e-rule-context.c
+++ b/filter/e-rule-context.c
@@ -219,7 +219,7 @@ rule_context_load (ERuleContext *context,
}
root = xmlDocGetRootElement (systemdoc);
- if (root == NULL || strcmp ((gchar *)root->name, "filterdescription")) {
+ if (root == NULL || strcmp ((gchar *) root->name, "filterdescription")) {
gchar * err_msg;
err_msg = g_strdup_printf (
@@ -244,7 +244,7 @@ rule_context_load (ERuleContext *context,
if (part_map) {
rule = set->children;
while (rule) {
- if (!strcmp ((gchar *)rule->name, "part")) {
+ if (!strcmp ((gchar *) rule->name, "part")) {
EFilterPart *part =
E_FILTER_PART (g_object_new (
part_map->type, NULL, NULL));
@@ -262,7 +262,7 @@ rule_context_load (ERuleContext *context,
context->rule_set_map, set->name))) {
rule = set->children;
while (rule) {
- if (!strcmp ((gchar *)rule->name, "rule")) {
+ if (!strcmp ((gchar *) rule->name, "rule")) {
EFilterRule *part =
E_FILTER_RULE (g_object_new (
rule_map->type, NULL, NULL));
@@ -290,7 +290,7 @@ rule_context_load (ERuleContext *context,
if (rule_map) {
rule = set->children;
while (rule) {
- if (!strcmp ((gchar *)rule->name, "rule")) {
+ if (!strcmp ((gchar *) rule->name, "rule")) {
EFilterRule *part =
E_FILTER_RULE (g_object_new (
rule_map->type, NULL, NULL));
@@ -397,7 +397,7 @@ rule_context_revert (ERuleContext *context,
if (rule_map) {
rule = set->children;
while (rule) {
- if (!strcmp ((gchar *)rule->name, "rule")) {
+ if (!strcmp ((gchar *) rule->name, "rule")) {
EFilterRule *part =
E_FILTER_RULE (g_object_new (
rule_map->type, NULL, NULL));
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index f9ddcb2..f26981d 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -668,7 +668,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
g_string_append_printf (
error_messages,
_("Failed to append to %s: %s\n"
- "Appending to local 'Sent' folder instead."),
+ "Appending to local 'Sent' folder instead."),
context->sent_folder_uri, error->message);
g_clear_error (&error);
}
@@ -702,7 +702,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
g_string_append_printf (
error_messages,
_("Failed to append to %s: %s\n"
- "Appending to local 'Sent' folder instead."),
+ "Appending to local 'Sent' folder instead."),
description, error->message);
g_clear_error (&error);
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index a2f5681..79dcad2 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -1583,7 +1583,7 @@ mail_session_forward_to_sync (CamelSession *session,
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
_("No destination address provided, forwarding "
- "of the message has been cancelled."));
+ "of the message has been cancelled."));
return FALSE;
}
@@ -1596,7 +1596,7 @@ mail_session_forward_to_sync (CamelSession *session,
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
_("No identity found to use, forwarding "
- "of the message has been cancelled."));
+ "of the message has been cancelled."));
return FALSE;
}
diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c
index b1308cd..d842b35 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -363,7 +363,7 @@ extern gint camel_application_is_exiting;
#define NOT_FOUND_BOOK (GINT_TO_POINTER (1))
/* to be able to cancel pending requests on exit; this lock
- should not be held while contact_cache lock is held */
+ * should not be held while contact_cache lock is held */
G_LOCK_DEFINE_STATIC (search_addressbook_cancellables);
static GSList *search_addressbook_cancellables = NULL;
@@ -502,13 +502,10 @@ search_address_in_addressbooks (ESourceRegistry *registry,
display_name = e_source_get_display_name (source);
/* failed to load this book last time, skip it now */
- if (g_hash_table_lookup (emu_broken_books_hash, uid) != NULL) {
- d(printf ("%s: skipping broken book '%s'\n",
- G_STRFUNC, display_name));
+ if (g_hash_table_lookup (emu_broken_books_hash, uid) != NULL)
continue;
- }
- d(printf(" checking '%s'\n", e_source_get_uri(source)));
+ d (printf (" checking '%s'\n", e_source_get_uri (source)));
book_client = g_hash_table_lookup (emu_books_hash, uid);
if (!book_client) {
@@ -759,7 +756,8 @@ em_utils_contact_photo (ESourceRegistry *registry,
part = camel_mime_part_new ();
if (photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
- camel_mime_part_set_content (part,
+ camel_mime_part_set_content (
+ part,
(const gchar *) photo->data.inlined.data,
photo->data.inlined.length, "image/jpeg");
} else {
@@ -896,7 +894,7 @@ free_mail_cache_thread (gpointer user_data)
*/
void
emu_free_mail_cache (GDestroyNotify done_cb,
- gpointer user_data)
+ gpointer user_data)
{
struct FreeMailCacheData *fmc;
GThread *thread;
@@ -916,7 +914,7 @@ emu_free_mail_cache (GDestroyNotify done_cb,
static ESource *
guess_mail_account_from_folder (ESourceRegistry *registry,
CamelFolder *folder,
- const gchar *message_uid)
+ const gchar *message_uid)
{
ESource *source;
CamelStore *store;
@@ -983,7 +981,7 @@ ESource *
em_utils_guess_mail_account (ESourceRegistry *registry,
CamelMimeMessage *message,
CamelFolder *folder,
- const gchar *message_uid)
+ const gchar *message_uid)
{
ESource *source = NULL;
const gchar *newsgroups;
@@ -1015,7 +1013,7 @@ ESource *
em_utils_guess_mail_identity (ESourceRegistry *registry,
CamelMimeMessage *message,
CamelFolder *folder,
- const gchar *message_uid)
+ const gchar *message_uid)
{
ESource *source;
ESourceExtension *extension;
@@ -1106,7 +1104,7 @@ ESource *
em_utils_guess_mail_account_with_recipients (ESourceRegistry *registry,
CamelMimeMessage *message,
CamelFolder *folder,
- const gchar *message_uid)
+ const gchar *message_uid)
{
ESource *source = NULL;
GHashTable *recipients;
@@ -1153,7 +1151,8 @@ em_utils_guess_mail_account_with_recipients (ESourceRegistry *registry,
* in the list of To: or Cc: recipients. */
if (folder != NULL)
- source = guess_mail_account_from_folder (registry, folder, message_uid);
+ source = guess_mail_account_from_folder (
+ registry, folder, message_uid);
if (source == NULL)
goto second_preference;
@@ -1189,7 +1188,8 @@ second_preference:
goto exit;
/* Last Preference: Defer to em_utils_guess_mail_account(). */
- source = em_utils_guess_mail_account (registry, message, folder, message_uid);
+ source = em_utils_guess_mail_account (
+ registry, message, folder, message_uid);
exit:
g_hash_table_destroy (recipients);
@@ -1201,7 +1201,7 @@ ESource *
em_utils_guess_mail_identity_with_recipients (ESourceRegistry *registry,
CamelMimeMessage *message,
CamelFolder *folder,
- const gchar *message_uid)
+ const gchar *message_uid)
{
ESource *source;
ESourceExtension *extension;
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 71dd237..d11db54 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -258,8 +258,9 @@ flush_updates_idle_cb (MailFolderCache *cache)
}
/* update unread counts */
- g_signal_emit (cache, signals[FOLDER_UNREAD_UPDATED], 0,
- up->store, up->full_name, up->unread);
+ g_signal_emit (
+ cache, signals[FOLDER_UNREAD_UPDATED], 0,
+ up->store, up->full_name, up->unread);
/* indicate that the folder has changed (new mail received, etc) */
if (up->store != NULL && up->full_name != NULL) {
@@ -370,7 +371,7 @@ update_1folder (MailFolderCache *cache,
folder_is_drafts || folder_is_outbox;
if (special_case) {
- d(printf(" total count\n"));
+ d (printf (" total count\n"));
unread = camel_folder_get_message_count (folder);
if (folder_is_drafts || folder_is_outbox) {
guint32 junked = 0;
@@ -384,7 +385,7 @@ update_1folder (MailFolderCache *cache,
unread -= junked;
}
} else {
- d(printf(" unread count\n"));
+ d (printf (" unread count\n"));
if (info)
unread = info->unread;
else
@@ -392,7 +393,7 @@ update_1folder (MailFolderCache *cache,
}
}
- d(printf("folder updated: unread %d: '%s'\n", unread, mfi->full_name));
+ d (printf ("folder updated: unread %d: '%s'\n", unread, mfi->full_name));
if (unread == -1)
return;
@@ -514,7 +515,7 @@ unset_folder_info (MailFolderCache *cache,
{
struct _folder_update *up;
- d(printf("unset folderinfo '%s'\n", mfi->uri));
+ d (printf ("unset folderinfo '%s'\n", mfi->uri));
if (mfi->folder) {
CamelFolder *folder = mfi->folder;
@@ -667,7 +668,7 @@ rename_folders (MailFolderCache *cache,
up = g_malloc0 (sizeof (*up));
/* Form what was the old name, and try and look it up */
- old = g_strdup_printf("%s%s", oldbase, fi->full_name + strlen(newbase));
+ old = g_strdup_printf ("%s%s", oldbase, fi->full_name + strlen (newbase));
mfi = g_hash_table_lookup (si->folders, old);
if (mfi) {
up->oldfull = mfi->full_name;
@@ -714,13 +715,13 @@ rename_folders (MailFolderCache *cache,
e_filename_make_safe (olduri);
newuri = e_mail_folder_uri_build (si->store, fi->full_name);
e_filename_make_safe (newuri);
- oldfile = g_strdup_printf("%s/custom_view-%s.xml", config_dir, olduri);
- newfile = g_strdup_printf("%s/custom_view-%s.xml", config_dir, newuri);
+ oldfile = g_strdup_printf ("%s/custom_view-%s.xml", config_dir, olduri);
+ newfile = g_strdup_printf ("%s/custom_view-%s.xml", config_dir, newuri);
g_rename (oldfile, newfile);
g_free (oldfile);
g_free (newfile);
- oldfile = g_strdup_printf("%s/current_view-%s.xml", config_dir, olduri);
- newfile = g_strdup_printf("%s/current_view-%s.xml", config_dir, newuri);
+ oldfile = g_strdup_printf ("%s/current_view-%s.xml", config_dir, olduri);
+ newfile = g_strdup_printf ("%s/current_view-%s.xml", config_dir, newuri);
g_rename (oldfile, newfile);
g_free (oldfile);
g_free (newfile);
@@ -1457,8 +1458,8 @@ mail_folder_cache_init (MailFolderCache *cache)
g_static_rec_mutex_init (&cache->priv->stores_mutex);
g_queue_init (&cache->priv->updates);
- cache->priv->count_sent = getenv("EVOLUTION_COUNT_SENT") != NULL;
- cache->priv->count_trash = getenv("EVOLUTION_COUNT_TRASH") != NULL;
+ cache->priv->count_sent = getenv ("EVOLUTION_COUNT_SENT") != NULL;
+ cache->priv->count_trash = getenv ("EVOLUTION_COUNT_TRASH") != NULL;
buf = getenv ("EVOLUTION_PING_TIMEOUT");
timeout = buf ? strtoul (buf, NULL, 10) : 600;
@@ -1620,7 +1621,7 @@ mail_folder_cache_note_folder (MailFolderCache *cache,
if (cache->priv->stores == NULL
|| (si = g_hash_table_lookup (cache->priv->stores, parent_store)) == NULL
|| (mfi = g_hash_table_lookup (si->folders, full_name)) == NULL) {
- w(g_warning("Noting folder before store initialised"));
+ w (g_warning ("Noting folder before store initialised"));
g_static_rec_mutex_unlock (&cache->priv->stores_mutex);
return;
}
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index ed3f442..f0632a4 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -306,8 +306,9 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
if (m->fetch_count > 0) {
/* We probably should fetch some old messages first. */
- m->still_more = camel_folder_fetch_messages_sync (folder, m->fetch_type,
- m->fetch_count, cancellable, error) ? 1 : 0;
+ m->still_more = camel_folder_fetch_messages_sync (
+ folder, m->fetch_type,
+ m->fetch_count, cancellable, error) ? 1 : 0;
}
service = CAMEL_SERVICE (parent_store);
@@ -661,7 +662,7 @@ mail_send_message (struct _send_queue_msg *m,
for (header = xev; header; header = header->next) {
gchar *uri;
- if (strcmp(header->name, "X-Evolution-PostTo") != 0)
+ if (strcmp (header->name, "X-Evolution-PostTo") != 0)
continue;
/* TODO: don't lose errors */
@@ -745,7 +746,7 @@ mail_send_message (struct _send_queue_msg *m,
description = camel_folder_get_description (folder);
if (err->len)
- g_string_append(err, "\n\n");
+ g_string_append (err, "\n\n");
g_string_append_printf (
err, _("Failed to append to %s: %s\n"
"Appending to local 'Sent' folder instead."),
@@ -767,7 +768,7 @@ mail_send_message (struct _send_queue_msg *m,
goto exit;
if (err->len)
- g_string_append(err, "\n\n");
+ g_string_append (err, "\n\n");
g_string_append_printf (
err, _("Failed to append to "
"local 'Sent' folder: %s"),
@@ -872,7 +873,7 @@ send_queue_exec (struct _send_queue_msg *m,
gint i, j;
GError *local_error = NULL;
- d(printf("sending queue\n"));
+ d (printf ("sending queue\n"));
sent_folder =
e_mail_session_get_local_folder (
@@ -912,7 +913,7 @@ send_queue_exec (struct _send_queue_msg *m,
report_status (
m, CAMEL_FILTER_STATUS_START, pc,
- _("Sending message %d of %d"), i+1,
+ _("Sending message %d of %d"), i + 1,
send_uids->len);
camel_operation_progress (
@@ -963,9 +964,10 @@ send_queue_exec (struct _send_queue_msg *m,
/* Translators: The string is distinguished by total
* count of messages to be sent. Failed messages is
* always more than zero. */
- ngettext ("Failed to send a message",
- "Failed to send %d of %d messages",
- send_uids->len),
+ ngettext (
+ "Failed to send a message",
+ "Failed to send %d of %d messages",
+ send_uids->len),
j, send_uids->len);
else if (g_error_matches (
m->base.error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@@ -1201,8 +1203,9 @@ struct _sync_folder_msg {
static gchar *
sync_folder_desc (struct _sync_folder_msg *m)
{
- return g_strdup_printf (_("Storing folder '%s'"),
- camel_folder_get_full_name (m->folder));
+ return g_strdup_printf (
+ _("Storing folder '%s'"),
+ camel_folder_get_full_name (m->folder));
}
static void
@@ -1273,10 +1276,11 @@ sync_store_desc (struct _sync_store_msg *m)
uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
camel_url_free (url);
- res = g_strdup_printf (m->expunge
- ?_("Expunging and storing account '%s'")
- :_("Storing account '%s'"),
- uri);
+ res = g_strdup_printf (
+ m->expunge ?
+ _("Expunging and storing account '%s'") :
+ _("Storing account '%s'"),
+ uri);
g_free (uri);
return res;
diff --git a/libemail-engine/mail-tools.c b/libemail-engine/mail-tools.c
index 29955c7..00cd653 100644
--- a/libemail-engine/mail-tools.c
+++ b/libemail-engine/mail-tools.c
@@ -58,7 +58,7 @@ mail_tool_get_local_movemail_path (CamelStore *store,
uid = camel_service_get_uid (CAMEL_SERVICE (store));
safe_uid = (guchar *) g_strdup ((const gchar *) uid);
for (c = safe_uid; *c; c++)
- if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((gint) *c))
+ if (strchr ("/:;=|%&#!*^()\\, ", *c) || !isprint ((gint) *c))
*c = '_';
data_dir = mail_session_get_data_dir ();
@@ -74,7 +74,7 @@ mail_tool_get_local_movemail_path (CamelStore *store,
return NULL;
}
- full = g_strdup_printf("%s/movemail.%s", path, safe_uid);
+ full = g_strdup_printf ("%s/movemail.%s", path, safe_uid);
g_free (path);
g_free (safe_uid);
@@ -146,7 +146,7 @@ mail_tool_do_movemail (CamelStore *store,
/* Unclear yet whether camel-movemail etc makes any sense on
* Win32, at least it is not ported yet.
*/
- g_warning("%s: Not implemented", __FUNCTION__);
+ g_warning ("%s: Not implemented", __FUNCTION__);
return NULL;
#endif
}
@@ -195,7 +195,7 @@ mail_tool_remove_xevolution_headers (CamelMimeMessage *message)
struct _camel_header_raw *scan, *list = NULL;
for (scan = ((CamelMimePart *) message)->headers; scan; scan = scan->next)
- if (!strncmp(scan->name, "X-Evolution", 11))
+ if (!strncmp (scan->name, "X-Evolution", 11))
camel_header_raw_append (&list, scan->name, scan->value, scan->offset);
for (scan = list; scan; scan = scan->next)
diff --git a/libemail-engine/mail-vfolder.c b/libemail-engine/mail-vfolder.c
index 3d695d6..eef4d38 100644
--- a/libemail-engine/mail-vfolder.c
+++ b/libemail-engine/mail-vfolder.c
@@ -62,8 +62,8 @@ static void rule_changed (EFilterRule *rule, CamelFolder *folder);
static GList *
vfolder_get_include_subfolders_uris (EMailSession *session,
- const gchar *base_uri,
- GCancellable *cancellable)
+ const gchar *base_uri,
+ GCancellable *cancellable)
{
GList *uris = NULL;
CamelStore *store = NULL;
@@ -78,7 +78,8 @@ vfolder_get_include_subfolders_uris (EMailSession *session,
if (!e_mail_folder_uri_parse (CAMEL_SESSION (session), base_uri + 1, &store, &folder_name, NULL))
return NULL;
- fi = camel_store_get_folder_info_sync (store, folder_name,
+ fi = camel_store_get_folder_info_sync (
+ store, folder_name,
CAMEL_STORE_FOLDER_INFO_RECURSIVE, cancellable, NULL);
cur = fi;
while (cur) {
@@ -145,7 +146,7 @@ vfolder_setup_exec (struct _setup_msg *m,
l = l->next) {
const gchar *uri = l->data;
- d(printf(" Adding uri: %s\n", uri));
+ d (printf (" Adding uri: %s\n", uri));
if (!uri || !*uri || !uri[1])
continue;
@@ -230,9 +231,9 @@ vfolder_setup (EMailSession *session,
static void
vfolder_add_remove_one (GList *vfolders,
- gboolean remove,
- CamelFolder *folder,
- GCancellable *cancellable)
+ gboolean remove,
+ CamelFolder *folder,
+ GCancellable *cancellable)
{
GList *iter;
@@ -466,7 +467,7 @@ mail_vfolder_add_folder (CamelStore *store,
gint found = FALSE;
if (!rule->name) {
- d(printf("invalid rule (%p): rule->name is set to NULL\n", rule));
+ d (printf ("invalid rule (%p): rule->name is set to NULL\n", rule));
continue;
}
@@ -559,7 +560,7 @@ mail_vfolder_delete_folder (CamelStore *store,
if (folder_is_spethal (store, folder_name))
return;
- d(printf ("Deleting uri to check: %s\n", uri));
+ d (printf ("Deleting uri to check: %s\n", uri));
g_return_if_fail (mail_in_main_thread ());
@@ -680,7 +681,7 @@ mail_vfolder_rename_folder (CamelStore *store,
gchar *old_uri;
gchar *new_uri;
- d(printf("vfolder rename uri: %s to %s\n", cfrom, cto));
+ d (printf ("vfolder rename uri: %s to %s\n", cfrom, cto));
if (context == NULL)
return;
@@ -743,7 +744,7 @@ mail_vfolder_rename_folder (CamelStore *store,
const gchar *config_dir;
gchar *user;
- d(printf("Vfolders updated from renamed folder\n"));
+ d (printf ("Vfolders updated from renamed folder\n"));
config_dir = mail_session_get_config_dir ();
user = g_build_filename (config_dir, "vfolders.xml", NULL);
e_rule_context_save ((ERuleContext *) context, user);
@@ -762,7 +763,7 @@ static void
rule_add_sources (EMailSession *session,
GQueue *queue,
GList **sources_urip,
- EMVFolderRule *rule)
+ EMVFolderRule *rule)
{
GList *sources_uri = *sources_urip;
MailFolderCache *folder_cache;
@@ -849,9 +850,10 @@ rule_changed (EFilterRule *rule,
g_object_unref (service);
service = NULL;
- d(printf("Filter rule changed? for folder '%s'!!\n", folder->name));
+ d (printf ("Filter rule changed? for folder '%s'!!\n", folder->name));
- camel_vee_folder_set_auto_update (CAMEL_VEE_FOLDER (folder),
+ camel_vee_folder_set_auto_update (
+ CAMEL_VEE_FOLDER (folder),
em_vfolder_rule_get_autoupdate ((EMVFolderRule *) rule));
if (em_vfolder_rule_get_with ((EMVFolderRule *) rule) == EM_VFOLDER_RULE_WITH_SPECIFIC) {
@@ -895,7 +897,7 @@ rule_changed (EFilterRule *rule,
G_UNLOCK (vfolder);
- query = g_string_new("");
+ query = g_string_new ("");
e_filter_rule_build_code (rule, query);
vfolder_setup (session, folder, query->str, sources_uri);
@@ -911,7 +913,7 @@ context_rule_added (ERuleContext *ctx,
CamelFolder *folder;
CamelService *service;
- d(printf("rule added: %s\n", rule->name));
+ d (printf ("rule added: %s\n", rule->name));
service = camel_session_ref_service (
CAMEL_SESSION (session), E_MAIL_SESSION_VFOLDER_UID);
@@ -944,7 +946,7 @@ context_rule_removed (ERuleContext *ctx,
CamelService *service;
gpointer key, folder = NULL;
- d(printf("rule removed; %s\n", rule->name));
+ d (printf ("rule removed; %s\n", rule->name));
service = camel_session_ref_service (
CAMEL_SESSION (session), E_MAIL_SESSION_VFOLDER_UID);
@@ -976,7 +978,7 @@ store_folder_deleted_cb (CamelStore *store,
EFilterRule *rule;
gchar *user;
- d(printf("Folder deleted: %s\n", info->name));
+ d (printf ("Folder deleted: %s\n", info->name));
/* Unmatched folder doesn't have any rule */
if (g_strcmp0 (CAMEL_UNMATCHED_NAME, info->full_name) == 0)
@@ -1027,11 +1029,11 @@ store_folder_renamed_cb (CamelStore *store,
/* This should be more-or-less thread-safe */
- d(printf("Folder renamed to '%s' from '%s'\n", info->full_name, old_name));
+ d (printf ("Folder renamed to '%s' from '%s'\n", info->full_name, old_name));
/* Folder is already renamed? */
G_LOCK (vfolder);
- d(printf("Changing folder name in hash table to '%s'\n", info->full_name));
+ d (printf ("Changing folder name in hash table to '%s'\n", info->full_name));
if (g_hash_table_lookup_extended (vfolder_hash, old_name, &key, &folder)) {
const gchar *config_dir;
@@ -1062,7 +1064,7 @@ store_folder_renamed_cb (CamelStore *store,
G_UNLOCK (vfolder);
} else {
G_UNLOCK (vfolder);
- g_warning("couldn't find a vfolder rule in our table? %s", info->full_name);
+ g_warning ("couldn't find a vfolder rule in our table? %s", info->full_name);
}
}
@@ -1146,7 +1148,7 @@ vfolder_load_storage (EMailSession *session)
xmlfile = g_build_filename (EVOLUTION_PRIVDATADIR, "vfoldertypes.xml", NULL);
if (e_rule_context_load ((ERuleContext *) context,
xmlfile, user) != 0) {
- g_warning("cannot load vfolders: %s\n", ((ERuleContext *)context)->error);
+ g_warning ("cannot load vfolders: %s\n", ((ERuleContext *) context)->error);
}
g_free (xmlfile);
g_free (user);
@@ -1162,10 +1164,10 @@ vfolder_load_storage (EMailSession *session)
rule = NULL;
while ((rule = e_rule_context_next_rule ((ERuleContext *) context, rule, NULL))) {
if (rule->name) {
- d(printf("rule added: %s\n", rule->name));
+ d (printf ("rule added: %s\n", rule->name));
context_rule_added ((ERuleContext *) context, rule, session);
} else {
- d(printf("invalid rule (%p) encountered: rule->name is NULL\n", rule));
+ d (printf ("invalid rule (%p) encountered: rule->name is NULL\n", rule));
}
}
diff --git a/libemail-utils/em-filter-folder-element.c b/libemail-utils/em-filter-folder-element.c
index 8c4b625..6c3033f 100644
--- a/libemail-utils/em-filter-folder-element.c
+++ b/libemail-utils/em-filter-folder-element.c
@@ -112,14 +112,14 @@ filter_folder_element_xml_decode (EFilterElement *fe,
xmlNodePtr n;
xmlFree (fe->name);
- fe->name = (gchar *) xmlGetProp(node, (xmlChar *) "name");
+ fe->name = (gchar *) xmlGetProp (node, (xmlChar *) "name");
n = node->children;
while (n) {
- if (!strcmp((gchar *) n->name, "folder")) {
+ if (!strcmp ((gchar *) n->name, "folder")) {
gchar *uri;
- uri = (gchar *) xmlGetProp(n, (xmlChar *) "uri");
+ uri = (gchar *) xmlGetProp (n, (xmlChar *) "uri");
g_free (ff->priv->uri);
ff->priv->uri = g_strdup (uri);
xmlFree (uri);
diff --git a/libemail-utils/em-vfolder-context.c b/libemail-utils/em-vfolder-context.c
index 736d398..b908f82 100644
--- a/libemail-utils/em-vfolder-context.c
+++ b/libemail-utils/em-vfolder-context.c
@@ -61,7 +61,7 @@ vfolder_context_new_element (ERuleContext *context,
return e_filter_option_new ();
if (strcmp (type, "score") == 0)
- return e_filter_int_new_type("score", -3, 3);
+ return e_filter_int_new_type ("score", -3, 3);
if (strcmp (type, "folder") == 0)
return em_filter_folder_element_new ();
diff --git a/libemail-utils/em-vfolder-rule.c b/libemail-utils/em-vfolder-rule.c
index ac77e75..30a94af 100644
--- a/libemail-utils/em-vfolder-rule.c
+++ b/libemail-utils/em-vfolder-rule.c
@@ -114,7 +114,7 @@ em_vfolder_rule_init (EMVFolderRule *rule)
rule->priv->with = EM_VFOLDER_RULE_WITH_SPECIFIC;
rule->priv->autoupdate = TRUE;
/* it's using pointers from priv::sources, and those
- included has include_subfolders set to true */
+ * included has include_subfolders set to true */
rule->priv->include_subfolders = g_hash_table_new (g_direct_hash, g_direct_equal);
rule->rule.source = g_strdup ("incoming");
@@ -195,14 +195,14 @@ GQueue *
em_vfolder_rule_get_sources (EMVFolderRule *rule)
{
g_return_val_if_fail (rule != NULL, NULL);
-
+
return &rule->priv->sources;
}
static gboolean
check_queue_has_key (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
EMVFolderRule *rule = user_data;
@@ -222,7 +222,7 @@ em_vfolder_rule_sources_changed (EMVFolderRule *rule)
gboolean
em_vfolder_rule_source_get_include_subfolders (EMVFolderRule *rule,
- const gchar *source)
+ const gchar *source)
{
g_return_val_if_fail (rule != NULL, FALSE);
g_return_val_if_fail (source != NULL, FALSE);
@@ -234,8 +234,8 @@ em_vfolder_rule_source_get_include_subfolders (EMVFolderRule *rule,
void
em_vfolder_rule_source_set_include_subfolders (EMVFolderRule *rule,
- const gchar *source,
- gboolean include_subfolders)
+ const gchar *source,
+ gboolean include_subfolders)
{
g_return_if_fail (rule != NULL);
g_return_if_fail (source != NULL);
@@ -251,7 +251,7 @@ em_vfolder_rule_source_set_include_subfolders (EMVFolderRule *rule,
void
em_vfolder_rule_set_with (EMVFolderRule *rule,
- em_vfolder_rule_with_t with)
+ em_vfolder_rule_with_t with)
{
g_return_if_fail (rule != NULL);
@@ -267,8 +267,8 @@ em_vfolder_rule_get_with (EMVFolderRule *rule)
}
void
-em_vfolder_rule_set_autoupdate (EMVFolderRule *rule,
- gboolean autoupdate)
+em_vfolder_rule_set_autoupdate (EMVFolderRule *rule,
+ gboolean autoupdate)
{
g_return_if_fail (rule != NULL);
@@ -353,10 +353,10 @@ xml_encode (EFilterRule *fr)
g_return_val_if_fail (node != NULL, NULL);
g_return_val_if_fail (vr->priv->with < G_N_ELEMENTS (with_names), NULL);
- set = xmlNewNode(NULL, (const guchar *)"sources");
+ set = xmlNewNode (NULL, (const guchar *)"sources");
xmlAddChild (node, set);
- xmlSetProp(set, (const guchar *)"with", (guchar *)with_names[vr->priv->with]);
- xmlSetProp(set, (const guchar *)"autoupdate", (guchar *) (vr->priv->autoupdate ? "true" : "false"));
+ xmlSetProp (set, (const guchar *)"with", (guchar *) with_names[vr->priv->with]);
+ xmlSetProp (set, (const guchar *)"autoupdate", (guchar *) (vr->priv->autoupdate ? "true" : "false"));
head = g_queue_peek_head_link (&vr->priv->sources);
for (link = head; link != NULL; link = g_list_next (link)) {
@@ -404,16 +404,16 @@ xml_decode (EFilterRule *fr,
return result;
/* handle old format file, vfolder source is in filterrule */
- if (strcmp(fr->source, "incoming")!= 0) {
+ if (strcmp (fr->source, "incoming")!= 0) {
set_with (vr, fr->source);
g_free (fr->source);
- fr->source = g_strdup("incoming");
+ fr->source = g_strdup ("incoming");
}
set = node->children;
while (set) {
- if (!strcmp((gchar *)set->name, "sources")) {
- tmp = (gchar *)xmlGetProp(set, (const guchar *)"with");
+ if (!strcmp ((gchar *) set->name, "sources")) {
+ tmp = (gchar *) xmlGetProp (set, (const guchar *)"with");
if (tmp) {
set_with (vr, tmp);
xmlFree (tmp);
@@ -425,8 +425,8 @@ xml_decode (EFilterRule *fr,
}
work = set->children;
while (work) {
- if (!strcmp((gchar *)work->name, "folder")) {
- tmp = (gchar *)xmlGetProp(work, (const guchar *)"uri");
+ if (!strcmp ((gchar *) work->name, "folder")) {
+ tmp = (gchar *) xmlGetProp (work, (const guchar *)"uri");
if (tmp) {
gchar *include_subfolders;
@@ -434,7 +434,8 @@ xml_decode (EFilterRule *fr,
include_subfolders = (gchar *) xmlGetProp (work, (const guchar *) "include-subfolders");
if (include_subfolders) {
- em_vfolder_rule_source_set_include_subfolders (vr,
+ em_vfolder_rule_source_set_include_subfolders (
+ vr,
tmp, g_str_equal (include_subfolders, "true"));
xmlFree (include_subfolders);
}
@@ -464,14 +465,15 @@ rule_copy (EFilterRule *dest,
while ((uri = g_queue_pop_head (&vdest->priv->sources)) != NULL)
g_free (uri);
- em_vfolder_rule_sources_changed (vdest);
+ em_vfolder_rule_sources_changed (vdest);
head = g_queue_peek_head_link (&vsrc->priv->sources);
for (link = head; link != NULL; link = g_list_next (link)) {
const gchar *uri = link->data;
g_queue_push_tail (&vdest->priv->sources, g_strdup (uri));
- em_vfolder_rule_source_set_include_subfolders (vdest, uri,
+ em_vfolder_rule_source_set_include_subfolders (
+ vdest, uri,
em_vfolder_rule_source_get_include_subfolders (vsrc, uri));
}
diff --git a/libemail-utils/mail-mt.c b/libemail-utils/mail-mt.c
index 25b3368..fedfd5b 100644
--- a/libemail-utils/mail-mt.c
+++ b/libemail-utils/mail-mt.c
@@ -122,7 +122,7 @@ mail_msg_new (MailMsgInfo *info)
g_hash_table_insert (
mail_msg_active_table, GINT_TO_POINTER (msg->seq), msg);
- d(printf("New message %p\n", msg));
+ d (printf ("New message %p\n", msg));
g_mutex_unlock (mail_msg_lock);
@@ -140,13 +140,13 @@ checkmem (gpointer p)
switch (status) {
case MCHECK_HEAD:
- printf("Memory underrun at %p\n", p);
+ printf ("Memory underrun at %p\n", p);
abort ();
case MCHECK_TAIL:
- printf("Memory overrun at %p\n", p);
+ printf ("Memory overrun at %p\n", p);
abort ();
case MCHECK_FREE:
- printf("Double free %p\n", p);
+ printf ("Double free %p\n", p);
abort ();
}
}
@@ -200,7 +200,7 @@ mail_msg_unref (gpointer msg)
checkmem (mail_msg->cancel);
checkmem (mail_msg->priv);
#endif
- d(printf("Free message %p\n", msg));
+ d (printf ("Free message %p\n", msg));
if (mail_msg->info->free)
mail_msg->info->free (mail_msg);
@@ -478,7 +478,8 @@ create_thread_pool (gpointer data)
void
mail_msg_main_loop_push (gpointer msg)
{
- g_async_queue_push_sorted (main_loop_queue, msg,
+ g_async_queue_push_sorted (
+ main_loop_queue, msg,
(GCompareDataFunc) mail_msg_compare, NULL);
G_LOCK (idle_source_id);
diff --git a/libevolution-utils/e-alert.c b/libevolution-utils/e-alert.c
index 7d3b5e7..5a08e07 100644
--- a/libevolution-utils/e-alert.c
+++ b/libevolution-utils/e-alert.c
@@ -172,19 +172,19 @@ e_alert_load (const gchar *path)
struct _e_alert_table *table;
gchar *tmp;
- d(printf("loading error file %s\n", path));
+ d (printf ("loading error file %s\n", path));
doc = e_xml_parse_file (path);
if (doc == NULL) {
- g_warning("Error file '%s' not found", path);
+ g_warning ("Error file '%s' not found", path);
return;
}
root = xmlDocGetRootElement (doc);
if (root == NULL
- || strcmp((gchar *)root->name, "error-list") != 0
- || (tmp = (gchar *)xmlGetProp(root, (const guchar *)"domain")) == NULL) {
- g_warning("Error file '%s' invalid format", path);
+ || strcmp ((gchar *) root->name, "error-list") != 0
+ || (tmp = (gchar *) xmlGetProp (root, (const guchar *)"domain")) == NULL) {
+ g_warning ("Error file '%s' invalid format", path);
xmlFreeDoc (doc);
return;
}
@@ -218,8 +218,8 @@ e_alert_load (const gchar *path)
xmlFree (tmp);
for (error = root->children; error; error = error->next) {
- if (!strcmp((gchar *)error->name, "error")) {
- tmp = (gchar *)xmlGetProp(error, (const guchar *)"id");
+ if (!strcmp ((gchar *) error->name, "error")) {
+ tmp = (gchar *) xmlGetProp (error, (const guchar *)"id");
if (tmp == NULL)
continue;
@@ -229,39 +229,39 @@ e_alert_load (const gchar *path)
xmlFree (tmp);
lastbutton = (EAlertButton *) &e->buttons;
- tmp = (gchar *)xmlGetProp(error, (const guchar *)"type");
+ tmp = (gchar *) xmlGetProp (error, (const guchar *)"type");
e->message_type = map_type (tmp);
if (tmp)
xmlFree (tmp);
- tmp = (gchar *)xmlGetProp(error, (const guchar *)"default");
+ tmp = (gchar *) xmlGetProp (error, (const guchar *)"default");
if (tmp) {
e->default_response = map_response (tmp);
xmlFree (tmp);
}
for (scan = error->children; scan; scan = scan->next) {
- if (!strcmp((gchar *)scan->name, "primary")) {
+ if (!strcmp ((gchar *) scan->name, "primary")) {
if ((tmp = (gchar *) xmlNodeGetContent (scan))) {
e->primary_text = g_strdup (
dgettext (table->
translation_domain, tmp));
xmlFree (tmp);
}
- } else if (!strcmp((gchar *)scan->name, "secondary")) {
+ } else if (!strcmp ((gchar *) scan->name, "secondary")) {
if ((tmp = (gchar *) xmlNodeGetContent (scan))) {
e->secondary_text = g_strdup (
dgettext (table->
translation_domain, tmp));
xmlFree (tmp);
}
- } else if (!strcmp((gchar *)scan->name, "button")) {
+ } else if (!strcmp ((gchar *) scan->name, "button")) {
EAlertButton *button;
gchar *label = NULL;
gchar *stock_id = NULL;
button = g_new0 (EAlertButton, 1);
- tmp = (gchar *)xmlGetProp(scan, (const guchar *)"stock");
+ tmp = (gchar *) xmlGetProp (scan, (const guchar *)"stock");
if (tmp) {
stock_id = g_strdup (tmp);
button->stock_id = stock_id;
diff --git a/libevolution-utils/e-xml-utils.c b/libevolution-utils/e-xml-utils.c
index 21c39aa..2311323 100644
--- a/libevolution-utils/e-xml-utils.c
+++ b/libevolution-utils/e-xml-utils.c
@@ -207,7 +207,7 @@ e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent,
prop = xmlGetProp ((xmlNode *) parent, prop_name);
if (prop != NULL) {
- (void) sscanf ((gchar *)prop, "%d", &ret_val);
+ (void) sscanf ((gchar *) prop, "%d", &ret_val);
xmlFree (prop);
}
return ret_val;
@@ -251,7 +251,7 @@ e_xml_get_uint_prop_by_name_with_default (const xmlNode *parent,
prop = xmlGetProp ((xmlNode *) parent, prop_name);
if (prop != NULL) {
- (void) sscanf ((gchar *)prop, "%u", &ret_val);
+ (void) sscanf ((gchar *) prop, "%u", &ret_val);
xmlFree (prop);
}
return ret_val;
@@ -279,9 +279,8 @@ e_xml_get_bool_prop_by_name (const xmlNode *parent,
g_return_val_if_fail (parent != NULL, 0);
g_return_val_if_fail (prop_name != NULL, 0);
- return e_xml_get_bool_prop_by_name_with_default (parent,
- prop_name,
- FALSE);
+ return e_xml_get_bool_prop_by_name_with_default (
+ parent, prop_name, FALSE);
}
gboolean
@@ -297,9 +296,9 @@ e_xml_get_bool_prop_by_name_with_default (const xmlNode *parent,
prop = xmlGetProp ((xmlNode *) parent, prop_name);
if (prop != NULL) {
- if (g_ascii_strcasecmp ((gchar *)prop, "true") == 0) {
+ if (g_ascii_strcasecmp ((gchar *) prop, "true") == 0) {
ret_val = TRUE;
- } else if (g_ascii_strcasecmp ((gchar *)prop, "false") == 0) {
+ } else if (g_ascii_strcasecmp ((gchar *) prop, "false") == 0) {
ret_val = FALSE;
}
xmlFree (prop);
@@ -435,7 +434,7 @@ e_xml_get_translated_string_prop_by_name (const xmlNode *parent,
return ret_val;
}
- combined_name = g_strdup_printf("_%s", prop_name);
+ combined_name = g_strdup_printf ("_%s", prop_name);
prop = xmlGetProp ((xmlNode *) parent, (guchar *) combined_name);
if (prop != NULL) {
ret_val = g_strdup (gettext ((gchar *) prop));
diff --git a/libevolution-utils/evolution-util.c b/libevolution-utils/evolution-util.c
index 97f2160..3bba779 100644
--- a/libevolution-utils/evolution-util.c
+++ b/libevolution-utils/evolution-util.c
@@ -248,8 +248,9 @@ e_ascii_dtostr (gchar *buffer,
p++;
if (decimal_point_len > 1) {
rest_len = strlen (p + (decimal_point_len - 1));
- memmove (p, p + (decimal_point_len - 1),
- rest_len);
+ memmove (
+ p, p + (decimal_point_len - 1),
+ rest_len);
p[rest_len] = 0;
}
}
diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index 6f564b6..0f63468 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -49,7 +49,6 @@ struct _EHTTPRequestPrivate {
G_DEFINE_TYPE (EHTTPRequest, e_http_request, SOUP_TYPE_REQUEST)
-
static gssize
copy_stream_to_stream (CamelStream *input,
GMemoryInputStream *output,
@@ -168,8 +167,9 @@ handle_http_request (GSimpleAsyncResult *res,
stream = g_memory_input_stream_new ();
- len = copy_stream_to_stream (cache_stream,
- G_MEMORY_INPUT_STREAM (stream), cancellable);
+ len = copy_stream_to_stream (
+ cache_stream,
+ G_MEMORY_INPUT_STREAM (stream), cancellable);
request->priv->content_length = len;
g_object_unref (cache_stream);
@@ -184,13 +184,15 @@ handle_http_request (GSimpleAsyncResult *res,
path = camel_data_cache_get_filename (cache, "http", uri_md5);
file = g_file_new_for_path (path);
- info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
- 0, cancellable, NULL);
+ info = g_file_query_info (
+ file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ 0, cancellable, NULL);
request->priv->content_type = g_strdup (
g_file_info_get_content_type (info));
- d(printf ("'%s' found in cache (%d bytes, %s)\n",
+ d (
+ printf ("'%s' found in cache (%d bytes, %s)\n",
uri, request->priv->content_length,
request->priv->content_type));
@@ -203,7 +205,7 @@ handle_http_request (GSimpleAsyncResult *res,
goto cleanup;
} else {
- d(printf("Failed to load '%s' from cache.\n", uri));
+ d (printf ("Failed to load '%s' from cache.\n", uri));
}
}
@@ -291,7 +293,8 @@ handle_http_request (GSimpleAsyncResult *res,
error = NULL;
cache_stream = camel_data_cache_add (cache, "http", uri_md5, &error);
if (!cache_stream) {
- g_warning ("Failed to create cache file for '%s': %s",
+ g_warning (
+ "Failed to create cache file for '%s': %s",
uri, error ? error->message : "Unknown error");
g_clear_error (&error);
@@ -356,12 +359,12 @@ handle_http_request (GSimpleAsyncResult *res,
g_object_unref (msg);
g_idle_add ((GSourceFunc) unref_soup_session, session);
- d(printf ("Received image from %s\n"
- "Content-Type: %s\n"
- "Content-Length: %d bytes\n"
- "URI MD5: %s:\n",
- uri, request->priv->content_type,
- request->priv->content_length, uri_md5));
+ d (printf ("Received image from %s\n"
+ "Content-Type: %s\n"
+ "Content-Length: %d bytes\n"
+ "URI MD5: %s:\n",
+ uri, request->priv->content_type,
+ request->priv->content_length, uri_md5));
g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
goto cleanup;
@@ -396,8 +399,8 @@ http_request_finalize (GObject *object)
static gboolean
http_request_check_uri (SoupRequest *request,
- SoupURI *uri,
- GError **error)
+ SoupURI *uri,
+ GError **error)
{
return ((strcmp (uri->scheme, "evo-http") == 0) ||
(strcmp (uri->scheme, "evo-https") == 0));
@@ -421,9 +424,9 @@ http_request_send_async (SoupRequest *request,
uri = soup_request_get_uri (request);
query = soup_form_decode (uri->query);
- d({
+ d ({
gchar *uri_str = soup_uri_to_string (uri, FALSE);
- printf("received request for %s\n", uri_str);
+ printf ("received request for %s\n", uri_str);
g_free (uri_str);
});
@@ -481,7 +484,7 @@ http_request_get_content_length (SoupRequest *request)
{
EHTTPRequest *efr = E_HTTP_REQUEST (request);
- d(printf("Content-Length: %d bytes\n", efr->priv->content_length));
+ d (printf ("Content-Length: %d bytes\n", efr->priv->content_length));
return efr->priv->content_length;
}
@@ -490,7 +493,7 @@ http_request_get_content_type (SoupRequest *request)
{
EHTTPRequest *efr = E_HTTP_REQUEST (request);
- d(printf("Content-Type: %s\n", efr->priv->content_type));
+ d (printf ("Content-Type: %s\n", efr->priv->content_type));
return efr->priv->content_type;
}
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index e0a0275..ae6aebb 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -377,7 +377,7 @@ mail_backend_quit_requested_cb (EShell *shell,
/* In express mode, don't raise mail request in non mail window. */
if (e_shell_get_express_mode (shell) &&
- strcmp(e_shell_window_get_active_view((EShellWindow *)window), "mail") != 0)
+ strcmp (e_shell_window_get_active_view ((EShellWindow *) window), "mail") != 0)
return;
if (!e_shell_backend_is_started (mail_shell_backend))
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index f337c5c..7535785 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -584,8 +584,9 @@ mail_browser_constructed (GObject *object)
browser->priv->message_list, "message-list-built",
G_CALLBACK (mail_browser_message_list_built_cb), object);
- display = g_object_new (E_TYPE_MAIL_DISPLAY,
- "mode", E_MAIL_BROWSER (object)->priv->mode, NULL);
+ display = g_object_new (
+ E_TYPE_MAIL_DISPLAY,
+ "mode", E_MAIL_BROWSER (object)->priv->mode, NULL);
g_signal_connect_swapped (
display, "popup-event",
@@ -679,7 +680,7 @@ mail_browser_constructed (GObject *object)
gtk_style_context_add_class (
gtk_widget_get_style_context (widget),
- GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
+ GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
gtk_container_add (GTK_CONTAINER (container), browser->priv->preview_pane);
diff --git a/mail/e-mail-config-confirm-page.c b/mail/e-mail-config-confirm-page.c
index 6d27626..327794f 100644
--- a/mail/e-mail-config-confirm-page.c
+++ b/mail/e-mail-config-confirm-page.c
@@ -155,9 +155,9 @@ e_mail_config_confirm_page_class_init (EMailConfigConfirmPageClass *class)
"Text",
"Confirmation message",
_("Congratulations, your mail configuration is "
- "complete.\n\nYou are now ready to send and "
- "receive email using Evolution.\n\nClick "
- "\"Apply\" to save your settings."),
+ "complete.\n\nYou are now ready to send and "
+ "receive email using Evolution.\n\nClick "
+ "\"Apply\" to save your settings."),
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
diff --git a/mail/e-mail-config-welcome-page.c b/mail/e-mail-config-welcome-page.c
index 9196bb8..ff61f1e 100644
--- a/mail/e-mail-config-welcome-page.c
+++ b/mail/e-mail-config-welcome-page.c
@@ -155,7 +155,7 @@ e_mail_config_welcome_page_class_init (EMailConfigWelcomePageClass *class)
"Text",
"Welcome message",
_("Welcome to the Evolution Mail Configuration "
- "Assistant.\n\nClick \"Continue\" to begin."),
+ "Assistant.\n\nClick \"Continue\" to begin."),
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
diff --git a/mail/e-mail-display-popup-extension.c b/mail/e-mail-display-popup-extension.c
index a444179..d84a9ca 100644
--- a/mail/e-mail-display-popup-extension.c
+++ b/mail/e-mail-display-popup-extension.c
@@ -24,7 +24,6 @@ G_DEFINE_INTERFACE (
e_mail_display_popup_extension,
G_TYPE_OBJECT)
-
static void
e_mail_display_popup_extension_default_init (EMailDisplayPopupExtensionInterface *iface)
{
@@ -42,7 +41,7 @@ e_mail_display_popup_extension_default_init (EMailDisplayPopupExtensionInterface
*/
void
e_mail_display_popup_extension_update_actions (EMailDisplayPopupExtension *extension,
- WebKitHitTestResult *context)
+ WebKitHitTestResult *context)
{
EMailDisplayPopupExtensionInterface *iface;
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index e7af641..1783600 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -165,7 +165,7 @@ static GtkActionEntry image_entries[] = {
static gboolean
mail_display_button_press_event (GtkWidget *widget,
- GdkEventButton *event)
+ GdkEventButton *event)
{
WebKitHitTestResult *hit_test;
WebKitHitTestResultContext context;
@@ -187,7 +187,7 @@ mail_display_button_press_event (GtkWidget *widget,
g_object_get (
G_OBJECT (hit_test),
"context", &context,
- "image-uri", &image_src,
+ "image-uri", &image_src,
NULL);
if ((context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE)) {
@@ -550,23 +550,26 @@ mail_display_resource_requested (WebKitWebView *web_view,
}
new_uri = g_strconcat ("evo-", uri, NULL);
- mail_uri = e_mail_part_build_uri (part_list->folder,
- part_list->message_uid, NULL, NULL);
+ mail_uri = e_mail_part_build_uri (
+ part_list->folder,
+ part_list->message_uid, NULL, NULL);
soup_uri = soup_uri_new (new_uri);
if (soup_uri->query) {
query = soup_form_decode (soup_uri->query);
} else {
- query = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, g_free);
+ query = g_hash_table_new_full (
+ g_str_hash, g_str_equal,
+ g_free, g_free);
}
enc = soup_uri_encode (mail_uri, NULL);
g_hash_table_insert (query, g_strdup ("__evo-mail"), enc);
if (display->priv->force_image_load) {
- g_hash_table_insert (query,
+ g_hash_table_insert (
+ query,
g_strdup ("__evo-load-images"),
- g_strdup ("true"));
+ g_strdup ("true"));
}
g_free (mail_uri);
@@ -600,7 +603,7 @@ find_element_by_id (WebKitDOMDocument *document,
return element;
/* If the element is not here then recursively scan all frames */
- frames = webkit_dom_document_get_elements_by_tag_name(document, "iframe");
+ frames = webkit_dom_document_get_elements_by_tag_name (document, "iframe");
length = webkit_dom_node_list_get_length (frames);
for (i = 0; i < length; i++) {
@@ -635,7 +638,8 @@ mail_display_plugin_widget_resize (GObject *object,
parent_element = g_object_get_data (object, "parent_element");
if (!parent_element || !WEBKIT_DOM_IS_ELEMENT (parent_element)) {
- d(printf("%s: %s does not have (valid) parent element!\n",
+ d (
+ printf ("%s: %s does not have (valid) parent element!\n",
G_STRFUNC, (gchar *) g_object_get_data (object, "uri")));
return;
}
@@ -805,7 +809,7 @@ bind_iframe_content_visibility (WebKitDOMElement *iframe,
d ({
gchar *name = webkit_dom_html_iframe_element_get_name (
WEBKIT_DOM_HTML_IFRAME_ELEMENT (iframe));
- printf("Found %ld objects within iframe %s\n", length, name);
+ printf ("Found %ld objects within iframe %s\n", length, name);
g_free (name);
});
@@ -833,7 +837,8 @@ attachment_button_expanded (GObject *object,
gboolean expanded;
gchar *id;
- d(printf("Attachment button %s has been %s!\n",
+ d (
+ printf ("Attachment button %s has been %s!\n",
(gchar *) g_object_get_data (object, "uri"),
(e_attachment_button_get_expanded (button) ? "expanded" : "collapsed")));
@@ -844,7 +849,8 @@ attachment_button_expanded (GObject *object,
element = find_element_by_id (document, g_object_get_data (object, "attachment_id"));
if (!WEBKIT_DOM_IS_ELEMENT (element)) {
- d(printf("%s: Content <div> of attachment %s does not exist!!\n",
+ d (
+ printf ("%s: Content <div> of attachment %s does not exist!!\n",
G_STRFUNC, (gchar *) g_object_get_data (object, "uri")));
return;
}
@@ -859,8 +865,9 @@ attachment_button_expanded (GObject *object,
g_free (id);
if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) {
- d(printf("%s: No <iframe> found\n",
- (gchar *) g_object_get_data (object, "attachment_id")));
+ d (
+ printf ("%s: No <iframe> found\n",
+ (gchar *) g_object_get_data (object, "attachment_id")));
return;
}
bind_iframe_content_visibility (element, display, button);
@@ -918,7 +925,7 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
display = E_MAIL_DISPLAY (web_view);
if ((widget = g_hash_table_lookup (display->priv->widgets, part_id)) != NULL) {
- d(printf("Handeled %s widget request from cache\n", part_id));
+ d (printf ("Handeled %s widget request from cache\n", part_id));
return widget;
}
@@ -950,7 +957,8 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
/* Get the widget from formatter */
widget = e_mail_formatter_extension_get_widget (
extension, display->priv->part_list, part, param);
- d(printf("Created widget %s (%p) for part %s\n",
+ d (
+ printf ("Created widget %s (%p) for part %s\n",
G_OBJECT_TYPE_NAME (widget), widget, part_id));
/* Should not happen! WebKit will display an ugly 'Plug-in not available'
@@ -970,14 +978,16 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
attachment_part_id = part_id;
object_uri = g_strconcat (attachment_part_id, ".attachment_button", NULL);
- g_object_set_data_full (G_OBJECT (widget), "attachment_id",
+ g_object_set_data_full (
+ G_OBJECT (widget), "attachment_id",
g_strdup (attachment_part_id), (GDestroyNotify) g_free);
} else {
object_uri = g_strdup (part_id);
}
/* Store the uri as data of the widget */
- g_object_set_data_full (G_OBJECT (widget), "uri",
+ g_object_set_data_full (
+ G_OBJECT (widget), "uri",
object_uri, (GDestroyNotify) g_free);
/* Set pointer to the <object> element as GObject data "parent_element"
@@ -987,10 +997,12 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
/* Resizing a GtkWidget requires changing size of parent
* <object> HTML element in DOM. */
- g_signal_connect (widget, "realize",
- G_CALLBACK (mail_display_plugin_widget_realize_cb), display);
- g_signal_connect (widget, "size-allocate",
- G_CALLBACK (mail_display_plugin_widget_resize), display);
+ g_signal_connect (
+ widget, "realize",
+ G_CALLBACK (mail_display_plugin_widget_realize_cb), display);
+ g_signal_connect (
+ widget, "size-allocate",
+ G_CALLBACK (mail_display_plugin_widget_resize), display);
if (E_IS_ATTACHMENT_BAR (widget)) {
GtkWidget *box = NULL;
@@ -1003,14 +1015,17 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
/* When EAttachmentBar is expanded/collapsed it does not
* emit size-allocate signal despite it changes it's height. */
- g_signal_connect (widget, "notify::expanded",
+ g_signal_connect (
+ widget, "notify::expanded",
G_CALLBACK (mail_display_plugin_widget_resize), display);
- g_signal_connect (widget, "notify::active-view",
+ g_signal_connect (
+ widget, "notify::active-view",
G_CALLBACK (mail_display_plugin_widget_resize), display);
/* Always hide an attachment bar without attachments */
store = e_attachment_bar_get_store (E_ATTACHMENT_BAR (widget));
- g_signal_connect (store, "notify::num-attachments",
+ g_signal_connect (
+ store, "notify::num-attachments",
G_CALLBACK (mail_display_attachment_count_changed), box);
gtk_widget_show (widget);
@@ -1053,9 +1068,11 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
/* Show/hide the attachment when the EAttachmentButton
* * is expanded/collapsed or shown/hidden */
- g_signal_connect (widget, "notify::expanded",
+ g_signal_connect (
+ widget, "notify::expanded",
G_CALLBACK (attachment_button_expanded), display);
- g_signal_connect (widget, "notify::visible",
+ g_signal_connect (
+ widget, "notify::visible",
G_CALLBACK (attachment_button_expanded), display);
/* Automatically expand attachments that have inline
@@ -1068,7 +1085,7 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
(g_strcmp0 (empa->snoop_mime_type, "message/rfc822") == 0) ||
(disposition && disposition->disposition &&
g_ascii_strncasecmp (
- disposition->disposition, "inline", 6) == 0))) {
+ disposition->disposition, "inline", 6) == 0))) {
e_attachment_button_set_expanded (
E_ATTACHMENT_BUTTON (widget), TRUE);
@@ -1120,9 +1137,11 @@ toggle_headers_visibility (WebKitDOMElement *button,
expanded = (g_strcmp0 (css_value, "block") == 0);
g_free (css_value);
- webkit_dom_css_style_declaration_set_property (css_full, "display",
+ webkit_dom_css_style_declaration_set_property (
+ css_full, "display",
expanded ? "none" : "block", "", NULL);
- webkit_dom_css_style_declaration_set_property (css_short, "display",
+ webkit_dom_css_style_declaration_set_property (
+ css_short, "display",
expanded ? "block" : "none", "", NULL);
if (expanded)
@@ -1135,10 +1154,10 @@ toggle_headers_visibility (WebKitDOMElement *button,
e_mail_display_set_headers_collapsed (E_MAIL_DISPLAY (web_view), expanded);
- d(printf("Headers %s!\n", expanded ? "collapsed" : "expanded"));
+ d (printf ("Headers %s!\n", expanded ? "collapsed" : "expanded"));
}
-static const gchar* addresses[] = { "to", "cc", "bcc" };
+static const gchar * addresses[] = { "to", "cc", "bcc" };
static void
toggle_address_visibility (WebKitDOMElement *button,
@@ -1311,7 +1330,7 @@ mail_parts_bind_dom (GObject *object,
if (part->bind_func) {
WebKitDOMElement *el = find_element_by_id (document, part->id);
if (el) {
- d(printf("/*bind_func*/ for %s\n", part->id));
+ d (printf ("/*bind_func*/ for %s\n", part->id));
part->bind_func (part, el);
}
}
@@ -1325,10 +1344,11 @@ mail_display_frame_created (WebKitWebView *web_view,
WebKitWebFrame *frame,
gpointer user_data)
{
- d(printf("Frame %s created!\n", webkit_web_frame_get_name (frame)));
+ d (printf ("Frame %s created!\n", webkit_web_frame_get_name (frame)));
/* Call bind_func of all parts written in this frame */
- g_signal_connect (frame, "notify::load-status",
+ g_signal_connect (
+ frame, "notify::load-status",
G_CALLBACK (mail_parts_bind_dom), NULL);
}
@@ -1337,7 +1357,7 @@ mail_display_uri_changed (EMailDisplay *display,
GParamSpec *pspec,
gpointer dummy)
{
- d(printf("EMailDisplay URI changed, recreating widgets hashtable\n"));
+ d (printf ("EMailDisplay URI changed, recreating widgets hashtable\n"));
if (display->priv->widgets)
g_hash_table_destroy (display->priv->widgets);
@@ -1468,18 +1488,24 @@ e_mail_display_init (EMailDisplay *display)
settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (display));
g_object_set (settings, "enable-frame-flattening", TRUE, NULL);
- g_signal_connect (display, "navigation-policy-decision-requested",
- G_CALLBACK (mail_display_link_clicked), NULL);
- g_signal_connect (display, "resource-request-starting",
- G_CALLBACK (mail_display_resource_requested), NULL);
- g_signal_connect (display, "process-mailto",
- G_CALLBACK (mail_display_process_mailto), NULL);
- g_signal_connect (display, "create-plugin-widget",
- G_CALLBACK (mail_display_plugin_widget_requested), NULL);
- g_signal_connect (display, "frame-created",
- G_CALLBACK (mail_display_frame_created), NULL);
- g_signal_connect (display, "notify::uri",
- G_CALLBACK (mail_display_uri_changed), NULL);
+ g_signal_connect (
+ display, "navigation-policy-decision-requested",
+ G_CALLBACK (mail_display_link_clicked), NULL);
+ g_signal_connect (
+ display, "resource-request-starting",
+ G_CALLBACK (mail_display_resource_requested), NULL);
+ g_signal_connect (
+ display, "process-mailto",
+ G_CALLBACK (mail_display_process_mailto), NULL);
+ g_signal_connect (
+ display, "create-plugin-widget",
+ G_CALLBACK (mail_display_plugin_widget_requested), NULL);
+ g_signal_connect (
+ display, "frame-created",
+ G_CALLBACK (mail_display_frame_created), NULL);
+ g_signal_connect (
+ display, "notify::uri",
+ G_CALLBACK (mail_display_uri_changed), NULL);
display->priv->settings = g_settings_new ("org.gnome.evolution.mail");
g_signal_connect_swapped (
@@ -1495,11 +1521,13 @@ e_mail_display_init (EMailDisplay *display)
e_web_view_update_fonts (E_WEB_VIEW (display));
main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display));
- g_signal_connect (main_frame, "notify::load-status",
+ g_signal_connect (
+ main_frame, "notify::load-status",
G_CALLBACK (setup_DOM_bindings), NULL);
main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display));
- g_signal_connect (main_frame, "notify::load-status",
- G_CALLBACK (mail_parts_bind_dom), NULL);
+ g_signal_connect (
+ main_frame, "notify::load-status",
+ G_CALLBACK (mail_parts_bind_dom), NULL);
actions = e_web_view_get_action_group (E_WEB_VIEW (display), "mailto");
gtk_action_group_add_actions (
@@ -1558,10 +1586,12 @@ e_mail_display_set_mode (EMailDisplay *display,
display->priv->formatter = formatter;
mail_display_update_formatter_colors (display);
- g_signal_connect (formatter, "notify::image-loading-policy",
+ g_signal_connect (
+ formatter, "notify::image-loading-policy",
G_CALLBACK (formatter_image_loading_policy_changed_cb), display);
- g_object_connect (formatter,
+ g_object_connect (
+ formatter,
"swapped-object-signal::notify::charset",
G_CALLBACK (e_mail_display_reload), display,
"swapped-object-signal::notify::image-loading-policy",
@@ -1704,7 +1734,6 @@ e_mail_display_load (EMailDisplay *display,
g_free (uri);
}
-
static gboolean
do_reload_display (EMailDisplay *display)
{
@@ -1722,7 +1751,7 @@ do_reload_display (EMailDisplay *display)
if (!uri || !*uri)
return FALSE;
- if (strstr(uri, "?") == NULL) {
+ if (strstr (uri, "?") == NULL) {
e_web_view_reload (web_view);
return FALSE;
}
@@ -1824,7 +1853,6 @@ e_mail_display_set_status (EMailDisplay *display,
gtk_widget_show_all (GTK_WIDGET (display));
}
-
static gchar *
mail_display_get_frame_selection_text (WebKitDOMElement *iframe)
{
@@ -1920,7 +1948,7 @@ e_mail_display_set_force_load_images (EMailDisplay *display,
void
e_mail_display_set_charset (EMailDisplay *display,
- const gchar *charset)
+ const gchar *charset)
{
g_return_if_fail (E_IS_MAIL_DISPLAY (display));
diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c
index 5b2990b..2d09cbc 100644
--- a/mail/e-mail-label-manager.c
+++ b/mail/e-mail-label-manager.c
@@ -351,7 +351,7 @@ e_mail_label_manager_init (EMailLabelManager *manager)
/* FIXME Clarify this. What menu? */
widget = gtk_label_new (
_("Note: Underscore in the label name is used\n"
- "as mnemonic identifier in menu."));
+ "as mnemonic identifier in menu."));
gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_CENTER);
gtk_table_attach (
GTK_TABLE (container), widget,
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index c642df9..603bf53 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -187,7 +187,7 @@ emm_setup_initial (const gchar *data_dir)
/* special-case - this means brand new install of evolution */
/* FIXME: create default folders and stuff... */
- d(printf("Setting up initial mail tree\n"));
+ d (printf ("Setting up initial mail tree\n"));
base = g_build_filename (data_dir, "local", NULL);
if (g_mkdir_with_parents (base, 0700) == -1 && errno != EEXIST) {
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index 28e10dd..f5d30d5 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -136,7 +136,7 @@ static void
tab_remove_gtk_cb (GtkWidget *button,
EMailNotebookView *view)
{
- EMailView *page = g_object_get_data ((GObject *)button, "page");
+ EMailView *page = g_object_get_data ((GObject *) button, "page");
EMailView *prev;
gint num;
@@ -158,8 +158,9 @@ tab_remove_gtk_cb (GtkWidget *button,
num = emnv_get_page_num (view, (GtkWidget *) prev);
gtk_notebook_set_current_page (view->priv->book, num);
}
- gtk_notebook_remove_page (view->priv->book,
- gtk_notebook_page_num (view->priv->book, (GtkWidget *) page));
+ gtk_notebook_remove_page (
+ view->priv->book,
+ gtk_notebook_page_num (view->priv->book, (GtkWidget *) page));
}
@@ -226,8 +227,8 @@ create_tab_label (EMailNotebookView *view,
"gtk-close", GTK_ICON_SIZE_MENU));
gtk_widget_show_all (widget);
gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 0);
- g_object_set_data ((GObject *)widget, "page", page);
- g_object_set_data ((GObject *)page, "close-button", widget);
+ g_object_set_data ((GObject *) widget, "page", page);
+ g_object_set_data ((GObject *) page, "close-button", widget);
g_signal_connect (
widget, "clicked",
@@ -686,7 +687,7 @@ mail_netbook_view_open_mail (EMailView *view,
gtk_notebook_set_current_page (priv->book, page);
g_signal_connect (
- E_MAIL_READER(pane), "changed",
+ E_MAIL_READER (pane), "changed",
G_CALLBACK (reconnect_changed_event), nview);
g_signal_connect (
E_MAIL_READER (pane), "folder-loaded",
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 55fbd93..8ba3225 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -642,7 +642,8 @@ mail_paned_view_constructed (GObject *object)
priv = E_MAIL_PANED_VIEW_GET_PRIVATE (object);
- priv->display = g_object_new (E_TYPE_MAIL_DISPLAY,
+ priv->display = g_object_new (
+ E_TYPE_MAIL_DISPLAY,
"headers-collapsable", TRUE, NULL);
view = E_MAIL_VIEW (object);
@@ -655,9 +656,10 @@ mail_paned_view_constructed (GObject *object)
backend = E_MAIL_BACKEND (shell_backend);
session = e_mail_backend_get_session (backend);
- g_object_bind_property (shell_settings, "paned-view-headers-state",
- priv->display, "headers-collapsed",
- G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+ g_object_bind_property (
+ shell_settings, "paned-view-headers-state",
+ priv->display, "headers-collapsed",
+ G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
/* Build content widgets. */
diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c
index 1c92f61..92642bb 100644
--- a/mail/e-mail-printer.c
+++ b/mail/e-mail-printer.c
@@ -164,7 +164,6 @@ do_run_print_operation (EMailPrinter *emp)
return FALSE;
}
-
static void
emp_start_printing (GObject *object,
GParamSpec *pspec,
@@ -204,7 +203,8 @@ emp_run_print_operation (EMailPrinter *emp)
{
gchar *mail_uri;
- mail_uri = e_mail_part_build_uri (emp->priv->parts_list->folder,
+ mail_uri = e_mail_part_build_uri (
+ emp->priv->parts_list->folder,
emp->priv->parts_list->message_uid,
"__evo-load-image", G_TYPE_BOOLEAN, TRUE,
"mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_PRINTING,
@@ -220,15 +220,17 @@ emp_run_print_operation (EMailPrinter *emp)
E_MAIL_DISPLAY (emp->priv->webview), TRUE);
g_object_ref_sink (emp->priv->webview);
- g_signal_connect (emp->priv->webview, "notify::load-status",
+ g_signal_connect (
+ emp->priv->webview, "notify::load-status",
G_CALLBACK (emp_start_printing), emp);
w ({
GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
GtkWidget *sw = gtk_scrolled_window_new (NULL, NULL);
gtk_container_add (GTK_CONTAINER (window), sw);
- gtk_container_add (GTK_CONTAINER (sw),
- GTK_WIDGET (emp->priv->webview));
+ gtk_container_add (
+ GTK_CONTAINER (sw),
+ GTK_WIDGET (emp->priv->webview));
gtk_widget_show_all (window);
});
}
@@ -257,7 +259,8 @@ set_header_visible (EMailPrinter *emp,
element = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (headers, index));
style = webkit_dom_element_get_style (element);
- webkit_dom_css_style_declaration_set_property (style,
+ webkit_dom_css_style_declaration_set_property (
+ style,
"display", (visible ? "table-row" : "none"), "", NULL);
}
@@ -272,14 +275,18 @@ header_active_renderer_toggled_cb (GtkCellRendererToggle *renderer,
EMailFormatterHeader *header;
gint *indices;
- gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (emp->priv->headers),
+ gtk_tree_model_get_iter_from_string (
+ GTK_TREE_MODEL (emp->priv->headers),
&iter, path);
- gtk_tree_model_get (GTK_TREE_MODEL (emp->priv->headers), &iter,
+ gtk_tree_model_get (
+ GTK_TREE_MODEL (emp->priv->headers), &iter,
COLUMN_ACTIVE, &active, -1);
- gtk_tree_model_get (GTK_TREE_MODEL (emp->priv->headers), &iter,
+ gtk_tree_model_get (
+ GTK_TREE_MODEL (emp->priv->headers), &iter,
COLUMN_HEADER_STRUCT, &header, -1);
- gtk_list_store_set (GTK_LIST_STORE (emp->priv->headers), &iter,
+ gtk_list_store_set (
+ GTK_LIST_STORE (emp->priv->headers), &iter,
COLUMN_ACTIVE, !active, -1);
p = gtk_tree_path_new_from_string (path);
@@ -311,9 +318,11 @@ emp_headers_tab_toggle_selection (GtkWidget *button,
GtkTreePath *path;
gint *indices;
- gtk_tree_model_get (GTK_TREE_MODEL (emp->priv->headers), &iter,
+ gtk_tree_model_get (
+ GTK_TREE_MODEL (emp->priv->headers), &iter,
COLUMN_HEADER_STRUCT, &header, -1);
- gtk_list_store_set (GTK_LIST_STORE (emp->priv->headers), &iter,
+ gtk_list_store_set (
+ GTK_LIST_STORE (emp->priv->headers), &iter,
COLUMN_ACTIVE, select, -1);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (emp->priv->headers), &iter);
@@ -393,7 +402,8 @@ emp_headers_tab_move (GtkWidget *button,
references = NULL;
for (l = selected_rows; l; l = l->next) {
- references = g_list_prepend (references,
+ references = g_list_prepend (
+ references,
gtk_tree_row_reference_new (model, l->data));
}
@@ -496,7 +506,8 @@ emp_headers_tab_move (GtkWidget *button,
/* Keep the selection in middle of the screen */
path = gtk_tree_row_reference_get_path (selection_middle);
- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (emp->priv->treeview),
+ gtk_tree_view_scroll_to_cell (
+ GTK_TREE_VIEW (emp->priv->treeview),
path, COLUMN_ACTIVE, TRUE, 0.5, 0.5);
gtk_tree_path_free (path);
gtk_tree_row_reference_free (selection_middle);
@@ -526,20 +537,22 @@ emp_create_headers_tab (GtkPrintOperation *operation,
view = GTK_TREE_VIEW (emp->priv->treeview);
selection = gtk_tree_view_get_selection (view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
- g_signal_connect (selection, "changed",
+ g_signal_connect (
+ selection, "changed",
G_CALLBACK (emp_headers_tab_selection_changed), emp);
renderer = gtk_cell_renderer_toggle_new ();
- g_signal_connect (renderer, "toggled",
+ g_signal_connect (
+ renderer, "toggled",
G_CALLBACK (header_active_renderer_toggled_cb), emp);
column = gtk_tree_view_column_new_with_attributes (
- _("Print"), renderer,
+ _("Print"), renderer,
"active", COLUMN_ACTIVE, NULL);
gtk_tree_view_append_column (view, column);
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (
- _("Header Name"), renderer,
+ _("Header Name"), renderer,
"text", COLUMN_HEADER_NAME, NULL);
gtk_tree_view_append_column (view, column);
@@ -555,41 +568,47 @@ emp_create_headers_tab (GtkPrintOperation *operation,
button = gtk_button_new_from_stock (GTK_STOCK_SELECT_ALL);
emp->priv->buttons[BUTTON_SELECT_ALL] = button;
- g_signal_connect (button, "clicked",
+ g_signal_connect (
+ button, "clicked",
G_CALLBACK (emp_headers_tab_toggle_selection), emp);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
button = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
emp->priv->buttons[BUTTON_SELECT_NONE] = button;
- g_signal_connect (button, "clicked",
+ g_signal_connect (
+ button, "clicked",
G_CALLBACK (emp_headers_tab_toggle_selection), emp);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
button = gtk_button_new_from_stock (GTK_STOCK_GOTO_TOP);
emp->priv->buttons[BUTTON_TOP] = button;
gtk_widget_set_sensitive (button, FALSE);
- g_signal_connect (button, "clicked",
+ g_signal_connect (
+ button, "clicked",
G_CALLBACK (emp_headers_tab_move), emp);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
emp->priv->buttons[BUTTON_UP] = button;
gtk_widget_set_sensitive (button, FALSE);
- g_signal_connect (button, "clicked",
+ g_signal_connect (
+ button, "clicked",
G_CALLBACK (emp_headers_tab_move), emp);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
emp->priv->buttons[BUTTON_DOWN] = button;
gtk_widget_set_sensitive (button, FALSE);
- g_signal_connect (button, "clicked",
+ g_signal_connect (
+ button, "clicked",
G_CALLBACK (emp_headers_tab_move), emp);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
button = gtk_button_new_from_stock (GTK_STOCK_GOTO_BOTTOM);
emp->priv->buttons[BUTTON_BOTTOM] = button;
gtk_widget_set_sensitive (button, FALSE);
- g_signal_connect (button, "clicked",
+ g_signal_connect (
+ button, "clicked",
G_CALLBACK (emp_headers_tab_move), emp);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
@@ -614,7 +633,8 @@ emp_set_parts_list (EMailPrinter *emp,
if (emp->priv->headers)
g_object_unref (emp->priv->headers);
- emp->priv->headers = gtk_list_store_new (5,
+ emp->priv->headers = gtk_list_store_new (
+ 5,
G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
headers = camel_medium_get_headers (CAMEL_MEDIUM (parts_list->message));
@@ -648,7 +668,8 @@ emp_set_parts_list (EMailPrinter *emp,
last_known = iter;
}
- gtk_list_store_set (emp->priv->headers, &iter,
+ gtk_list_store_set (
+ emp->priv->headers, &iter,
COLUMN_ACTIVE, (found_header != NULL),
COLUMN_HEADER_NAME, emfh->name,
COLUMN_HEADER_VALUE, emfh->value,
@@ -687,8 +708,7 @@ emp_get_property (GObject *object,
switch (property_id) {
case PROP_PART_LIST:
- g_value_set_pointer (value,
- emp->priv->parts_list);
+ g_value_set_pointer (value, emp->priv->parts_list);
return;
}
@@ -711,7 +731,8 @@ emp_finalize (GObject *object)
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->headers), &iter)) {
do {
EMailFormatterHeader *header = NULL;
- gtk_tree_model_get (GTK_TREE_MODEL (priv->headers), &iter,
+ gtk_tree_model_get (
+ GTK_TREE_MODEL (priv->headers), &iter,
COLUMN_HEADER_STRUCT, &header, -1);
e_mail_formatter_header_free (header);
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->headers), &iter));
@@ -793,7 +814,8 @@ e_mail_printer_new (EMailPartList *source)
{
EMailPrinter *emp;
- emp = g_object_new (E_TYPE_MAIL_PRINTER,
+ emp = g_object_new (
+ E_TYPE_MAIL_PRINTER,
"parts-list", source, NULL);
return emp;
@@ -801,7 +823,7 @@ e_mail_printer_new (EMailPartList *source)
void
e_mail_printer_print (EMailPrinter *emp,
- GtkPrintOperationAction action,
+ GtkPrintOperationAction action,
GCancellable *cancellable)
{
g_return_if_fail (E_IS_MAIL_PRINTER (emp));
@@ -813,15 +835,19 @@ e_mail_printer_print (EMailPrinter *emp,
gtk_print_operation_set_unit (emp->priv->operation, GTK_UNIT_PIXEL);
gtk_print_operation_set_show_progress (emp->priv->operation, TRUE);
- g_signal_connect (emp->priv->operation, "create-custom-widget",
+ g_signal_connect (
+ emp->priv->operation, "create-custom-widget",
G_CALLBACK (emp_create_headers_tab), emp);
- g_signal_connect (emp->priv->operation, "done",
+ g_signal_connect (
+ emp->priv->operation, "done",
G_CALLBACK (emp_printing_done), emp);
- g_signal_connect (emp->priv->operation, "draw-page",
+ g_signal_connect (
+ emp->priv->operation, "draw-page",
G_CALLBACK (emp_draw_footer), NULL);
if (cancellable)
- g_signal_connect_swapped (cancellable, "cancelled",
+ g_signal_connect_swapped (
+ cancellable, "cancelled",
G_CALLBACK (gtk_print_operation_cancel), emp->priv->operation);
emp_run_print_operation (emp);
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index ae4a98b..3a8a2ca 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -834,13 +834,15 @@ e_mail_reader_open_selected (EMailReader *reader)
GtkWidget *browser;
MessageList *ml;
- browser = e_mail_browser_new (backend, folder, uid,
- E_MAIL_FORMATTER_MODE_NORMAL);
+ browser = e_mail_browser_new (
+ backend, folder, uid,
+ E_MAIL_FORMATTER_MODE_NORMAL);
e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
e_mail_reader_set_message (E_MAIL_READER (browser), uid);
- ml = MESSAGE_LIST (e_mail_reader_get_message_list (E_MAIL_READER (browser)));
+ ml = MESSAGE_LIST (e_mail_reader_get_message_list (
+ E_MAIL_READER (browser)));
message_list_freeze (ml);
copy_tree_state (reader, E_MAIL_READER (browser));
@@ -885,7 +887,8 @@ printing_done_cb (EMailPrinter *printer,
gtk_print_operation_get_error (operation, &error);
if (error != NULL) {
- e_alert_submit (alert_sink, "mail:printing-failed",
+ e_alert_submit (
+ alert_sink, "mail:printing-failed",
error->message, NULL);
g_error_free (error);
}
@@ -902,10 +905,12 @@ printing_done_cb (EMailPrinter *printer,
/* We can't destroy the printer and associated WebKitWebView directly from
* here, because this callback is a handler of a WebKit's signal. This
* will destroy the printer later, together with the activity */
- g_object_set_data_full (G_OBJECT (activity),
+ g_object_set_data_full (
+ G_OBJECT (activity),
"printer", printer, (GDestroyNotify) g_object_unref);
- g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 3,
+ g_timeout_add_seconds_full (
+ G_PRIORITY_DEFAULT, 3,
(GSourceFunc) destroy_printing_activity, activity, NULL);
}
@@ -953,7 +958,8 @@ mail_reader_do_print_message (GObject *object,
part_list = e_mail_reader_parse_message_finish (reader, result);
printer = e_mail_printer_new (part_list);
- g_signal_connect (printer, "done",
+ g_signal_connect (
+ printer, "done",
G_CALLBACK (printing_done_cb), activity);
e_mail_printer_print (printer, context->action, cancellable);
@@ -1299,7 +1305,8 @@ mail_reader_get_message_ready_cb (CamelFolder *folder,
g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
- e_mail_reader_parse_message (context->reader, context->folder,
+ e_mail_reader_parse_message (
+ context->reader, context->folder,
context->message_uid, message, NULL,
mail_reader_reply_message_parsed, context);
}
@@ -1834,7 +1841,7 @@ emr_header_from_xmldoc (xmlDocPtr doc)
return NULL;
root = doc->children;
- if (strcmp ((gchar *)root->name, "header") != 0)
+ if (strcmp ((gchar *) root->name, "header") != 0)
return NULL;
name = xmlGetProp (root, (const guchar *)"name");
@@ -1899,7 +1906,7 @@ e_mail_reader_header_to_xml (EMailReaderHeader *header)
doc = xmlNewDoc ((const guchar *)"1.0");
root = xmlNewDocNode (doc, NULL, (const guchar *)"header", NULL);
- xmlSetProp (root, (const guchar *)"name", (guchar *)header->name);
+ xmlSetProp (root, (const guchar *)"name", (guchar *) header->name);
if (header->enabled)
xmlSetProp (root, (const guchar *)"enabled", NULL);
@@ -1995,7 +2002,7 @@ e_mail_reader_parse_message (EMailReader *reader,
CamelFolder *folder,
const gchar *message_uid,
CamelMimeMessage *message,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GAsyncReadyCallback ready_callback,
gpointer user_data)
{
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 33b604a..659e569 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1718,12 +1718,13 @@ mail_source_retrieved (GObject *object,
error = NULL;
message = camel_folder_get_message_finish (
- CAMEL_FOLDER (object), result, &error);
+ CAMEL_FOLDER (object), result, &error);
if (error || !message) {
gchar *status;
- status = g_strdup_printf ("%s<br>%s",
- _("Failed to retrieve message:"),
- error ? error->message : _("Unknown error"));
+ status = g_strdup_printf (
+ "%s<br>%s",
+ _("Failed to retrieve message:"),
+ error ? error->message : _("Unknown error"));
e_mail_display_set_status (display, status);
g_free (status);
g_clear_error (&error);
@@ -1782,9 +1783,10 @@ action_mail_show_source_cb (GtkAction *action,
closure->browser = g_object_ref (E_MAIL_READER (browser));
closure->activity = activity;
closure->message_uid = g_strdup (message_uid);
- camel_folder_get_message (folder, message_uid, G_PRIORITY_DEFAULT,
- cancellable, mail_source_retrieved,
- closure);
+ camel_folder_get_message (
+ folder, message_uid, G_PRIORITY_DEFAULT,
+ cancellable, mail_source_retrieved,
+ closure);
em_utils_uids_free (uids);
}
@@ -3025,6 +3027,7 @@ mail_reader_set_folder (EMailReader *reader,
EMailBackend *backend;
EShell *shell;
gboolean outgoing;
+ gboolean sync_folder;
priv = E_MAIL_READER_GET_PRIVATE (reader);
@@ -3039,7 +3042,11 @@ mail_reader_set_folder (EMailReader *reader,
registry = e_shell_get_registry (shell);
/* Only synchronize the real folder if we're online. */
- if (previous_folder != NULL && (CAMEL_IS_VEE_FOLDER (previous_folder) || e_shell_get_online (shell)))
+ sync_folder =
+ (previous_folder != NULL) &&
+ (CAMEL_IS_VEE_FOLDER (previous_folder) ||
+ e_shell_get_online (shell));
+ if (sync_folder)
mail_sync_folder (previous_folder, NULL, NULL);
/* Skip the rest if we're already viewing the folder. */
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index 28d1c87..37320bc 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -149,14 +149,14 @@ handle_mail_request (GSimpleAsyncResult *res,
/* Convert the GString to GInputStream and send it back to WebKit */
ba = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (request->priv->output_stream));
if (!ba->data) {
- gchar *data = g_strdup_printf(_("Failed to load part '%s'"), part_id);
- dd(printf("%s", data));
+ gchar *data = g_strdup_printf (_("Failed to load part '%s'"), part_id);
+ dd (printf ("%s", data));
g_byte_array_append (ba, (guchar *) data, strlen (data));
g_free (data);
} else {
dd ({
gchar *d = g_strndup ((gchar *) ba->data, ba->len);
- printf("%s", d);
+ printf ("%s", d);
g_free (d);
});
}
@@ -328,7 +328,7 @@ mail_request_send_async (SoupRequest *request,
uri = soup_request_get_uri (request);
- d(printf("received request for %s\n", soup_uri_to_string (uri, FALSE)));
+ d (printf ("received request for %s\n", soup_uri_to_string (uri, FALSE)));
if (uri->query) {
emr->priv->uri_query = soup_form_decode (uri->query);
@@ -396,7 +396,7 @@ mail_request_get_content_length (SoupRequest *request)
}
}
- d(printf("Content-Length: %d bytes\n", content_length));
+ d (printf ("Content-Length: %d bytes\n", content_length));
return content_length;
}
@@ -419,12 +419,12 @@ mail_request_get_content_type (SoupRequest *request)
emr->priv->ret_mime_type = mime_type;
}
- d(printf("Content-Type: %s\n", emr->priv->ret_mime_type));
+ d (printf ("Content-Type: %s\n", emr->priv->ret_mime_type));
return emr->priv->ret_mime_type;
}
-static const char *data_schemes[] = { "mail", NULL };
+static const gchar *data_schemes[] = { "mail", NULL };
static void
e_mail_request_class_init (EMailRequestClass *class)
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index 7476a35..c86de6a 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -667,9 +667,6 @@ static void
mail_ui_session_refresh_service (EMailSession *session,
CamelService *service)
{
- g_debug ("*** Refreshing %s ***",
- camel_service_get_display_name (service));
-
if (camel_session_get_online (CAMEL_SESSION (session)))
mail_receive_service (service);
}
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index c01ec85..28b1962 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -973,7 +973,8 @@ em_utils_composer_print_cb (EMsgComposer *composer,
/* Use EMailPrinter and WebKit to print the message */
emp = e_mail_printer_new (parts);
- g_signal_connect (emp, "done",
+ g_signal_connect (
+ emp, "done",
G_CALLBACK (composer_print_done_cb), NULL);
e_mail_printer_print (
@@ -1279,7 +1280,7 @@ static struct {
* with a value. To see a full list of available variables,
* see mail/em-composer-utils.c:attribvars array. */
N_("On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at "
- "${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:")
+ "${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:")
},
[QUOTING_FORWARD] =
diff --git a/mail/em-filter-editor-folder-element.c b/mail/em-filter-editor-folder-element.c
index 025693c..6179384 100644
--- a/mail/em-filter-editor-folder-element.c
+++ b/mail/em-filter-editor-folder-element.c
@@ -149,13 +149,15 @@ filter_editor_folder_element_get_widget (EFilterElement *fe)
EMFilterEditorFolderElement *ff = (EMFilterEditorFolderElement *) fe;
EMailSession *session;
GtkWidget *button;
+ const gchar *uri;
session = em_filter_editor_folder_element_get_session (ff);
+ uri = em_filter_folder_element_get_uri ((EMFilterFolderElement *) ff);
button = em_folder_selection_button_new (
session, _("Select Folder"), NULL);
em_folder_selection_button_set_folder_uri (
- EM_FOLDER_SELECTION_BUTTON (button), em_filter_folder_element_get_uri ((EMFilterFolderElement *) ff));
+ EM_FOLDER_SELECTION_BUTTON (button), uri);
gtk_widget_show (button);
g_signal_connect (
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 1d60acd..e47b104 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -147,7 +147,8 @@ em_filter_editor_construct (EMFilterEditor *fe,
for (i = 0; source_names[i].source; i++) {
gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_set (
+ store, &iter,
0, source_names[i].name,
-1);
sources = g_slist_append (sources, g_strdup (source_names[i].source));
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 901d79b..cd0c46b 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -130,9 +130,9 @@ void
em_filter_rule_build_action (EMFilterRule *fr,
GString *out)
{
- g_string_append(out, "(begin\n");
+ g_string_append (out, "(begin\n");
e_filter_part_build_code_list (fr->actions, out);
- g_string_append(out, ")\n");
+ g_string_append (out, ")\n");
}
static gint
@@ -193,7 +193,7 @@ xml_encode (EFilterRule *fr)
node = E_FILTER_RULE_CLASS (em_filter_rule_parent_class)->
xml_encode (fr);
g_return_val_if_fail (node != NULL, NULL);
- set = xmlNewNode(NULL, (const guchar *)"actionset");
+ set = xmlNewNode (NULL, (const guchar *)"actionset");
xmlAddChild (node, set);
l = ff->actions;
while (l) {
@@ -217,19 +217,19 @@ load_set (xmlNodePtr node,
work = node->children;
while (work) {
- if (!strcmp((gchar *)work->name, "part")) {
- rulename = (gchar *)xmlGetProp(work, (const guchar *)"name");
+ if (!strcmp ((gchar *) work->name, "part")) {
+ rulename = (gchar *) xmlGetProp (work, (const guchar *)"name");
part = em_filter_context_find_action ((EMFilterContext *) rc, rulename);
if (part) {
part = e_filter_part_clone (part);
e_filter_part_xml_decode (part, work);
em_filter_rule_add_action (ff, part);
} else {
- g_warning("cannot find rule part '%s'\n", rulename);
+ g_warning ("cannot find rule part '%s'\n", rulename);
}
xmlFree (rulename);
} else if (work->type == XML_ELEMENT_NODE) {
- g_warning("Unknown xml node in part: %s", work->name);
+ g_warning ("Unknown xml node in part: %s", work->name);
}
work = work->next;
}
@@ -251,7 +251,7 @@ xml_decode (EFilterRule *fr,
work = node->children;
while (work) {
- if (!strcmp((gchar *)work->name, "actionset")) {
+ if (!strcmp ((gchar *) work->name, "actionset")) {
load_set (work, ff, rc);
}
work = work->next;
@@ -405,7 +405,7 @@ less_parts (GtkWidget *button,
if (g_list_length (l) < 2)
return;
- rule = g_object_get_data((GObject *)button, "rule");
+ rule = g_object_get_data ((GObject *) button, "rule");
part_data = g_object_get_data ((GObject *) rule, "data");
g_return_if_fail (part_data != NULL);
@@ -429,17 +429,19 @@ attach_rule (GtkWidget *rule,
{
GtkWidget *remove;
- gtk_table_attach (GTK_TABLE (data->parts), rule, 0, 1, row, row + 1,
- GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ gtk_table_attach (
+ GTK_TABLE (data->parts), rule, 0, 1, row, row + 1,
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
remove = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
- g_object_set_data((GObject *)remove, "rule", rule);
+ g_object_set_data ((GObject *) remove, "rule", rule);
/*gtk_button_set_relief(GTK_BUTTON(remove), GTK_RELIEF_NONE);*/
g_signal_connect (
remove, "clicked",
G_CALLBACK (less_parts), data);
- gtk_table_attach (GTK_TABLE (data->parts), remove, 1, 2, row, row + 1,
- 0, 0, 0, 0);
+ gtk_table_attach (
+ GTK_TABLE (data->parts), remove, 1, 2, row, row + 1,
+ 0, 0, 0, 0);
gtk_widget_show (remove);
}
@@ -488,7 +490,7 @@ more_parts (GtkWidget *button,
gtk_widget_grab_focus (w);
/* also scroll down to see new part */
- w = (GtkWidget*) g_object_get_data (G_OBJECT (button), "scrolled-window");
+ w = (GtkWidget *) g_object_get_data (G_OBJECT (button), "scrolled-window");
if (w) {
GtkAdjustment *adjustment;
@@ -507,8 +509,8 @@ more_parts (GtkWidget *button,
static void
ensure_scrolled_height_cb (GtkAdjustment *adj,
- GParamSpec *param_spec,
- GtkScrolledWindow *scrolled_window)
+ GParamSpec *param_spec,
+ GtkScrolledWindow *scrolled_window)
{
GtkWidget *toplevel;
GdkScreen *screen;
@@ -578,7 +580,7 @@ get_widget (EFilterRule *fr,
get_widget (fr, rc);
/* and now for the action area */
- msg = g_strdup_printf("<b>%s</b>", _("Then"));
+ msg = g_strdup_printf ("<b>%s</b>", _("Then"));
label = gtk_label_new (msg);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -617,7 +619,7 @@ get_widget (EFilterRule *fr,
l = ff->actions;
while (l) {
part = l->data;
- d(printf("adding action %s\n", part->title));
+ d (printf ("adding action %s\n", part->title));
w = get_rule_part_widget ((EMFilterContext *) rc, part, fr);
attach_rule (w, data, part, i++);
l = l->next;
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 2d5be7f..cdb5905 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -161,7 +161,7 @@ filter_source_element_xml_encode (EFilterElement *fe)
EMFilterSourceElement *fs = (EMFilterSourceElement *) fe;
value = xmlNewNode (NULL, (const guchar *) "value");
- xmlSetProp (value, (const guchar *) "name", (guchar *)fe->name);
+ xmlSetProp (value, (const guchar *) "name", (guchar *) fe->name);
xmlSetProp (value, (const guchar *) "type", (const guchar *) "uid");
if (fs->priv->active_id != NULL)
@@ -197,7 +197,7 @@ filter_source_element_xml_decode (EFilterElement *fe,
/* For backward-compatibility: We used to store
* sources by their URI string, which can change. */
- if (strcmp ((gchar *)node->name, "uri") == 0) {
+ if (strcmp ((gchar *) node->name, "uri") == 0) {
CamelService *service = NULL;
xmlChar *content;
CamelURL *url;
@@ -255,8 +255,8 @@ filter_source_element_clone (EFilterElement *fe)
static void
filter_source_element_add_to_combo (GtkComboBox *combo_box,
- CamelService *service,
- ESourceRegistry *registry)
+ CamelService *service,
+ ESourceRegistry *registry)
{
ESource *source;
ESourceMailIdentity *extension;
@@ -267,7 +267,8 @@ filter_source_element_add_to_combo (GtkComboBox *combo_box,
const gchar *uid;
gchar *label;
- source = e_source_registry_ref_source (registry,
+ source = e_source_registry_ref_source (
+ registry,
camel_service_get_uid (service));
if (!source)
return;
@@ -313,7 +314,7 @@ filter_source_element_add_to_combo (GtkComboBox *combo_box,
label = g_strdup (display_name);
else
label = g_strdup_printf ("%s (%s)", name ? name : address, display_name);
-
+
} else if (g_strcmp0 (display_name, address) == 0)
label = g_strdup_printf ("%s <%s>", name, address);
else
@@ -354,7 +355,8 @@ filter_source_element_get_widget (EFilterElement *fe)
service = NULL;
- gtk_tree_model_get (model, &iter,
+ gtk_tree_model_get (
+ model, &iter,
E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE, &service,
E_MAIL_ACCOUNT_STORE_COLUMN_ENABLED, &enabled,
E_MAIL_ACCOUNT_STORE_COLUMN_BUILTIN, &builtin,
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index ddcfc65..0a19e50 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2005,7 +2005,8 @@ ask_drop_folder (EMFolderTree *folder_tree,
session = em_folder_tree_get_session (folder_tree);
if (!e_mail_folder_uri_parse (CAMEL_SESSION (session),
src_folder_uri, NULL, &src_folder_name, &error)) {
- g_debug ("%s: Failed to convert '%s' to folder name: %s",
+ g_debug (
+ "%s: Failed to convert '%s' to folder name: %s",
G_STRFUNC, src_folder_uri, error ? error->message : "Unknown error");
g_clear_error (&error);
g_object_unref (settings);
@@ -2074,7 +2075,7 @@ folder_tree_drop_folder (struct _DragDataReceivedAsync *m)
data = gtk_selection_data_get_data (m->selection);
- d(printf(" * Drop folder '%s' onto '%s'\n", data, m->full_name));
+ d (printf (" * Drop folder '%s' onto '%s'\n", data, m->full_name));
cancellable = m->base.cancellable;
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index cbfd910..d689c5c 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -153,7 +153,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m,
else
fromlen = tmp - m->frombase + 1;
- d(printf ("top name is '%s'\n", fi->full_name));
+ d (printf ("top name is '%s'\n", fi->full_name));
while (pending) {
CamelFolderInfo *info = pending->data;
@@ -179,17 +179,21 @@ emft_copy_folders__exec (struct _EMCopyFolders *m,
toname, "%s",
info->full_name + fromlen);
- d(printf ("Copying from '%s' to '%s'\n", info->full_name, toname->str));
+ d (printf (
+ "Copying from '%s' to '%s'\n",
+ info->full_name, toname->str));
/* This makes sure we create the same tree,
* e.g. from a nonselectable source. */
/* Not sure if this is really the 'right thing',
* e.g. for spool stores, but it makes the ui work. */
if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) {
- d(printf ("this folder is selectable\n"));
+ d (printf ("this folder is selectable\n"));
if (m->tostore == m->fromstore && m->delete) {
camel_store_rename_folder_sync (
- m->fromstore, info->full_name, toname->str,
+ m->fromstore,
+ info->full_name,
+ toname->str,
cancellable, error);
if (error && *error)
goto exception;
@@ -258,7 +262,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m,
while (l) {
CamelFolderInfo *info = l->data;
- d(printf ("deleting folder '%s'\n", info->full_name));
+ d (printf ("deleting folder '%s'\n", info->full_name));
/* FIXME: we need to do something with the exception
* since otherwise the users sees a failed operation
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 17ecdbc..4dc130c 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -501,9 +501,9 @@ em_utils_flag_for_followup_clear (GtkWindow *parent,
CamelMessageInfo *mi = camel_folder_get_message_info (folder, uids->pdata[i]);
if (mi) {
- camel_message_info_set_user_tag(mi, "follow-up", NULL);
- camel_message_info_set_user_tag(mi, "due-by", NULL);
- camel_message_info_set_user_tag(mi, "completed-on", NULL);
+ camel_message_info_set_user_tag (mi, "follow-up", NULL);
+ camel_message_info_set_user_tag (mi, "due-by", NULL);
+ camel_message_info_set_user_tag (mi, "completed-on", NULL);
camel_folder_free_message_info (folder, mi);
}
}
@@ -543,9 +543,9 @@ em_utils_flag_for_followup_completed (GtkWindow *parent,
CamelMessageInfo *mi = camel_folder_get_message_info (folder, uids->pdata[i]);
if (mi) {
- tag = camel_message_info_user_tag(mi, "follow-up");
+ tag = camel_message_info_user_tag (mi, "follow-up");
if (tag && tag[0])
- camel_message_info_set_user_tag(mi, "completed-on", now);
+ camel_message_info_set_user_tag (mi, "completed-on", now);
camel_folder_free_message_info (folder, mi);
}
}
@@ -627,7 +627,8 @@ do_print_msg_to_file (GObject *source,
printer = e_mail_printer_new (parts_list);
e_mail_printer_set_export_filename (printer, filename);
- g_signal_connect_swapped (printer, "done",
+ g_signal_connect_swapped (
+ printer, "done",
G_CALLBACK (g_object_unref), printer);
e_mail_printer_print (printer, GTK_PRINT_OPERATION_ACTION_EXPORT, NULL);
@@ -654,8 +655,10 @@ em_utils_print_messages_to_file (CamelFolder *folder,
parser = e_mail_parser_new (session);
- e_mail_parser_parse (parser, folder, uid, message,
- (GAsyncReadyCallback) do_print_msg_to_file, NULL, g_strdup (filename));
+ e_mail_parser_parse (
+ parser, folder, uid, message,
+ (GAsyncReadyCallback) do_print_msg_to_file,
+ NULL, g_strdup (filename));
return TRUE;
}
@@ -991,12 +994,12 @@ em_utils_build_export_filename (CamelFolder *folder,
}
ts = localtime (&reftime);
- strftime(datetmp, 15, "%Y%m%d%H%M%S", ts);
+ strftime (datetmp, 15, "%Y%m%d%H%M%S", ts);
- if (g_ascii_strcasecmp (exporttype, "pdf")==0)
+ if (g_ascii_strcasecmp (exporttype, "pdf") == 0)
file = g_strdup_printf ("%s_%s.pdf", datetmp, camel_message_info_subject (info));
else
- file = g_strdup_printf ("%s_%s", datetmp, camel_message_info_subject(info));
+ file = g_strdup_printf ("%s_%s", datetmp, camel_message_info_subject (info));
}
camel_folder_free_message_info (folder, info);
@@ -1004,8 +1007,8 @@ em_utils_build_export_filename (CamelFolder *folder,
time_t reftime;
reftime = time (NULL);
ts = localtime (&reftime);
- strftime(datetmp, 15, "%Y%m%d%H%M%S", ts);
- if (g_ascii_strcasecmp (exporttype, "pdf")==0)
+ strftime (datetmp, 15, "%Y%m%d%H%M%S", ts);
+ if (g_ascii_strcasecmp (exporttype, "pdf") == 0)
file = g_strdup_printf ("%s_Untitled Message.pdf", datetmp);
else
file = g_strdup_printf ("%s_Untitled Message", datetmp);
@@ -1043,7 +1046,7 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
gchar *exporttype;
gint exportname;
- tmpdir = e_mkdtemp("drag-n-drop-XXXXXX");
+ tmpdir = e_mkdtemp ("drag-n-drop-XXXXXX");
if (tmpdir == NULL)
return;
@@ -1083,7 +1086,7 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
if (em_utils_write_messages_to_stream (folder, uids, fstream) == 0) {
GdkAtom type;
/* terminate with \r\n to be compliant with the spec */
- gchar *uri_crlf = g_strconcat(uri, "\r\n", NULL);
+ gchar *uri_crlf = g_strconcat (uri, "\r\n", NULL);
type = gtk_selection_data_get_target (data);
gtk_selection_data_set (data, type, 8, (guchar *) uri_crlf, strlen (uri_crlf));
@@ -1124,7 +1127,7 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
if (em_utils_print_messages_to_file (folder, uids->pdata[i], filenames[i])) {
/* terminate with \r\n to be compliant with the spec */
uri = g_filename_to_uri (filenames[i], NULL, NULL);
- uris[uris_count++] = g_strconcat(uri, "\r\n", NULL);
+ uris[uris_count++] = g_strconcat (uri, "\r\n", NULL);
g_free (uri);
}
}
@@ -1167,7 +1170,7 @@ em_utils_selection_get_urilist (GtkSelectionData *selection_data,
gint fd, i, res = 0;
gchar **uris;
- d(printf(" * drop uri list\n"));
+ d (printf (" * drop uri list\n"));
uris = gtk_selection_data_get_uris (selection_data);
@@ -1180,7 +1183,7 @@ em_utils_selection_get_urilist (GtkSelectionData *selection_data,
if (url == NULL)
continue;
- if (strcmp(url->protocol, "file") == 0
+ if (strcmp (url->protocol, "file") == 0
&& (fd = g_open (url->path, O_RDONLY | O_BINARY, 0)) != -1) {
stream = camel_stream_fs_new_with_fd (fd);
if (stream) {
@@ -1316,7 +1319,7 @@ em_utils_message_to_html (CamelSession *session,
if (append && *append)
camel_stream_write_string (mem, append, NULL, NULL);
- camel_stream_write(mem, "", 1, NULL, NULL);
+ camel_stream_write (mem, "", 1, NULL, NULL);
g_object_unref (mem);
return (gchar *) g_byte_array_free (buf, FALSE);
@@ -1393,7 +1396,7 @@ em_utils_url_unescape_amp (const gchar *url)
amps = 0;
for (i = 0; url[i]; i++) {
- if (url [i] == '&' && strncmp (url + i, "&", 5) == 0)
+ if (url[i] == '&' && strncmp (url + i, "&", 5) == 0)
amps++;
}
@@ -1405,7 +1408,7 @@ em_utils_url_unescape_amp (const gchar *url)
for (i = 0, j = 0; url[i]; i++, j++) {
buff[j] = url[i];
- if (url [i] == '&' && strncmp (url + i, "&", 5) == 0)
+ if (url[i] == '&' && strncmp (url + i, "&", 5) == 0)
i += 4;
}
buff[j] = 0;
diff --git a/mail/em-vfolder-editor-context.c b/mail/em-vfolder-editor-context.c
index b7c7a49..31a2c20 100644
--- a/mail/em-vfolder-editor-context.c
+++ b/mail/em-vfolder-editor-context.c
@@ -138,7 +138,7 @@ vfolder_editor_context_new_element (ERuleContext *context,
return e_filter_option_new ();
if (strcmp (type, "score") == 0)
- return e_filter_int_new_type("score", -3, 3);
+ return e_filter_int_new_type ("score", -3, 3);
if (strcmp (type, "folder") == 0)
return em_filter_editor_folder_element_new (priv->session);
diff --git a/mail/em-vfolder-editor-rule.c b/mail/em-vfolder-editor-rule.c
index 78fbd46..6a4cd6c 100644
--- a/mail/em-vfolder-editor-rule.c
+++ b/mail/em-vfolder-editor-rule.c
@@ -232,7 +232,7 @@ set_sensitive (struct _source_data *data)
static void
selection_changed_cb (GtkTreeSelection *selection,
- struct _source_data *data)
+ struct _source_data *data)
{
set_sensitive (data);
}
@@ -256,21 +256,22 @@ select_source_with_changed (GtkWidget *widget,
static void
autoupdate_toggled_cb (GtkToggleButton *toggle,
- struct _source_data *data)
+ struct _source_data *data)
{
em_vfolder_rule_set_autoupdate (data->vr, gtk_toggle_button_get_active (toggle));
}
static void
include_subfolders_toggled_cb (GtkCellRendererToggle *cell_renderer,
- const gchar *path_string,
- struct _source_data *data)
+ const gchar *path_string,
+ struct _source_data *data)
{
GtkTreeModel *model;
GtkTreePath *path;
GtkTreeIter iter;
- gtk_cell_renderer_toggle_set_active (cell_renderer,
+ gtk_cell_renderer_toggle_set_active (
+ cell_renderer,
!gtk_cell_renderer_toggle_get_active (cell_renderer));
model = gtk_tree_view_get_model (data->tree_view);
@@ -279,13 +280,15 @@ include_subfolders_toggled_cb (GtkCellRendererToggle *cell_renderer,
if (gtk_tree_model_get_iter (model, &iter, path)) {
gchar *source = NULL;
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ gtk_list_store_set (
+ GTK_LIST_STORE (model), &iter,
2, gtk_cell_renderer_toggle_get_active (cell_renderer),
-1);
gtk_tree_model_get (model, &iter, 1, &source, -1);
if (source) {
- em_vfolder_rule_source_set_include_subfolders (data->vr, source,
+ em_vfolder_rule_source_set_include_subfolders (
+ data->vr, source,
gtk_cell_renderer_toggle_get_active (cell_renderer));
g_free (source);
}
@@ -514,7 +517,8 @@ get_widget (EFilterRule *fr,
tmp = g_strdup_printf ("<b>%s</b>", _("Search Folder Sources"));
label = gtk_label_new (tmp);
g_free (tmp);
- g_object_set (G_OBJECT (label),
+ g_object_set (
+ G_OBJECT (label),
"use-markup", TRUE,
"xalign", 0.0,
NULL);
@@ -529,7 +533,8 @@ get_widget (EFilterRule *fr,
gtk_container_add (GTK_CONTAINER (hgrid), label);
vgrid = gtk_grid_new ();
- g_object_set (G_OBJECT (vgrid),
+ g_object_set (
+ G_OBJECT (vgrid),
"orientation", GTK_ORIENTATION_VERTICAL,
"border-width", 6,
"row-spacing", 6,
@@ -565,7 +570,8 @@ get_widget (EFilterRule *fr,
gtk_container_add (GTK_CONTAINER (vgrid), hgrid);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- g_object_set (G_OBJECT (scrolled_window),
+ g_object_set (
+ G_OBJECT (scrolled_window),
"hscrollbar-policy", GTK_POLICY_AUTOMATIC,
"vscrollbar-policy", GTK_POLICY_AUTOMATIC,
"shadow-type", GTK_SHADOW_IN,
@@ -580,7 +586,8 @@ get_widget (EFilterRule *fr,
renderer = gtk_cell_renderer_text_new ();
tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ gtk_tree_view_insert_column_with_attributes (
+ GTK_TREE_VIEW (tree_view),
-1, "column", renderer, "markup", 0, NULL);
renderer = gtk_cell_renderer_toggle_new ();
@@ -589,7 +596,8 @@ get_widget (EFilterRule *fr,
g_signal_connect (renderer, "toggled", G_CALLBACK (include_subfolders_toggled_cb), data);
renderer = gtk_cell_renderer_text_new ();
- g_object_set (G_OBJECT (renderer),
+ g_object_set (
+ G_OBJECT (renderer),
"editable", FALSE,
"text", _("include subfolders"),
NULL);
@@ -602,7 +610,8 @@ get_widget (EFilterRule *fr,
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
vgrid = gtk_grid_new ();
- g_object_set (G_OBJECT (vgrid),
+ g_object_set (
+ G_OBJECT (vgrid),
"orientation", GTK_ORIENTATION_VERTICAL,
"border-width", 6,
"row-spacing", 6,
@@ -610,11 +619,13 @@ get_widget (EFilterRule *fr,
gtk_container_add (GTK_CONTAINER (hgrid), vgrid);
data->buttons[BUTTON_ADD] = gtk_button_new_from_stock (GTK_STOCK_ADD);
- g_signal_connect (data->buttons[BUTTON_ADD], "clicked",
+ g_signal_connect (
+ data->buttons[BUTTON_ADD], "clicked",
G_CALLBACK (source_add), data);
data->buttons[BUTTON_REMOVE] = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
- g_signal_connect (data->buttons[BUTTON_REMOVE], "clicked",
+ g_signal_connect (
+ data->buttons[BUTTON_REMOVE], "clicked",
G_CALLBACK (source_remove), data);
gtk_container_add (GTK_CONTAINER (vgrid), data->buttons[BUTTON_ADD]);
@@ -633,7 +644,8 @@ get_widget (EFilterRule *fr,
CAMEL_SESSION (session), source, NULL);
gtk_list_store_append (data->model, &iter);
- gtk_list_store_set (data->model, &iter,
+ gtk_list_store_set (
+ data->model, &iter,
0, markup,
1, source,
2, em_vfolder_rule_source_get_include_subfolders (vr, source),
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 24db104..5b555cb 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -126,12 +126,12 @@ elm_get_rc (EImport *ei,
GHashTable *prefs;
gchar *elmrc;
- prefs = g_object_get_data((GObject *)ei, "elm-rc");
+ prefs = g_object_get_data ((GObject *) ei, "elm-rc");
if (prefs == NULL) {
- elmrc = g_build_filename(g_get_home_dir(), ".elm/elmrc", NULL);
+ elmrc = g_build_filename (g_get_home_dir (), ".elm/elmrc", NULL);
prefs = parse_elm_rc (elmrc);
g_free (elmrc);
- g_object_set_data((GObject *)ei, "elm-rc", prefs);
+ g_object_set_data ((GObject *) ei, "elm-rc", prefs);
}
if (prefs == NULL)
@@ -152,13 +152,13 @@ elm_supported (EImport *ei,
if (target->type != E_IMPORT_TARGET_HOME)
return FALSE;
- elmdir = g_build_filename(g_get_home_dir (), ".elm", NULL);
+ elmdir = g_build_filename (g_get_home_dir (), ".elm", NULL);
exists = g_file_test (elmdir, G_FILE_TEST_IS_DIR);
g_free (elmdir);
if (!exists)
return FALSE;
- maildir = elm_get_rc(ei, "maildir");
+ maildir = elm_get_rc (ei, "maildir");
if (maildir == NULL)
maildir = "Mail";
@@ -202,7 +202,7 @@ elm_import_exec (struct _elm_import_msg *m,
shell_backend = e_shell_get_backend_by_name (shell, "mail");
session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend));
- maildir = elm_get_rc(m->import, "maildir");
+ maildir = elm_get_rc (m->import, "maildir");
if (maildir == NULL)
maildir = "Mail";
@@ -289,7 +289,7 @@ mail_importer_elm_import (EImport *ei,
gint id;
m = mail_msg_new (&elm_import_info);
- g_datalist_set_data(&target->data, "elm-msg", m);
+ g_datalist_set_data (&target->data, "elm-msg", m);
m->import = ei;
g_object_ref (m->import);
m->target = (EImportTargetHome *) target;
@@ -325,11 +325,11 @@ elm_getwidget (EImport *ei,
GtkWidget *box, *w;
g_datalist_set_data (
- &target->data, "elm-do-mail", GINT_TO_POINTER(TRUE));
+ &target->data, "elm-do-mail", GINT_TO_POINTER (TRUE));
box = gtk_vbox_new (FALSE, 2);
- w = gtk_check_button_new_with_label(_("Mail"));
+ w = gtk_check_button_new_with_label (_("Mail"));
gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
g_signal_connect (
w, "toggled",
@@ -346,7 +346,7 @@ elm_import (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- if (GPOINTER_TO_INT(g_datalist_get_data(&target->data, "elm-do-mail")))
+ if (GPOINTER_TO_INT (g_datalist_get_data (&target->data, "elm-do-mail")))
mail_importer_elm_import (ei, target);
else
e_import_complete (ei, target);
@@ -357,7 +357,7 @@ elm_cancel (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- struct _elm_import_msg *m = g_datalist_get_data(&target->data, "elm-msg");
+ struct _elm_import_msg *m = g_datalist_get_data (&target->data, "elm-msg");
if (m)
g_cancellable_cancel (m->status);
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 24a63c3..a024729 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -184,7 +184,7 @@ mbox_supported (EImport *ei,
if (s->uri_src == NULL)
return TRUE;
- if (strncmp(s->uri_src, "file:///", strlen("file:///")) != 0)
+ if (strncmp (s->uri_src, "file:///", strlen ("file:///")) != 0)
return FALSE;
filename = g_filename_from_uri (s->uri_src, NULL, NULL);
@@ -192,7 +192,7 @@ mbox_supported (EImport *ei,
g_free (filename);
if (fd != -1) {
n = read (fd, signature, 5);
- ret = n == 5 && memcmp(signature, "From ", 5) == 0;
+ ret = n == 5 && memcmp (signature, "From ", 5) == 0;
close (fd);
}
@@ -272,7 +272,7 @@ mbox_import (EImport *ei,
/* TODO: do we validate target? */
importer = g_malloc0 (sizeof (*importer));
- g_datalist_set_data(&target->data, "mbox-data", importer);
+ g_datalist_set_data (&target->data, "mbox-data", importer);
importer->import = ei;
importer->target = target;
importer->status_lock = g_mutex_new ();
@@ -296,7 +296,7 @@ mbox_cancel (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- MboxImporter *importer = g_datalist_get_data(&target->data, "mbox-data");
+ MboxImporter *importer = g_datalist_get_data (&target->data, "mbox-data");
if (importer)
g_cancellable_cancel (importer->cancellable);
@@ -407,7 +407,8 @@ mbox_get_preview (EImport *ei,
camel_mime_message_get_from (msg)));
gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_set (
+ store, &iter,
0, camel_mime_message_get_subject (msg) ?
camel_mime_message_get_subject (msg) : "",
1, from ? from : "", 2, msg, -1);
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 824d48a..789a7d3 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -177,13 +177,13 @@ import_mbox_exec (struct _import_mbox_msg *m,
info = camel_message_info_new (NULL);
- tmp = camel_medium_get_header((CamelMedium *)msg, "X-Mozilla-Status");
+ tmp = camel_medium_get_header ((CamelMedium *) msg, "X-Mozilla-Status");
if (tmp)
flags |= decode_mozilla_status (tmp);
- tmp = camel_medium_get_header((CamelMedium *)msg, "Status");
+ tmp = camel_medium_get_header ((CamelMedium *) msg, "Status");
if (tmp)
flags |= decode_status (tmp);
- tmp = camel_medium_get_header((CamelMedium *)msg, "X-Status");
+ tmp = camel_medium_get_header ((CamelMedium *) msg, "X-Status");
if (tmp)
flags |= decode_status (tmp);
@@ -348,7 +348,7 @@ import_folders_rec (struct _import_folders_data *m,
data_dir, folderparent, folder);
}
- printf("importing to uri %s\n", uri);
+ printf ("importing to uri %s\n", uri);
mail_importer_import_mbox_sync (
m->session, filefull, uri, m->cancellable);
g_free (uri);
@@ -356,7 +356,7 @@ import_folders_rec (struct _import_folders_data *m,
/* This little gem re-uses the stat buffer and filefull
* to automagically scan mozilla-format folders. */
if (!m->elmfmt) {
- gchar *tmp = g_strdup_printf("%s.sbd", filefull);
+ gchar *tmp = g_strdup_printf ("%s.sbd", filefull);
g_free (filefull);
filefull = tmp;
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index dbcc488..664a77b 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -71,11 +71,11 @@ pine_supported (EImport *ei,
if (target->type != E_IMPORT_TARGET_HOME)
return FALSE;
- maildir = g_build_filename(g_get_home_dir (), "mail", NULL);
+ maildir = g_build_filename (g_get_home_dir (), "mail", NULL);
md_exists = g_file_test (maildir, G_FILE_TEST_IS_DIR);
g_free (maildir);
- addrfile = g_build_filename(g_get_home_dir (), ".addressbook", NULL);
+ addrfile = g_build_filename (g_get_home_dir (), ".addressbook", NULL);
addr_exists = g_file_test (addrfile, G_FILE_TEST_IS_REGULAR);
g_free (addrfile);
@@ -109,7 +109,7 @@ import_contact (EBookClient *book_client,
GError *error = NULL;
card = e_contact_new ();
- strings = g_strsplit(line, "\t", 5);
+ strings = g_strsplit (line, "\t", 5);
if (strings[0] && strings[1] && strings[2]) {
gchar *new_uid = NULL;
@@ -121,7 +121,7 @@ import_contact (EBookClient *book_client,
if (addr[0] == '(' && addr[len - 1] == ')') {
addr[0] = 0;
addr[len - 1] = 0;
- addrs = g_strsplit(addr+1, ",", 0);
+ addrs = g_strsplit (addr + 1, ",", 0);
list = NULL;
/* XXX So ... this api is just insane ... we set
* plain strings as the contact email if it
@@ -184,14 +184,14 @@ import_contacts (void)
const gchar *extension_name;
GError *error = NULL;
- printf("importing pine addressbook\n");
+ printf ("importing pine addressbook\n");
shell = e_shell_get_default ();
registry = e_shell_get_registry (shell);
extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
- name = g_build_filename(g_get_home_dir(), ".addressbook", NULL);
- fp = fopen(name, "r");
+ name = g_build_filename (g_get_home_dir (), ".addressbook", NULL);
+ fp = fopen (name, "r");
g_free (name);
if (fp == NULL)
return;
@@ -219,7 +219,7 @@ import_contacts (void)
return;
}
- line = g_string_new("");
+ line = g_string_new ("");
g_string_set_size (line, 256);
offset = 0;
while (fgets (line->str + offset, 256, fp)) {
@@ -273,13 +273,13 @@ pine_import_exec (struct _pine_import_msg *m,
shell_backend = e_shell_get_backend_by_name (shell, "mail");
session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend));
- if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr")))
+ if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pine-do-addr")))
import_contacts ();
- if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-mail"))) {
+ if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pine-do-mail"))) {
gchar *path;
- path = g_build_filename(g_get_home_dir(), "mail", NULL);
+ path = g_build_filename (g_get_home_dir (), "mail", NULL);
mail_importer_import_folders_sync (
session, path, pine_special_folders, 0, m->cancellable);
g_free (path);
@@ -358,7 +358,7 @@ mail_importer_pine_import (EImport *ei,
gint id;
m = mail_msg_new (&pine_import_info);
- g_datalist_set_data(&target->data, "pine-msg", m);
+ g_datalist_set_data (&target->data, "pine-msg", m);
m->import = ei;
g_object_ref (m->import);
m->target = target;
@@ -420,14 +420,14 @@ pine_getwidget (EImport *ei,
box = gtk_vbox_new (FALSE, 2);
- w = gtk_check_button_new_with_label(_("Mail"));
+ w = gtk_check_button_new_with_label (_("Mail"));
gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
g_signal_connect (
w, "toggled",
G_CALLBACK (checkbox_mail_toggle_cb), target);
gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 0);
- w = gtk_check_button_new_with_label(_("Address Book"));
+ w = gtk_check_button_new_with_label (_("Address Book"));
gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
g_signal_connect (
w, "toggled",
@@ -444,8 +444,8 @@ pine_import (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- if (GPOINTER_TO_INT(g_datalist_get_data(&target->data, "pine-do-mail"))
- || GPOINTER_TO_INT(g_datalist_get_data(&target->data, "pine-do-addr")))
+ if (GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pine-do-mail"))
+ || GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pine-do-addr")))
mail_importer_pine_import (ei, target);
else
e_import_complete (ei, target);
@@ -456,7 +456,7 @@ pine_cancel (EImport *ei,
EImportTarget *target,
EImportImporter *im)
{
- struct _pine_import_msg *m = g_datalist_get_data(&target->data, "pine-msg");
+ struct _pine_import_msg *m = g_datalist_get_data (&target->data, "pine-msg");
if (m)
g_cancellable_cancel (m->cancellable);
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index f0876a4..5ce81dd 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -66,7 +66,7 @@ rule_match_recipients (ERuleContext *context,
part = e_rule_context_create_part (context, "to");
e_filter_rule_add_part ((EFilterRule *) rule, part);
element = e_filter_part_find_element (part, "recipient-type");
- e_filter_option_set_current ((EFilterOption *)element, "contains");
+ e_filter_option_set_current ((EFilterOption *) element, "contains");
element = e_filter_part_find_element (part, "recipient");
e_filter_input_set_value ((EFilterInput *) element, addr);
@@ -119,7 +119,7 @@ rule_add_subject (ERuleContext *context,
part = e_rule_context_create_part (context, "subject");
e_filter_rule_add_part ((EFilterRule *) rule, part);
element = e_filter_part_find_element (part, "subject-type");
- e_filter_option_set_current ((EFilterOption *)element, "contains");
+ e_filter_option_set_current ((EFilterOption *) element, "contains");
element = e_filter_part_find_element (part, "subject");
e_filter_input_set_value ((EFilterInput *) element, text);
}
@@ -138,7 +138,7 @@ rule_add_sender (ERuleContext *context,
part = e_rule_context_create_part (context, "sender");
e_filter_rule_add_part ((EFilterRule *) rule, part);
element = e_filter_part_find_element (part, "sender-type");
- e_filter_option_set_current ((EFilterOption *)element, "contains");
+ e_filter_option_set_current ((EFilterOption *) element, "contains");
element = e_filter_part_find_element (part, "sender");
e_filter_input_set_value ((EFilterInput *) element, text);
}
@@ -200,11 +200,11 @@ rule_match_mlist (ERuleContext *context,
if (mlist[0] == 0)
return;
- part = e_rule_context_create_part(context, "mlist");
+ part = e_rule_context_create_part (context, "mlist");
e_filter_rule_add_part (rule, part);
- element = e_filter_part_find_element(part, "mlist-type");
- e_filter_option_set_current((EFilterOption *)element, "is");
+ element = e_filter_part_find_element (part, "mlist-type");
+ e_filter_option_set_current ((EFilterOption *) element, "is");
element = e_filter_part_find_element (part, "mlist");
e_filter_input_set_value ((EFilterInput *) element, mlist);
@@ -226,7 +226,7 @@ rule_from_address (EFilterRule *rule,
rule_add_sender (context, rule, address);
if (name == NULL || name[0] == '\0')
name = address;
- namestr = g_strdup_printf(_("Mail from %s"), name);
+ namestr = g_strdup_printf (_("Mail from %s"), name);
e_filter_rule_set_name (rule, namestr);
g_free (namestr);
}
@@ -269,7 +269,7 @@ rule_from_message (EFilterRule *rule,
rule_add_sender (context, rule, address);
if (name == NULL || name[0] == '\0')
name = address;
- namestr = g_strdup_printf(_("Mail from %s"), name);
+ namestr = g_strdup_printf (_("Mail from %s"), name);
e_filter_rule_set_name (rule, namestr);
g_free (namestr);
}
@@ -403,7 +403,7 @@ filter_gui_add_from_message (EMailSession *session,
e_filter_rule_set_source (rule, source);
e_rule_context_add_rule_gui (
- (ERuleContext *)fc, rule, _("Add Filter Rule"), user);
+ (ERuleContext *) fc, rule, _("Add Filter Rule"), user);
g_free (user);
g_object_unref (fc);
}
@@ -441,7 +441,7 @@ mail_filter_rename_folder (CamelStore *store,
(ERuleContext *) fc, old_uri, new_uri, g_str_equal);
if (changed) {
if (e_rule_context_save ((ERuleContext *) fc, user) == -1)
- g_warning("Could not write out changed filter rules\n");
+ g_warning ("Could not write out changed filter rules\n");
e_rule_context_free_uri_list ((ERuleContext *) fc, changed);
}
@@ -487,7 +487,7 @@ mail_filter_delete_folder (CamelStore *store,
gchar *info;
GList *l;
- s = g_string_new("");
+ s = g_string_new ("");
s_count = 0;
for (l = deleted; l; l = l->next) {
const gchar *name = (const gchar *) l->data;
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index c5d3cd7..9d55c00 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -266,7 +266,7 @@ dialog_response (GtkDialog *gd,
{
switch (button) {
case GTK_RESPONSE_CANCEL:
- d(printf("cancelled whole thing\n"));
+ d (printf ("cancelled whole thing\n"));
if (!data->cancelled) {
data->cancelled = TRUE;
g_hash_table_foreach (data->active, (GHFunc) cancel_send_info, NULL);
@@ -274,7 +274,7 @@ dialog_response (GtkDialog *gd,
gtk_dialog_set_response_sensitive (gd, GTK_RESPONSE_CANCEL, FALSE);
break;
default:
- d(printf("hiding dialog\n"));
+ d (printf ("hiding dialog\n"));
g_hash_table_foreach (data->active, (GHFunc) hide_send_info, NULL);
data->gd = NULL;
/*gtk_widget_destroy((GtkWidget *)gd);*/
@@ -783,12 +783,12 @@ update_folders (gchar *uri,
{
time_t now = *((time_t *) data);
- d(printf("checking update for folder: %s\n", info->uri));
+ d (printf ("checking update for folder: %s\n", info->uri));
/* let it flow through to the folders every 10 seconds */
/* we back off slowly as we progress */
if (now > info->update + 10 + info->count *5) {
- d(printf("upating a folder: %s\n", info->uri));
+ d (printf ("upating a folder: %s\n", info->uri));
/*camel_folder_thaw(info->folder);
camel_folder_freeze (info->folder);*/
info->update = now;
@@ -810,7 +810,7 @@ receive_status (CamelFilterDriver *driver,
g_hash_table_foreach (info->data->folders, (GHFunc) update_folders, &now);
if (info->data->inbox && now > info->data->inbox_update + 20) {
- d(printf("updating inbox too\n"));
+ d (printf ("updating inbox too\n"));
/* this doesn't seem to work right :( */
/*camel_folder_thaw(info->data->inbox);
camel_folder_freeze (info->data->inbox);*/
@@ -890,7 +890,7 @@ receive_done (gint still_more,
gtk_widget_set_sensitive (info->cancel_button, FALSE);
/* remove/free this active download */
- d(printf("%s: freeing info %p\n", G_STRFUNC, info));
+ d (printf ("%s: freeing info %p\n", G_STRFUNC, info));
if (info->type == SEND_SEND) {
gpointer key = NULL, value = NULL;
if (!g_hash_table_lookup_extended (info->data->active, SEND_URI_KEY, &key, &value))
@@ -1017,7 +1017,7 @@ struct _refresh_folders_msg {
static gchar *
refresh_folders_desc (struct _refresh_folders_msg *m)
{
- return g_strdup_printf(_("Checking for new mail"));
+ return g_strdup_printf (_("Checking for new mail"));
}
static void
@@ -1319,7 +1319,7 @@ mail_receive_service (CamelService *service)
info->cancellable, "status",
G_CALLBACK (operation_status), info);
- d(printf("Adding new info %p\n", info));
+ d (printf ("Adding new info %p\n", info));
g_hash_table_insert (data->active, g_strdup (uid), info);
@@ -1378,12 +1378,12 @@ mail_send (EMailSession *session)
info = g_hash_table_lookup (data->active, SEND_URI_KEY);
if (info != NULL) {
info->again++;
- d(printf("send of %s still in progress\n", transport->url));
+ d (printf ("send of %s still in progress\n", transport->url));
g_object_unref (service);
return;
}
- d(printf("starting non-interactive send of '%s'\n", transport->url));
+ d (printf ("starting non-interactive send of '%s'\n", transport->url));
type = get_receive_type (service);
if (type == SEND_INVALID) {
@@ -1403,7 +1403,7 @@ mail_send (EMailSession *session)
info->state = SEND_ACTIVE;
info->timeout_id = 0;
- d(printf("Adding new info %p\n", info));
+ d (printf ("Adding new info %p\n", info));
g_hash_table_insert (data->active, g_strdup (SEND_URI_KEY), info);
diff --git a/mail/mail-vfolder-ui.c b/mail/mail-vfolder-ui.c
index d9b68ad..efe086c 100644
--- a/mail/mail-vfolder-ui.c
+++ b/mail/mail-vfolder-ui.c
@@ -197,7 +197,7 @@ new_rule_clicked (GtkWidget *w,
if (button == GTK_RESPONSE_OK) {
const gchar *config_dir;
gchar *user;
- EFilterRule *rule = g_object_get_data((GObject *)w, "rule");
+ EFilterRule *rule = g_object_get_data ((GObject *) w, "rule");
EAlert *alert = NULL;
if (!e_filter_rule_validate (rule, &alert)) {
@@ -260,8 +260,8 @@ static void
release_rule_notify_cb (gpointer rule)
{
/* disconnect the "changed" signal */
- g_signal_handlers_disconnect_by_data (rule,
- g_object_get_data (rule, "editor-dlg"));
+ g_signal_handlers_disconnect_by_data (
+ rule, g_object_get_data (rule, "editor-dlg"));
g_object_set_data (rule, "editor-dlg", NULL);
g_object_unref (rule);
}
diff --git a/mail/message-list.c b/mail/message-list.c
index 3a6f6ef..da0be14 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -146,7 +146,7 @@ static struct {
GdkAtom atom;
guint32 actions;
} ml_drag_info[] = {
- { "x-uid-list", NULL, GDK_ACTION_MOVE|GDK_ACTION_COPY },
+ { "x-uid-list", NULL, GDK_ACTION_MOVE | GDK_ACTION_COPY },
{ "message/rfc822", NULL, GDK_ACTION_COPY },
{ "text/uri-list", NULL, GDK_ACTION_COPY },
};
@@ -1029,9 +1029,10 @@ message_list_copy (MessageList *ml,
void
message_list_paste (MessageList *ml)
{
- gtk_selection_convert (ml->priv->invisible, GDK_SELECTION_CLIPBOARD,
- gdk_atom_intern ("x-uid-list", FALSE),
- GDK_CURRENT_TIME);
+ gtk_selection_convert (
+ ml->priv->invisible, GDK_SELECTION_CLIPBOARD,
+ gdk_atom_intern ("x-uid-list", FALSE),
+ GDK_CURRENT_TIME);
}
/*
@@ -1065,7 +1066,7 @@ ml_get_save_id (ETreeModel *etm,
CamelMessageInfo *info;
if (e_tree_model_node_is_root (etm, path))
- return g_strdup("root");
+ return g_strdup ("root");
/* Note: etable can ask for the save_id while we're clearing it,
* which is the only time data should be null */
@@ -1302,7 +1303,7 @@ ml_value_to_string (ETreeModel *etm,
case COL_DELETED:
case COL_UNREAD:
case COL_FOLLOWUP_FLAG_STATUS:
- return g_strdup_printf ("%u", GPOINTER_TO_UINT(value));
+ return g_strdup_printf ("%u", GPOINTER_TO_UINT (value));
case COL_SENT:
case COL_RECEIVED:
@@ -1429,7 +1430,7 @@ sanitize_recipients (const gchar *string)
quoted = ~quoted;
else if (c == ',' && !quoted) {
single_add = g_string_free (gstring, FALSE);
- name = g_strsplit(single_add,"<",2);
+ name = g_strsplit (single_add,"<",2);
g_string_append (recipients, *name);
g_string_append (recipients, ",");
g_free (single_add);
@@ -1442,7 +1443,7 @@ sanitize_recipients (const gchar *string)
}
single_add = g_string_free (gstring, FALSE);
- name = g_strsplit(single_add,"<",2);
+ name = g_strsplit (single_add,"<",2);
g_string_append (recipients, *name);
g_free (single_add);
g_strfreev (name);
@@ -1462,7 +1463,8 @@ add_label_if_known (struct LabelsData *ld,
GtkTreeIter label_defn;
if (e_mail_label_list_store_lookup (ld->store, tag, &label_defn)) {
- g_hash_table_insert (ld->labels_tag2iter,
+ g_hash_table_insert (
+ ld->labels_tag2iter,
/* Should be the same as the "tag" arg */
e_mail_label_list_store_get_tag (ld->store, &label_defn),
gtk_tree_iter_copy (&label_defn));
@@ -1596,7 +1598,7 @@ ml_tree_value_at_ex (ETreeModel *etm,
const gchar *tag;
gint score = 0;
- tag = camel_message_info_user_tag(msg_info, "score");
+ tag = camel_message_info_user_tag (msg_info, "score");
if (tag)
score = atoi (tag);
@@ -1607,8 +1609,8 @@ ml_tree_value_at_ex (ETreeModel *etm,
/* FIXME: this all should be methods off of message-tag-followup class,
* FIXME: the tag names should be namespaced :( */
- tag = camel_message_info_user_tag(msg_info, "follow-up");
- cmp = camel_message_info_user_tag(msg_info, "completed-on");
+ tag = camel_message_info_user_tag (msg_info, "follow-up");
+ cmp = camel_message_info_user_tag (msg_info, "completed-on");
if (tag && tag[0]) {
if (cmp && cmp[0])
return GINT_TO_POINTER (2);
@@ -1621,7 +1623,7 @@ ml_tree_value_at_ex (ETreeModel *etm,
const gchar *tag;
time_t due_by;
- tag = camel_message_info_user_tag(msg_info, "due-by");
+ tag = camel_message_info_user_tag (msg_info, "due-by");
if (tag && *tag) {
due_by = camel_header_decode_date (tag, NULL);
return GINT_TO_POINTER (due_by);
@@ -1630,7 +1632,7 @@ ml_tree_value_at_ex (ETreeModel *etm,
}
}
case COL_FOLLOWUP_FLAG:
- str = camel_message_info_user_tag(msg_info, "follow-up");
+ str = camel_message_info_user_tag (msg_info, "follow-up");
return (gpointer)(str ? str : "");
case COL_ATTACHMENT:
if (camel_message_info_user_flag (msg_info, "$has_cal"))
@@ -1694,9 +1696,9 @@ ml_tree_value_at_ex (ETreeModel *etm,
Don't say that I need to have the new labels[with subject] column visible always */
colour = NULL;
- due_by = camel_message_info_user_tag(msg_info, "due-by");
- completed = camel_message_info_user_tag(msg_info, "completed-on");
- followup = camel_message_info_user_tag(msg_info, "follow-up");
+ due_by = camel_message_info_user_tag (msg_info, "due-by");
+ completed = camel_message_info_user_tag (msg_info, "completed-on");
+ followup = camel_message_info_user_tag (msg_info, "follow-up");
if (colour == NULL) {
/* Get all applicable labels. */
struct LabelsData ld;
@@ -1975,16 +1977,18 @@ static ECell * create_composite_cell (gint col)
cell_date = e_cell_date_new (NULL, GTK_JUSTIFY_RIGHT);
e_cell_date_set_format_component (E_CELL_DATE (cell_date), "mail");
- g_object_set (cell_date,
- "bold_column", COL_UNREAD,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (
+ cell_date,
+ "bold_column", COL_UNREAD,
+ "color_column", COL_COLOUR,
+ NULL);
cell_from = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
- g_object_set (cell_from,
- "bold_column", COL_UNREAD,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (
+ cell_from,
+ "bold_column", COL_UNREAD,
+ "color_column", COL_COLOUR,
+ NULL);
e_cell_hbox_append (E_CELL_HBOX (cell_hbox), cell_from, show_email ? col : alt_col, 68);
e_cell_hbox_append (E_CELL_HBOX (cell_hbox), cell_attach, COL_ATTACHMENT, 5);
@@ -1994,9 +1998,10 @@ static ECell * create_composite_cell (gint col)
g_object_unref (cell_date);
cell_sub = e_cell_text_new (fixed_name? fixed_name : NULL, GTK_JUSTIFY_LEFT);
- g_object_set (cell_sub,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (
+ cell_sub,
+ "color_column", COL_COLOUR,
+ NULL);
cell_tree = e_cell_tree_new (TRUE, cell_sub);
e_cell_vbox_append (E_CELL_VBOX (cell_vbox), cell_hbox, COL_FROM);
e_cell_vbox_append (E_CELL_VBOX (cell_vbox), cell_tree, COL_SUBJECT);
@@ -2017,8 +2022,8 @@ static void
composite_cell_set_strike_col (ECell *cell,
gint col)
{
- g_object_set (g_object_get_data(G_OBJECT (cell), "cell_date"), "strikeout_column", col, NULL);
- g_object_set (g_object_get_data(G_OBJECT (cell), "cell_from"), "strikeout_column", col, NULL);
+ g_object_set (g_object_get_data (G_OBJECT (cell), "cell_date"), "strikeout_column", col, NULL);
+ g_object_set (g_object_get_data (G_OBJECT (cell), "cell_from"), "strikeout_column", col, NULL);
}
static ETableExtras *
@@ -2064,19 +2069,21 @@ message_list_create_extras (void)
/* date cell */
cell = e_cell_date_new (NULL, GTK_JUSTIFY_LEFT);
e_cell_date_set_format_component (E_CELL_DATE (cell), "mail");
- g_object_set (cell,
- "bold_column", COL_UNREAD,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (
+ cell,
+ "bold_column", COL_UNREAD,
+ "color_column", COL_COLOUR,
+ NULL);
e_table_extras_add_cell (extras, "render_date", cell);
g_object_unref (cell);
/* text cell */
cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
- g_object_set (cell,
- "bold_column", COL_UNREAD,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (
+ cell,
+ "bold_column", COL_UNREAD,
+ "color_column", COL_COLOUR,
+ NULL);
e_table_extras_add_cell (extras, "render_text", cell);
g_object_unref (cell);
@@ -2086,10 +2093,11 @@ message_list_create_extras (void)
/* size cell */
cell = e_cell_size_new (NULL, GTK_JUSTIFY_RIGHT);
- g_object_set (cell,
- "bold_column", COL_UNREAD,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (
+ cell,
+ "bold_column", COL_UNREAD,
+ "color_column", COL_COLOUR,
+ NULL);
e_table_extras_add_cell (extras, "render_size", cell);
g_object_unref (cell);
@@ -2187,11 +2195,11 @@ ml_selection_get (GtkWidget *widget,
if (info & 2) {
/* text/plain */
- d(printf("setting text/plain selection for uids\n"));
+ d (printf ("setting text/plain selection for uids\n"));
em_utils_selection_set_mailbox (data, selection->folder, selection->uids);
} else {
/* x-uid-list */
- d(printf("setting x-uid-list selection for uids\n"));
+ d (printf ("setting x-uid-list selection for uids\n"));
em_utils_selection_set_uidlist (data, selection->folder, selection->uids);
}
}
@@ -2220,7 +2228,7 @@ ml_selection_received (GtkWidget *widget,
target = gtk_selection_data_get_target (selection_data);
if (target != gdk_atom_intern ("x-uid-list", FALSE)) {
- d(printf("Unknown selection received by message-list\n"));
+ d (printf ("Unknown selection received by message-list\n"));
return;
}
@@ -2290,9 +2298,9 @@ ml_drop_async_desc (struct _drop_msg *m)
full_name = camel_folder_get_full_name (m->folder);
if (m->move)
- return g_strdup_printf(_("Moving messages into folder %s"), full_name);
+ return g_strdup_printf (_("Moving messages into folder %s"), full_name);
else
- return g_strdup_printf(_("Copying messages into folder %s"), full_name);
+ return g_strdup_printf (_("Copying messages into folder %s"), full_name);
}
static void
@@ -2490,14 +2498,14 @@ ml_tree_drag_motion (ETree *tree,
while (targets != NULL) {
gint i;
- d(printf("atom drop '%s'\n", gdk_atom_name(targets->data)));
+ d (printf ("atom drop '%s'\n", gdk_atom_name (targets->data)));
for (i = 0; i < G_N_ELEMENTS (ml_drag_info); i++)
if (targets->data == (gpointer) ml_drag_info[i].atom)
actions |= ml_drag_info[i].actions;
targets = g_list_next (targets);
}
- d(printf("\n"));
+ d (printf ("\n"));
actions &= gdk_drag_context_get_actions (context);
action = gdk_drag_context_get_suggested_action (context);
@@ -2810,25 +2818,26 @@ message_list_class_init (MessageListClass *class)
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
- message_list_signals[MESSAGE_SELECTED] =
- g_signal_new ("message_selected",
- MESSAGE_LIST_TYPE,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MessageListClass, message_selected),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING);
-
- message_list_signals[MESSAGE_LIST_BUILT] =
- g_signal_new ("message_list_built",
- MESSAGE_LIST_TYPE,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MessageListClass, message_list_built),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ message_list_signals[MESSAGE_SELECTED] = g_signal_new (
+ "message_selected",
+ MESSAGE_LIST_TYPE,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MessageListClass, message_selected),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
+
+ message_list_signals[MESSAGE_LIST_BUILT] = g_signal_new (
+ "message_list_built",
+ MESSAGE_LIST_TYPE,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MessageListClass, message_list_built),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
static void
@@ -2847,28 +2856,29 @@ message_list_construct (MessageList *message_list)
GSettings *settings;
message_list->model =
- e_tree_memory_callbacks_new (ml_tree_icon_at,
+ e_tree_memory_callbacks_new (
+ ml_tree_icon_at,
- ml_column_count,
+ ml_column_count,
- ml_has_save_id,
- ml_get_save_id,
+ ml_has_save_id,
+ ml_get_save_id,
- ml_has_get_node_by_id,
- ml_get_node_by_id,
+ ml_has_get_node_by_id,
+ ml_get_node_by_id,
- ml_tree_sort_value_at,
- ml_tree_value_at,
- ml_tree_set_value_at,
- ml_tree_is_cell_editable,
+ ml_tree_sort_value_at,
+ ml_tree_value_at,
+ ml_tree_set_value_at,
+ ml_tree_is_cell_editable,
- ml_duplicate_value,
- ml_free_value,
- ml_initialize_value,
- ml_value_is_empty,
- ml_value_to_string,
+ ml_duplicate_value,
+ ml_free_value,
+ ml_initialize_value,
+ ml_value_is_empty,
+ ml_value_to_string,
- message_list);
+ message_list);
settings = g_settings_new ("org.gnome.evolution.mail");
e_tree_memory_set_expanded_default (
@@ -2894,7 +2904,7 @@ message_list_construct (MessageList *message_list)
if (atk_get_root () != NULL) {
a11y = gtk_widget_get_accessible (GTK_WIDGET (message_list));
- atk_object_set_name(a11y, _("Messages"));
+ atk_object_set_name (a11y, _("Messages"));
}
g_signal_connect (
@@ -2995,7 +3005,7 @@ clear_tree (MessageList *ml,
struct timeval start, end;
gulong diff;
- printf("Clearing tree\n");
+ printf ("Clearing tree\n");
gettimeofday (&start, NULL);
#endif
@@ -3022,7 +3032,7 @@ clear_tree (MessageList *ml,
gettimeofday (&end, NULL);
diff = end.tv_sec * 1000 + end.tv_usec / 1000;
diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
- printf("Clearing tree took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
+ printf ("Clearing tree took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
#endif
}
@@ -3239,7 +3249,7 @@ build_tree (MessageList *ml,
struct timeval start, end;
gulong diff;
- printf("Building tree\n");
+ printf ("Building tree\n");
gettimeofday (&start, NULL);
#endif
@@ -3247,7 +3257,7 @@ build_tree (MessageList *ml,
gettimeofday (&end, NULL);
diff = end.tv_sec * 1000 + end.tv_usec / 1000;
diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
- printf("Loading tree state took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
+ printf ("Loading tree state took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
#endif
if (ml->tree_root == NULL) {
@@ -3315,7 +3325,7 @@ build_tree (MessageList *ml,
gettimeofday (&end, NULL);
diff = end.tv_sec * 1000 + end.tv_usec / 1000;
diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
- printf("Building tree took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
+ printf ("Building tree took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
#endif
}
@@ -3334,7 +3344,7 @@ build_subtree (MessageList *ml,
while (c) {
/* phantom nodes no longer allowed */
if (!c->message) {
- g_warning("c->message shouldn't be NULL\n");
+ g_warning ("c->message shouldn't be NULL\n");
c = c->next;
continue;
}
@@ -3377,10 +3387,10 @@ tree_equal (ETreeModel *etm,
while (ap && bp) {
if (!node_equal (etm, ap, bp)) {
- g_warning("Nodes in tree differ");
+ g_warning ("Nodes in tree differ");
info = e_tree_memory_node_get_data (E_TREE_MEMORY (etm), ap);
- printf("table uid = %s\n", camel_message_info_uid(info));
- printf("camel uid = %s\n", camel_message_info_uid(bp->message));
+ printf ("table uid = %s\n", camel_message_info_uid (info));
+ printf ("camel uid = %s\n", camel_message_info_uid (bp->message));
return FALSE;
} else {
if (!tree_equal (etm, e_tree_model_node_get_first_child (etm, ap), bp->child))
@@ -3391,16 +3401,16 @@ tree_equal (ETreeModel *etm,
}
if (ap || bp) {
- g_warning("Tree differs, out of nodes in one branch");
+ g_warning ("Tree differs, out of nodes in one branch");
if (ap) {
info = e_tree_memory_node_get_data (E_TREE_MEMORY (etm), ap);
if (info)
- printf("table uid = %s\n", camel_message_info_uid(info));
+ printf ("table uid = %s\n", camel_message_info_uid (info));
else
- printf("info is empty?\n");
+ printf ("info is empty?\n");
}
if (bp) {
- printf("camel uid = %s\n", camel_message_info_uid(bp->message));
+ printf ("camel uid = %s\n", camel_message_info_uid (bp->message));
return FALSE;
}
return FALSE;
@@ -3446,7 +3456,7 @@ remove_node_diff (MessageList *ml,
ETreePath cp, cn;
CamelMessageInfo *info;
- t(printf("Removing node: %s\n", (gchar *)e_tree_memory_node_get_data(etm, node)));
+ t (printf ("Removing node: %s\n", (gchar *) e_tree_memory_node_get_data (etm, node)));
/* we depth-first remove all node data's ... */
cp = e_tree_model_node_get_first_child (etm, node);
@@ -3485,15 +3495,15 @@ build_subtree_diff (MessageList *ml,
bp = c;
while (ap || bp) {
- t(printf("Processing row: %d (subtree row %d)\n", *row, myrow));
+ t (printf ("Processing row: %d (subtree row %d)\n", *row, myrow));
if (ap == NULL) {
- t(printf("out of old nodes\n"));
+ t (printf ("out of old nodes\n"));
/* ran out of old nodes - remaining nodes are added */
add_node_diff (ml, parent, ap, bp, row, myrow);
myrow++;
bp = bp->next;
} else if (bp == NULL) {
- t(printf("out of new nodes\n"));
+ t (printf ("out of new nodes\n"));
/* ran out of new nodes - remaining nodes are removed */
tmp = e_tree_model_node_get_next (etm, ap);
remove_node_diff (ml, ap, 0);
@@ -3510,7 +3520,7 @@ build_subtree_diff (MessageList *ml,
g_hash_table_insert (ml->uid_rowmap, olduid, (gpointer)(*row));
}
} else {
- g_warning("Cannot find uid %s in table?", camel_message_info_uid(bp->message));
+ g_warning ("Cannot find uid %s in table?", camel_message_info_uid (bp->message));
}
}
#endif
@@ -3524,7 +3534,7 @@ build_subtree_diff (MessageList *ml,
ap = e_tree_model_node_get_next (etm, ap);
bp = bp->next;
} else {
- t(printf("searching for matches\n"));
+ t (printf ("searching for matches\n"));
/* we have to scan each side for a match */
bi = bp->next;
ai = e_tree_model_node_get_next (etm, ap);
@@ -3541,14 +3551,14 @@ build_subtree_diff (MessageList *ml,
if (bi) {
bt = bp;
while (bt != bi) {
- t(printf("adding new node 0\n"));
+ t (printf ("adding new node 0\n"));
add_node_diff (ml, parent, NULL, bt, row, myrow);
myrow++;
bt = bt->next;
}
bp = bi;
} else {
- t(printf("adding new node 1\n"));
+ t (printf ("adding new node 1\n"));
/* no match in new nodes, add one, try next */
add_node_diff (ml, parent, NULL, bp, row, myrow);
myrow++;
@@ -3559,14 +3569,14 @@ build_subtree_diff (MessageList *ml,
if (ai) {
at = ap;
while (at != ai) {
- t(printf("removing old node 0\n"));
+ t (printf ("removing old node 0\n"));
tmp = e_tree_model_node_get_next (etm, at);
remove_node_diff (ml, at, 0);
at = tmp;
}
ap = ai;
} else {
- t(printf("adding new node 2\n"));
+ t (printf ("adding new node 2\n"));
/* didn't find match in old nodes, must be new node? */
add_node_diff (ml, parent, NULL, bp, row, myrow);
myrow++;
@@ -3601,7 +3611,7 @@ build_flat (MessageList *ml,
struct timeval start, end;
gulong diff;
- printf("Building flat\n");
+ printf ("Building flat\n");
gettimeofday (&start, NULL);
#endif
@@ -3646,7 +3656,7 @@ build_flat (MessageList *ml,
gettimeofday (&end, NULL);
diff = end.tv_sec * 1000 + end.tv_usec / 1000;
diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
- printf("Building flat took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
+ printf ("Building flat took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
#endif
}
@@ -3685,10 +3695,10 @@ build_flat_diff (MessageList *ml,
gettimeofday (&start, NULL);
#endif
- d(printf("updating changes to display\n"));
+ d (printf ("updating changes to display\n"));
/* remove individual nodes? */
- d(printf("Removing messages from view:\n"));
+ d (printf ("Removing messages from view:\n"));
for (i = 0; i < changes->uid_removed->len; i++) {
node = g_hash_table_lookup (ml->uid_nodemap, changes->uid_removed->pdata[i]);
if (node) {
@@ -3699,17 +3709,17 @@ build_flat_diff (MessageList *ml,
}
/* add new nodes? - just append to the end */
- d(printf("Adding messages to view:\n"));
+ d (printf ("Adding messages to view:\n"));
for (i = 0; i < changes->uid_added->len; i++) {
info = camel_folder_get_message_info (ml->folder, changes->uid_added->pdata[i]);
if (info) {
- d(printf(" %s\n", (gchar *)changes->uid_added->pdata[i]));
+ d (printf (" %s\n", (gchar *) changes->uid_added->pdata[i]));
ml_uid_nodemap_insert (ml, info, NULL, -1);
}
}
/* and update changes too */
- d(printf("Changing messages to view:\n"));
+ d (printf ("Changing messages to view:\n"));
for (i = 0; i < changes->uid_changed->len; i++) {
ETreePath *node = g_hash_table_lookup (ml->uid_nodemap, changes->uid_changed->pdata[i]);
if (node) {
@@ -3724,7 +3734,7 @@ build_flat_diff (MessageList *ml,
gettimeofday (&end, NULL);
diff = end.tv_sec * 1000 + end.tv_usec / 1000;
diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
- printf("Inserting changes took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
+ printf ("Inserting changes took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
#endif
}
@@ -3792,11 +3802,8 @@ folder_changed (CamelFolder *folder,
if (ml->priv->destroyed)
return;
- d(printf("folder changed event, changes = %p\n", changes));
+ d (printf ("folder changed event, changes = %p\n", changes));
if (changes) {
- d(printf("changed = %d added = %d removed = %d\n",
- changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
-
for (i = 0; i < changes->uid_removed->len; i++)
g_hash_table_remove (
ml->normalised_hash,
@@ -3998,7 +4005,7 @@ on_cursor_activated_idle (gpointer data)
selected = e_selection_model_selected_count (esm);
if (selected == 1 && message_list->cursor_uid) {
- d(printf ("emitting cursor changed signal, for uid %s\n", message_list->cursor_uid));
+ d (printf ("emitting cursor changed signal, for uid %s\n", message_list->cursor_uid));
g_signal_emit (message_list, message_list_signals[MESSAGE_SELECTED], 0, message_list->cursor_uid);
} else {
g_signal_emit (message_list, message_list_signals[MESSAGE_SELECTED], 0, NULL);
@@ -4037,8 +4044,9 @@ on_cursor_activated_cmd (ETree *tree,
if (!message_list->idle_id) {
message_list->idle_id =
- g_idle_add_full (G_PRIORITY_LOW, on_cursor_activated_idle,
- message_list, NULL);
+ g_idle_add_full (
+ G_PRIORITY_LOW, on_cursor_activated_idle,
+ message_list, NULL);
}
}
@@ -4652,13 +4660,13 @@ regen_list_exec (struct _regen_list_msg *m,
if (m->hidejunk) {
if (m->search) {
expr = g_alloca (strlen (m->search) + 92);
- sprintf(expr, "(and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))\n %s)", m->search);
+ sprintf (expr, "(and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))\n %s)", m->search);
} else
expr = (gchar *) "(match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))";
} else {
if (m->search) {
expr = g_alloca (strlen (m->search) + 64);
- sprintf(expr, "(and (match-all (not (system-flag \"deleted\")))\n %s)", m->search);
+ sprintf (expr, "(and (match-all (not (system-flag \"deleted\")))\n %s)", m->search);
} else
expr = (gchar *) "(match-all (not (system-flag \"deleted\")))";
}
@@ -4666,7 +4674,7 @@ regen_list_exec (struct _regen_list_msg *m,
if (m->hidejunk) {
if (m->search) {
expr = g_alloca (strlen (m->search) + 64);
- sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search);
+ sprintf (expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search);
} else
expr = (gchar *) "(match-all (not (system-flag \"junk\")))";
} else {
diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c
index ce0de8d..360deb9 100644
--- a/modules/addressbook/e-book-shell-view-private.c
+++ b/modules/addressbook/e-book-shell-view-private.c
@@ -451,8 +451,9 @@ book_shell_view_load_view_collection (EShellViewClass *shell_view_class)
spec = e_table_specification_new ();
filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
if (!e_table_specification_load_from_file (spec, filename))
- g_critical ("Unable to load ETable specification file "
- "for address book");
+ g_critical (
+ "Unable to load ETable specification file "
+ "for address book");
g_free (filename);
factory = gal_view_factory_etable_new (spec);
diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c
index d03fb91..76c70eb 100644
--- a/modules/audio-inline/e-mail-formatter-audio-inline.c
+++ b/modules/audio-inline/e-mail-formatter-audio-inline.c
@@ -62,7 +62,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
E_TYPE_MAIL_FORMATTER_EXTENSION,
e_mail_formatter_formatter_extension_interface_init));
-static const gchar* formatter_mime_types[] = { "application/vnd.evolution.widget.audio-inline",
+static const gchar * formatter_mime_types[] = { "application/vnd.evolution.widget.audio-inline",
"audio/ac3", "audio/x-ac3",
"audio/basic", "audio/mpeg",
"audio/x-mpeg", "audio/mpeg3",
@@ -172,19 +172,19 @@ play_clicked (GtkWidget *button,
{
GstState cur_state;
- d(printf ("audio inline formatter: play\n"));
+ d (printf ("audio inline formatter: play\n"));
if (!part->filename) {
CamelStream *stream;
CamelDataWrapper *data;
GError *error = NULL;
gint argc = 1;
- const gchar *argv [] = { "org_gnome_audio_inline", NULL };
+ const gchar *argv[] = { "org_gnome_audio_inline", NULL };
/* FIXME this is ugly, we should stream this directly to gstreamer */
part->filename = e_mktemp ("org-gnome-audio-inline-file-XXXXXX");
- d(printf ("audio inline formatter: write to temp file %s\n", po->filename));
+ d (printf ("audio inline formatter: write to temp file %s\n", po->filename));
stream = camel_stream_fs_new_with_name (
part->filename, O_RDWR | O_CREAT | O_TRUNC, 0600, NULL);
@@ -193,7 +193,7 @@ play_clicked (GtkWidget *button,
camel_stream_flush (stream, NULL, NULL);
g_object_unref (stream);
- d(printf ("audio inline formatter: init gst playbin\n"));
+ d (printf ("audio inline formatter: init gst playbin\n"));
if (gst_init_check (&argc, (gchar ***) &argv, &error)) {
gchar *uri;
@@ -291,13 +291,13 @@ emfe_audio_inline_get_widget (EMailFormatterExtension *extension,
box = gtk_hbutton_box_new ();
ai_part->play_button = g_object_ref (
add_button (box, GTK_STOCK_MEDIA_PLAY,
- G_CALLBACK (play_clicked), part, TRUE));
+ G_CALLBACK (play_clicked), part, TRUE));
ai_part->pause_button = g_object_ref (
add_button (box, GTK_STOCK_MEDIA_PAUSE,
- G_CALLBACK (pause_clicked), part, FALSE));
+ G_CALLBACK (pause_clicked), part, FALSE));
ai_part->stop_button = g_object_ref (
add_button (box, GTK_STOCK_MEDIA_STOP,
- G_CALLBACK (stop_clicked), part, FALSE));
+ G_CALLBACK (stop_clicked), part, FALSE));
gtk_widget_show (box);
diff --git a/modules/audio-inline/e-mail-parser-audio-inline.c b/modules/audio-inline/e-mail-parser-audio-inline.c
index 95926ba..5509306 100644
--- a/modules/audio-inline/e-mail-parser-audio-inline.c
+++ b/modules/audio-inline/e-mail-parser-audio-inline.c
@@ -62,7 +62,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "audio/ac3", "audio/x-ac3",
+static const gchar * parser_mime_types[] = { "audio/ac3", "audio/x-ac3",
"audio/basic", "audio/mpeg",
"audio/x-mpeg", "audio/mpeg3",
"audio/x-mpeg3", "audio/mp3",
@@ -114,7 +114,7 @@ empe_audio_inline_parse (EMailParserExtension *extension,
len = part_id->len;
g_string_append (part_id, ".org-gnome-audio-inline-button-panel");
- d(printf ("audio inline formatter: format classid %s\n", part_id->str));
+ d (printf ("audio inline formatter: format classid %s\n", part_id->str));
mail_part = (EMailPartAudioInline *) e_mail_part_subclass_new (
part, part_id->str, sizeof (EMailPartAudioInline),
diff --git a/modules/backup-restore/e-mail-config-restore-page.c b/modules/backup-restore/e-mail-config-restore-page.c
index fa1a6fd..7a99766 100644
--- a/modules/backup-restore/e-mail-config-restore-page.c
+++ b/modules/backup-restore/e-mail-config-restore-page.c
@@ -362,7 +362,7 @@ evolution_backup_restore_validate_backup_file (const gchar *filename)
quotedfname = g_shell_quote (filename);
toolfname = g_build_filename (basedir, "evolution-backup", NULL);
- command = g_strdup_printf("%s --check %s", toolfname, quotedfname);
+ command = g_strdup_printf ("%s --check %s", toolfname, quotedfname);
result = system (command);
g_free (command);
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index 974dd29..9f46d90 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -868,7 +868,7 @@ main (gint argc,
res_file = g_strdup ((gchar *) opt_remaining[ii]);
file = res_file;
} else if (check_op) {
- d(g_message ("Checking %s", (gchar *) opt_remaining[ii]));
+ d (g_message ("Checking %s", (gchar *) opt_remaining[ii]));
chk_file = g_strdup ((gchar *) opt_remaining[ii]);
}
}
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 203142a..933fa6f 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -214,7 +214,7 @@ bogofilter_command (const gchar **argv,
g_set_error_literal (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
_("Bogofilter either crashed or "
- "failed to process a mail message"));
+ "failed to process a mail message"));
return source_data.exit_code;
}
diff --git a/modules/cal-config-weather/evolution-cal-config-weather.c b/modules/cal-config-weather/evolution-cal-config-weather.c
index 5387fe1..d5a4e2c 100644
--- a/modules/cal-config-weather/evolution-cal-config-weather.c
+++ b/modules/cal-config-weather/evolution-cal-config-weather.c
@@ -118,7 +118,7 @@ cal_config_weather_string_to_location (GBinding *binding,
match = start = gweather_location_find_by_station_code (world, code);
while (match) {
- char *cmp_city_name;
+ gchar *cmp_city_name;
/* Does the city name match? */
cmp_city_name = gweather_location_get_city_name (match);
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index f5a04d7..f72e765 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -321,8 +321,8 @@ action_calendar_purge_cb (GtkAction *action,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK_CANCEL,
_("This operation will permanently erase all events older "
- "than the selected amount of time. If you continue, you "
- "will not be able to recover these events."));
+ "than the selected amount of time. If you continue, you "
+ "will not be able to recover these events."));
gtk_dialog_set_default_response (
GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 721a8c9..2b5aa7e 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -360,7 +360,7 @@ cal_shell_view_taskpad_popup_event_cb (EShellView *shell_view,
static void
cal_shell_view_user_created_cb (ECalShellView *cal_shell_view,
- ECalClient *where_was_created,
+ ECalClient *where_was_created,
ECalendarView *calendar_view)
{
ECalShellSidebar *cal_shell_sidebar;
@@ -389,8 +389,9 @@ cal_shell_view_load_view_collection (EShellViewClass *shell_view_class)
spec = e_table_specification_new ();
filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
if (!e_table_specification_load_from_file (spec, filename))
- g_critical ("Unable to load ETable specification file "
- "for calendars");
+ g_critical (
+ "Unable to load ETable specification file "
+ "for calendars");
g_free (filename);
factory = calendar_view_factory_new (GNOME_CAL_DAY_VIEW);
@@ -506,9 +507,8 @@ init_timezone_monitors (ECalShellView *view)
GFile *file;
file = g_file_new_for_path (files_to_check[i]);
- priv->monitors[i] = g_file_monitor_file (file,
- G_FILE_MONITOR_NONE,
- NULL, NULL);
+ priv->monitors[i] = g_file_monitor_file (
+ file, G_FILE_MONITOR_NONE, NULL, NULL);
g_object_unref (file);
if (priv->monitors[i])
@@ -1203,8 +1203,7 @@ cal_time_t_ptr_compare (gconstpointer a,
static void cal_iterate_searching (ECalShellView *cal_shell_view);
-struct GenerateInstancesData
-{
+struct GenerateInstancesData {
ECalClient *client;
ECalShellView *cal_shell_view;
GCancellable *cancellable;
@@ -1222,7 +1221,9 @@ cal_searching_instances_done_cb (gpointer user_data)
gid->cal_shell_view->priv->search_pending_count--;
if (!gid->cal_shell_view->priv->search_pending_count) {
gid->cal_shell_view->priv->search_hit_cache =
- g_slist_sort (gid->cal_shell_view->priv->search_hit_cache, cal_time_t_ptr_compare);
+ g_slist_sort (
+ gid->cal_shell_view->priv->search_hit_cache,
+ cal_time_t_ptr_compare);
cal_iterate_searching (gid->cal_shell_view);
}
}
@@ -1303,7 +1304,9 @@ cal_search_get_object_list_cb (GObject *source,
cal_shell_view->priv->search_pending_count--;
if (!cal_shell_view->priv->search_pending_count) {
cal_shell_view->priv->search_hit_cache =
- g_slist_sort (cal_shell_view->priv->search_hit_cache, cal_time_t_ptr_compare);
+ g_slist_sort (
+ cal_shell_view->priv->search_hit_cache,
+ cal_time_t_ptr_compare);
cal_iterate_searching (cal_shell_view);
}
} else {
@@ -1311,8 +1314,11 @@ cal_search_get_object_list_cb (GObject *source,
GCancellable *cancellable;
time_t start, end;
- cancellable = e_activity_get_cancellable (cal_shell_view->priv->searching_activity);
- start = time_add_day (cal_shell_view->priv->search_time, (-1) * cal_shell_view->priv->search_direction);
+ cancellable = e_activity_get_cancellable (
+ cal_shell_view->priv->searching_activity);
+ start = time_add_day (
+ cal_shell_view->priv->search_time,
+ (-1) * cal_shell_view->priv->search_direction);
end = cal_shell_view->priv->search_time;
if (start > end) {
time_t tmp = start;
@@ -1322,14 +1328,17 @@ cal_search_get_object_list_cb (GObject *source,
for (iter = icalcomps; iter; iter = iter->next) {
icalcomponent *icalcomp = iter->data;
- struct GenerateInstancesData *gid = g_new0 (struct GenerateInstancesData, 1);
+ struct GenerateInstancesData *gid;
+ gid = g_new0 (struct GenerateInstancesData, 1);
gid->client = client;
gid->cal_shell_view = cal_shell_view;
gid->cancellable = g_object_ref (cancellable);
- e_cal_client_generate_instances_for_object (client, icalcomp, start, end, cancellable,
- cal_searching_got_instance_cb, gid, cal_searching_instances_done_cb);
+ e_cal_client_generate_instances_for_object (
+ client, icalcomp, start, end, cancellable,
+ cal_searching_got_instance_cb, gid,
+ cal_searching_instances_done_cb);
}
e_cal_client_free_icalcomp_slist (icalcomps);
@@ -1394,7 +1403,9 @@ cal_searching_update_alert (ECalShellView *cal_shell_view,
priv = cal_shell_view->priv;
if (priv->search_alert) {
- e_alert_response (priv->search_alert, e_alert_get_default_response (priv->search_alert));
+ e_alert_response (
+ priv->search_alert,
+ e_alert_get_default_response (priv->search_alert));
priv->search_alert = NULL;
}
@@ -1408,8 +1419,10 @@ cal_searching_update_alert (ECalShellView *cal_shell_view,
g_object_add_weak_pointer (G_OBJECT (alert), &priv->search_alert);
e_alert_start_timer (priv->search_alert, 5);
- shell_content = e_shell_view_get_shell_content (E_SHELL_VIEW (cal_shell_view));
- e_alert_sink_submit_alert (E_ALERT_SINK (shell_content), priv->search_alert);
+ shell_content = e_shell_view_get_shell_content (
+ E_SHELL_VIEW (cal_shell_view));
+ e_alert_sink_submit_alert (
+ E_ALERT_SINK (shell_content), priv->search_alert);
g_object_unref (priv->search_alert);
}
@@ -1436,7 +1449,9 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
if (cal_searching_check_candidates (cal_shell_view)) {
if (priv->searching_activity) {
- e_activity_set_state (priv->searching_activity, E_ACTIVITY_COMPLETED);
+ e_activity_set_state (
+ priv->searching_activity,
+ E_ACTIVITY_COMPLETED);
g_object_unref (priv->searching_activity);
priv->searching_activity = NULL;
}
@@ -1445,18 +1460,25 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
}
if (!priv->searching_activity) {
- EShellBackend *shell_backend = e_shell_view_get_shell_backend (E_SHELL_VIEW (cal_shell_view));
+ EShellBackend *shell_backend;
+
+ shell_backend = e_shell_view_get_shell_backend (
+ E_SHELL_VIEW (cal_shell_view));
cancellable = g_cancellable_new ();
priv->searching_activity = e_activity_new ();
- e_activity_set_cancellable (priv->searching_activity, cancellable);
- e_activity_set_state (priv->searching_activity, E_ACTIVITY_RUNNING);
- e_activity_set_text (priv->searching_activity,
+ e_activity_set_cancellable (
+ priv->searching_activity, cancellable);
+ e_activity_set_state (
+ priv->searching_activity, E_ACTIVITY_RUNNING);
+ e_activity_set_text (
+ priv->searching_activity,
priv->search_direction > 0 ?
_("Searching next matching event") :
_("Searching previous matching event"));
- e_shell_backend_add_activity (shell_backend, priv->searching_activity);
+ e_shell_backend_add_activity (
+ shell_backend, priv->searching_activity);
}
new_time = time_add_day (priv->search_time, priv->search_direction);
@@ -1465,19 +1487,22 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
gint range_years;
/* would get out of bounds, stop searching */
- e_activity_set_state (priv->searching_activity, E_ACTIVITY_COMPLETED);
+ e_activity_set_state (
+ priv->searching_activity, E_ACTIVITY_COMPLETED);
g_object_unref (priv->searching_activity);
priv->searching_activity = NULL;
range_years = cal_searching_get_search_range_years (cal_shell_view);
alert_msg = g_strdup_printf (
priv->search_direction > 0 ?
- ngettext ("Cannot find matching event in the next %d year",
- "Cannot find matching event in the next %d years",
- range_years) :
- ngettext ("Cannot find matching event in the previous %d year",
- "Cannot find matching event in the previous %d years",
- range_years),
+ ngettext (
+ "Cannot find matching event in the next %d year",
+ "Cannot find matching event in the next %d years",
+ range_years) :
+ ngettext (
+ "Cannot find matching event in the previous %d year",
+ "Cannot find matching event in the previous %d years",
+ range_years),
range_years);
cal_searching_update_alert (cal_shell_view, alert_msg);
g_free (alert_msg);
@@ -1488,15 +1513,19 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
}
model = gnome_calendar_get_model (
- e_cal_shell_content_get_calendar (cal_shell_view->priv->cal_shell_content));
+ e_cal_shell_content_get_calendar (
+ cal_shell_view->priv->cal_shell_content));
clients = e_cal_model_get_client_list (model);
if (!clients) {
- e_activity_set_state (priv->searching_activity, E_ACTIVITY_COMPLETED);
+ e_activity_set_state (
+ priv->searching_activity, E_ACTIVITY_COMPLETED);
g_object_unref (priv->searching_activity);
priv->searching_activity = NULL;
- cal_searching_update_alert (cal_shell_view, _("Cannot search with no active calendar"));
+ cal_searching_update_alert (
+ cal_shell_view,
+ _("Cannot search with no active calendar"));
e_shell_view_update_actions (E_SHELL_VIEW (cal_shell_view));
@@ -1536,7 +1565,9 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
for (iter = clients; iter; iter = iter->next) {
ECalClient *client = iter->data;
- e_cal_client_get_object_list (client, sexp, cancellable, cal_search_get_object_list_cb, cal_shell_view);
+ e_cal_client_get_object_list (
+ client, sexp, cancellable,
+ cal_search_get_object_list_cb, cal_shell_view);
}
g_list_free_full (clients, g_object_unref);
@@ -1573,7 +1604,8 @@ e_cal_shell_view_search_events (ECalShellView *cal_shell_view,
time_t cached_start, cached_end, tmp;
cached_start = priv->search_time;
- cached_end = time_add_day (cached_start, (-1) * priv->search_direction);
+ cached_end = time_add_day (
+ cached_start, (-1) * priv->search_direction);
if (priv->search_direction > 0) {
tmp = cached_start;
@@ -1621,8 +1653,10 @@ e_cal_shell_view_search_stop (ECalShellView *cal_shell_view)
cal_searching_update_alert (cal_shell_view, NULL);
if (priv->searching_activity) {
- g_cancellable_cancel (e_activity_get_cancellable (priv->searching_activity));
- e_activity_set_state (priv->searching_activity, E_ACTIVITY_CANCELLED);
+ g_cancellable_cancel (
+ e_activity_get_cancellable (priv->searching_activity));
+ e_activity_set_state (
+ priv->searching_activity, E_ACTIVITY_CANCELLED);
g_object_unref (priv->searching_activity);
priv->searching_activity = NULL;
}
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index ef8b6c5..afa30c3 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -75,7 +75,8 @@ cal_shell_view_add_action_button (GtkBox *box,
button, "tooltip-text",
G_BINDING_SYNC_CREATE);
- g_signal_connect_swapped (button, "clicked",
+ g_signal_connect_swapped (
+ button, "clicked",
G_CALLBACK (gtk_action_activate), action);
}
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index a1655fa..b11a943 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -273,8 +273,9 @@ day_second_zone_clicked (GtkWidget *widget,
gtk_widget_show_all (menu);
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
- 0, gtk_get_current_event_time ());
+ gtk_menu_popup (
+ GTK_MENU (menu), NULL, NULL, NULL, NULL,
+ 0, gtk_get_current_event_time ());
}
static void
diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c
index f87c91f..5e7c755 100644
--- a/modules/calendar/e-memo-shell-view-private.c
+++ b/modules/calendar/e-memo-shell-view-private.c
@@ -115,8 +115,9 @@ memo_shell_view_load_view_collection (EShellViewClass *shell_view_class)
spec = e_table_specification_new ();
filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
if (!e_table_specification_load_from_file (spec, filename))
- g_critical ("Unable to load ETable specification file "
- "for memos");
+ g_critical (
+ "Unable to load ETable specification file "
+ "for memos");
g_free (filename);
factory = gal_view_factory_etable_new (spec);
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index f9a36c6..b77317a 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -183,8 +183,9 @@ task_shell_view_load_view_collection (EShellViewClass *shell_view_class)
spec = e_table_specification_new ();
filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
if (!e_table_specification_load_from_file (spec, filename))
- g_critical ("Unable to load ETable specification file "
- "for tasks");
+ g_critical (
+ "Unable to load ETable specification file "
+ "for tasks");
g_free (filename);
factory = gal_view_factory_etable_new (spec);
diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c
index c129c89..3b76127 100644
--- a/modules/itip-formatter/e-mail-formatter-itip.c
+++ b/modules/itip-formatter/e-mail-formatter-itip.c
@@ -58,7 +58,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
E_TYPE_MAIL_FORMATTER_EXTENSION,
e_mail_formatter_formatter_extension_interface_init));
-static const gchar* formatter_mime_types[] = { "text/calendar" , NULL };
+static const gchar * formatter_mime_types[] = { "text/calendar" , NULL };
static gboolean
emfe_itip_format (EMailFormatterExtension *extension,
@@ -105,15 +105,17 @@ emfe_itip_format (EMailFormatterExtension *extension,
itip_part->uid = g_strdup (context->message_uid);
itip_part->msg = g_object_ref (context->message);
- uri = e_mail_part_build_uri (context->folder, context->message_uid,
+ uri = e_mail_part_build_uri (
+ context->folder, context->message_uid,
"part_id", G_TYPE_STRING, part->id,
"mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW,
NULL);
buffer = g_string_sized_new (256);
- g_string_append_printf (buffer,
+ g_string_append_printf (
+ buffer,
"<div class=\"part-container\" "
- "style=\"border: none; background: none;\">"
+ "style=\"border: none; background: none;\">"
"<iframe width=\"100%%\" height=\"auto\""
" frameborder=\"0\" src=\"%s\" name=\"%s\" id=\"%s\"></iframe>"
"</div>",
diff --git a/modules/itip-formatter/e-mail-parser-itip.c b/modules/itip-formatter/e-mail-parser-itip.c
index 53630b5..6c740ad 100644
--- a/modules/itip-formatter/e-mail-parser-itip.c
+++ b/modules/itip-formatter/e-mail-parser-itip.c
@@ -68,7 +68,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "text/calendar", NULL };
+static const gchar * parser_mime_types[] = { "text/calendar", NULL };
static void
mail_part_itip_free (EMailPart *mail_part)
@@ -169,8 +169,8 @@ bind_itip_view (EMailPart *part,
G_OBJECT (element), "view", view,
(GDestroyNotify) g_object_unref);
- itip_view_create_dom_bindings (view,
- webkit_dom_document_get_document_element (document));
+ itip_view_create_dom_bindings (
+ view, webkit_dom_document_get_document_element (document));
itip_view_init_view (view);
g_string_free (buffer, TRUE);
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index bbbd575..5c8279a 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -760,7 +760,7 @@ button_clicked_cb (WebKitDOMElement *element,
response = atoi (responseStr);
- //d(printf("Clicked btton %d\n", response));
+ //d (printf ("Clicked btton %d\n", response));
g_signal_emit (G_OBJECT (data), signals[RESPONSE], 0, response);
}
@@ -830,7 +830,7 @@ source_changed_cb (WebKitDOMElement *select,
source = itip_view_ref_source (view);
- d(printf("Source changed to '%s'\n", e_source_get_display_name (source)));
+ d (printf ("Source changed to '%s'\n", e_source_get_display_name (source)));
g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
g_object_unref (source);
@@ -868,7 +868,8 @@ append_text_table_row (GString *buffer,
{
if (label && *label) {
- g_string_append_printf (buffer,
+ g_string_append_printf (
+ buffer,
"<tr id=\"%s\" %s><th>%s</th><td>%s</td></tr>\n",
id, (value && *value) ? "" : "hidden=\"\"", label, value);
@@ -945,7 +946,7 @@ append_info_item_row (ItipView *view,
webkit_dom_html_element_set_inner_html (cell, item->message, NULL);
- d(printf("Added row %s_row_%d ('%s')\n", table_id, item->id, item->message));
+ d (printf ("Added row %s_row_%d ('%s')\n", table_id, item->id, item->message));
}
static void
@@ -966,7 +967,7 @@ remove_info_item_row (ItipView *view,
WEBKIT_DOM_NODE (row),
NULL);
- d(printf("Removed row %s_row_%d\n", table_id, id));
+ d (printf ("Removed row %s_row_%d\n", table_id, id));
}
static void
@@ -997,11 +998,12 @@ buttons_table_write_button (GString *buffer,
static void
append_buttons_table (GString *buffer)
{
- g_string_append (buffer,
- "<table class=\"itip buttons\" border=\"0\" "
- "id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" "
- "cellpadding=\"0\" >"
- "<tr id=\"" TABLE_ROW_BUTTONS "\">");
+ g_string_append (
+ buffer,
+ "<table class=\"itip buttons\" border=\"0\" "
+ "id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" "
+ "cellpadding=\"0\" >"
+ "<tr id=\"" TABLE_ROW_BUTTONS "\">");
/* Everything gets the open button */
buttons_table_write_button (
@@ -1047,7 +1049,7 @@ itip_view_rebuild_source_list (ItipView *view)
const gchar *extension_name;
GHashTable *groups;
- d(printf("Assigning a new source list!\n"));
+ d (printf ("Assigning a new source list!\n"));
if (!view->priv->dom_document)
return;
@@ -1262,7 +1264,7 @@ itip_view_finalize (GObject *object)
priv = ITIP_VIEW_GET_PRIVATE (object);
- d(printf("Itip view finalized!\n"));
+ d (printf ("Itip view finalized!\n"));
g_clear_object (&priv->dom_document);
g_free (priv->extension_name);
@@ -1425,30 +1427,34 @@ itip_view_set_extension_name (ItipView *view,
void
itip_view_write (EMailFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
gchar *header = e_mail_formatter_get_html_header (formatter);
g_string_append (buffer, header);
g_free (header);
- g_string_append_printf (buffer,
+ g_string_append_printf (
+ buffer,
"<img src=\"gtk-stock://%s?size=%d\" class=\"itip icon\" />\n",
MEETING_ICON, GTK_ICON_SIZE_BUTTON);
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<div class=\"itip content\" id=\"" DIV_ITIP_CONTENT "\">\n");
/* The first section listing the sender */
/* FIXME What to do if the send and organizer do not match */
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\"></div>\n");
g_string_append (buffer, "<hr>\n");
/* Elementary event information */
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<table class=\"itip table\" border=\"0\" "
- "cellspacing=\"5\" cellpadding=\"0\">\n");
+ "cellspacing=\"5\" cellpadding=\"0\">\n");
append_text_table_row (buffer, TABLE_ROW_SUMMARY, NULL, NULL);
append_text_table_row (buffer, TABLE_ROW_LOCATION, _("Location:"), NULL);
@@ -1460,26 +1466,31 @@ itip_view_write (EMailFormatter *formatter,
g_string_append (buffer, "</table>\n");
/* Upper Info items */
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<table class=\"itip info\" id=\"" TABLE_UPPER_ITIP_INFO "\" border=\"0\" "
- "cellspacing=\"5\" cellpadding=\"0\">");
+ "cellspacing=\"5\" cellpadding=\"0\">");
/* Description */
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<div id=\"" TABLE_ROW_DESCRIPTION "\" class=\"itip description\" hidden=\"\"></div>\n");
g_string_append (buffer, "<hr>\n");
/* Lower Info items */
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<table class=\"itip info\" id=\"" TABLE_LOWER_ITIP_INFO "\" border=\"0\" "
- "cellspacing=\"5\" cellpadding=\"0\">");
+ "cellspacing=\"5\" cellpadding=\"0\">");
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<table class=\"itip table\" border=\"0\" "
- "cellspacing=\"5\" cellpadding=\"0\">\n");
+ "cellspacing=\"5\" cellpadding=\"0\">\n");
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<tr id=\"" TABLE_ROW_ESCB "\" hidden=\"\""">"
"<th><label id=\"" TABLE_ROW_ESCB_LABEL "\" for=\"" SELECT_ESOURCE "\"></label></th>"
"<td><select name=\"" SELECT_ESOURCE "\" id=\"" SELECT_ESOURCE "\"></select></td>"
@@ -1489,12 +1500,13 @@ itip_view_write (EMailFormatter *formatter,
append_checkbox_table_row (buffer, CHECKBOX_RSVP, _("Send reply to sender"));
/* Comments */
- g_string_append_printf (buffer,
+ g_string_append_printf (
+ buffer,
"<tr id=\"" TABLE_ROW_RSVP_COMMENT "\" hidden=\"\">"
"<th>%s</th>"
"<td><textarea name=\"" TEXTAREA_RSVP_COMMENT "\" "
- "id=\"" TEXTAREA_RSVP_COMMENT "\" "
- "rows=\"3\" cols=\"40\" disabled=\"\">"
+ "id=\"" TEXTAREA_RSVP_COMMENT "\" "
+ "rows=\"3\" cols=\"40\" disabled=\"\">"
"</textarea></td>\n"
"</tr>\n",
_("Comment:"));
@@ -1530,21 +1542,24 @@ itip_view_write_for_printing (ItipView *view,
return;
}
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<div class=\"itip print_content\" id=\"" DIV_ITIP_CONTENT "\">\n");
/* The first section listing the sender */
/* FIXME What to do if the send and organizer do not match */
- g_string_append_printf (buffer,
+ g_string_append_printf (
+ buffer,
"<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\">%s</div>\n",
view->priv->sender ? view->priv->sender : "");
g_string_append (buffer, "<hr>\n");
/* Elementary event information */
- g_string_append (buffer,
+ g_string_append (
+ buffer,
"<table class=\"itip table\" border=\"0\" "
- "cellspacing=\"5\" cellpadding=\"0\">\n");
+ "cellspacing=\"5\" cellpadding=\"0\">\n");
append_text_table_row (
buffer, TABLE_ROW_SUMMARY,
@@ -1571,7 +1586,7 @@ itip_view_write_for_printing (ItipView *view,
g_string_append_printf (
buffer,
"<div id=\"" TABLE_ROW_DESCRIPTION "\" "
- "class=\"itip description\" %s>%s</div>\n",
+ "class=\"itip description\" %s>%s</div>\n",
view->priv->description ? "" : "hidden=\"\"", view->priv->description);
g_string_append (buffer, "</div>");
@@ -2467,7 +2482,7 @@ itip_view_set_source (ItipView *view,
g_return_if_fail (ITIP_IS_VIEW (view));
- d(printf("Settings default source '%s'\n", e_source_get_display_name (source)));
+ d (printf ("Settings default source '%s'\n", e_source_get_display_name (source)));
if (!view->priv->dom_document)
return;
@@ -2784,7 +2799,7 @@ itip_view_set_buttons_sensitive (ItipView *view,
g_return_if_fail (ITIP_IS_VIEW (view));
- d(printf("Settings buttons %s\n", sensitive ? "sensitive" : "insensitive"));
+ d (printf ("Settings buttons %s\n", sensitive ? "sensitive" : "insensitive"));
view->priv->buttons_sensitive = sensitive;
@@ -3054,7 +3069,8 @@ itip_view_set_error (ItipView *view,
str = g_string_new (error_html);
if (show_save_btn) {
- g_string_append (str,
+ g_string_append (
+ str,
"<table border=\"0\" width=\"100%\">"
"<tr width=\"100%\" id=\"" TABLE_ROW_BUTTONS "\">");
@@ -3570,7 +3586,8 @@ start_calendar_server (EMailPartItip *pitip,
return;
}
- e_client_utils_open_new (source,
+ e_client_utils_open_new (
+ source,
type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS ? E_CLIENT_SOURCE_TYPE_EVENTS :
type == E_CAL_CLIENT_SOURCE_TYPE_MEMOS ? E_CLIENT_SOURCE_TYPE_MEMOS :
type == E_CAL_CLIENT_SOURCE_TYPE_TASKS ? E_CLIENT_SOURCE_TYPE_TASKS : E_CLIENT_SOURCE_TYPE_LAST,
@@ -3630,8 +3647,11 @@ find_cal_update_ui (FormatItipFindData *fd,
source = cal_client ? e_client_get_source (E_CLIENT (cal_client)) : NULL;
if (cal_client && g_hash_table_lookup (fd->conflicts, cal_client)) {
- itip_view_add_upper_info_item_printf (view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
- _("An appointment in the calendar '%s' conflicts with this meeting"), e_source_get_display_name (source));
+ itip_view_add_upper_info_item_printf (
+ view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
+ _("An appointment in the calendar "
+ "'%s' conflicts with this meeting"),
+ e_source_get_display_name (source));
}
/* search for a master object if the detached object doesn't exist in the calendar */
@@ -3654,7 +3674,8 @@ find_cal_update_ui (FormatItipFindData *fd,
pitip->progress_info_id = 0;
/* FIXME Check read only state of calendar? */
- itip_view_add_lower_info_item_printf (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ itip_view_add_lower_info_item_printf (
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Found the appointment in the calendar '%s'"), e_source_get_display_name (source));
set_buttons_sensitive (pitip, view);
@@ -3689,7 +3710,7 @@ decrease_find_data (FormatItipFindData *fd)
g_return_if_fail (fd != NULL);
fd->count--;
- d(printf ("Decreasing itip formatter search count to %d\n", fd->count));
+ d (printf ("Decreasing itip formatter search count to %d\n", fd->count));
if (fd->count == 0 && !g_cancellable_is_cancelled (fd->cancellable)) {
gboolean rsvp_enabled = FALSE;
@@ -3741,7 +3762,7 @@ decrease_find_data (FormatItipFindData *fd)
itip_view_set_extension_name (view, extension_name);
g_signal_connect (
- view, "source_selected",
+ view, "source_selected",
G_CALLBACK (source_selected_cb), pitip);
if (source != NULL) {
@@ -4108,12 +4129,12 @@ find_server (EMailPartItip *pitip,
pitip->progress_info_id = itip_view_add_lower_info_item (
view, ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
- _("Opening the calendar. Please wait..."));
+ _("Opening the calendar. Please wait..."));
} else {
link = list;
pitip->progress_info_id = itip_view_add_lower_info_item (
view, ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
- _("Searching for an existing version of this appointment"));
+ _("Searching for an existing version of this appointment"));
}
for (; link != NULL; link = g_list_next (link)) {
@@ -4136,15 +4157,20 @@ find_server (EMailPartItip *pitip,
start = isodate_from_time_t (pitip->start_time);
end = isodate_from_time_t (pitip->end_time);
- fd->sexp = g_strdup_printf ("(and (occur-in-time-range? (make-time \"%s\") (make-time \"%s\")) (not (uid? \"%s\")))",
- start, end, icalcomponent_get_uid (pitip->ical_comp));
+ fd->sexp = g_strdup_printf (
+ "(and (occur-in-time-range? "
+ "(make-time \"%s\") "
+ "(make-time \"%s\")) "
+ "(not (uid? \"%s\")))",
+ start, end,
+ icalcomponent_get_uid (pitip->ical_comp));
}
g_free (start);
g_free (end);
}
fd->count++;
- d(printf ("Increasing itip formatter search count to %d\n", fd->count));
+ d (printf ("Increasing itip formatter search count to %d\n", fd->count));
if (current_source == source)
start_calendar_server (
@@ -4585,8 +4611,10 @@ update_item (EMailPartItip *pitip,
clone_comp = e_cal_component_new ();
if (!e_cal_component_set_icalcomponent (clone_comp, clone)) {
update_item_progress_info (pitip, view, NULL);
- pitip->update_item_error_info_id = itip_view_add_lower_info_item (view,
- ITIP_VIEW_INFO_ITEM_TYPE_ERROR, _("Unable to parse item"));
+ pitip->update_item_error_info_id =
+ itip_view_add_lower_info_item (
+ view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
+ _("Unable to parse item"));
goto cleanup;
}
@@ -4600,7 +4628,8 @@ update_item (EMailPartItip *pitip,
alarms = e_cal_component_get_alarm_uids (real_comp);
for (l = alarms; l; l = l->next) {
- alarm = e_cal_component_get_alarm (real_comp, (const gchar *) l->data);
+ alarm = e_cal_component_get_alarm (
+ real_comp, (const gchar *) l->data);
if (alarm) {
ECalComponentAlarm *aclone = e_cal_component_alarm_clone (alarm);
@@ -4786,7 +4815,7 @@ remove_delegate (EMailPartItip *pitip,
send_comp_to_attendee (
pitip->registry,
E_CAL_COMPONENT_METHOD_REQUEST, pitip->comp,
- delegator, pitip->current_client, comment);
+ delegator, pitip->current_client, comment);
if (status) {
itip_view_add_lower_info_item (
view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
@@ -4841,16 +4870,16 @@ modify_object_cb (GObject *ecalclient,
update_item_progress_info (pitip, view, NULL);
pitip->update_item_error_info_id =
itip_view_add_lower_info_item_printf (
- view,
- ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
_("Unable to update attendee. %s"),
error ? error->message : _("Unknown error"));
g_clear_error (&error);
} else {
update_item_progress_info (pitip, view, NULL);
- itip_view_add_lower_info_item (view,
- ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Attendee status updated"));
+ itip_view_add_lower_info_item (
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ _("Attendee status updated"));
}
}
@@ -4890,10 +4919,11 @@ update_attendee_status_icalcomp (EMailPartItip *pitip,
if ((a->status == ICAL_PARTSTAT_DELEGATED) && (del_prop = find_attendee (org_icalcomp, itip_strip_mailto (a->delto))) && !(find_attendee (icalcomp, itip_strip_mailto (a->delto)))) {
gint response;
delegate = icalproperty_get_attendee (del_prop);
- response = e_alert_run_dialog_for_args (e_shell_get_active_window (shell),
- "org.gnome.itip-formatter:add-delegate",
- itip_strip_mailto (a->value),
- itip_strip_mailto (delegate), NULL);
+ response = e_alert_run_dialog_for_args (
+ e_shell_get_active_window (shell),
+ "org.gnome.itip-formatter:add-delegate",
+ itip_strip_mailto (a->value),
+ itip_strip_mailto (delegate), NULL);
if (response == GTK_RESPONSE_YES) {
icalcomponent_add_property (icalcomp, icalproperty_new_clone (del_prop));
e_cal_component_rescan (comp);
@@ -4909,21 +4939,23 @@ update_attendee_status_icalcomp (EMailPartItip *pitip,
gint response;
if (a->delfrom && *a->delfrom) {
- response = e_alert_run_dialog_for_args (e_shell_get_active_window (shell),
- "org.gnome.itip-formatter:add-delegate",
- itip_strip_mailto (a->delfrom),
- itip_strip_mailto (a->value), NULL);
+ response = e_alert_run_dialog_for_args (
+ e_shell_get_active_window (shell),
+ "org.gnome.itip-formatter:add-delegate",
+ itip_strip_mailto (a->delfrom),
+ itip_strip_mailto (a->value), NULL);
if (response == GTK_RESPONSE_YES) {
/* Already declared in this function */
icalproperty *prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
icalcomponent_add_property (icalcomp,icalproperty_new_clone (prop));
e_cal_component_rescan (comp);
} else if (response == GTK_RESPONSE_NO) {
- remove_delegate (pitip,
- view,
- itip_strip_mailto (a->value),
- itip_strip_mailto (a->delfrom),
- comp);
+ remove_delegate (
+ pitip,
+ view,
+ itip_strip_mailto (a->value),
+ itip_strip_mailto (a->delfrom),
+ comp);
goto cleanup;
} else {
goto cleanup;
@@ -5273,7 +5305,8 @@ extract_itip_data (EMailPartItip *pitip,
shell_settings = e_shell_get_shell_settings (shell);
if (!pitip->vcalendar) {
- set_itip_error (view,
+ set_itip_error (
+ view,
_("The calendar attached is not valid"),
_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."),
FALSE);
@@ -5285,7 +5318,8 @@ extract_itip_data (EMailPartItip *pitip,
pitip->main_comp = icalparser_parse_string (pitip->vcalendar);
if (pitip->main_comp == NULL || !is_icalcomp_valid (pitip->main_comp)) {
- set_itip_error (view,
+ set_itip_error (
+ view,
_("The calendar attached is not valid"),
_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."),
FALSE);
@@ -5327,7 +5361,8 @@ extract_itip_data (EMailPartItip *pitip,
}
if (pitip->ical_comp == NULL) {
- set_itip_error (view,
+ set_itip_error (
+ view,
_("The item in the calendar is not valid"),
_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
FALSE);
@@ -5356,7 +5391,8 @@ extract_itip_data (EMailPartItip *pitip,
pitip->type = E_CAL_CLIENT_SOURCE_TYPE_MEMOS;
break;
default:
- set_itip_error (view,
+ set_itip_error (
+ view,
_("The item in the calendar is not valid"),
_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
FALSE);
@@ -5371,7 +5407,8 @@ extract_itip_data (EMailPartItip *pitip,
if (pitip->total > 1) {
- set_itip_error (view,
+ set_itip_error (
+ view,
_("The calendar attached contains multiple items"),
_("To process all of these items, the file should be saved and the calendar imported"),
TRUE);
@@ -5454,7 +5491,8 @@ extract_itip_data (EMailPartItip *pitip,
g_object_unref (pitip->comp);
pitip->comp = NULL;
- set_itip_error (view,
+ set_itip_error (
+ view,
_("The item in the calendar is not valid"),
_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
FALSE);
@@ -5797,10 +5835,11 @@ itip_view_init_view (ItipView *view)
* we show the "accept/tentative/decline" choice.
* Otherwise only show "accept".
*/
- itip_view_set_mode (view,
- info->has_organizer ?
- ITIP_VIEW_MODE_REQUEST :
- ITIP_VIEW_MODE_PUBLISH);
+ itip_view_set_mode (
+ view,
+ info->has_organizer ?
+ ITIP_VIEW_MODE_REQUEST :
+ ITIP_VIEW_MODE_PUBLISH);
break;
case ICAL_METHOD_REPLY:
itip_view_set_mode (view, ITIP_VIEW_MODE_REPLY);
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 2099511..2e9946d 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -57,7 +57,8 @@ fix_color_string (gchar *color_string)
if (!gdk_color_parse (color_string, &color))
return;
- sprintf (color_string, "#%02x%02x%02x",
+ sprintf (
+ color_string, "#%02x%02x%02x",
(gint) color.red * 256 / 65536,
(gint) color.green * 256 / 65536,
(gint) color.blue * 256 / 65536);
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 7472a50..7db1b13 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -923,7 +923,6 @@ mail_labels_get_filter_options (gboolean include_none)
return g_slist_reverse (list);
}
-
GSList *
e_mail_labels_get_filter_options (void)
{
@@ -938,7 +937,7 @@ e_mail_labels_get_filter_options_without_none (void)
static const gchar *
get_filter_option_value (EFilterPart *part,
- const gchar *name)
+ const gchar *name)
{
EFilterElement *elem;
EFilterOption *opt;
@@ -956,7 +955,7 @@ get_filter_option_value (EFilterPart *part,
static void
append_one_label_expr (GString *out,
- const gchar *versus)
+ const gchar *versus)
{
GString *encoded;
@@ -966,7 +965,8 @@ append_one_label_expr (GString *out,
encoded = g_string_new ("");
camel_sexp_encode_string (encoded, versus);
- g_string_append_printf (out,
+ g_string_append_printf (
+ out,
" (= (user-tag \"label\") %s) (user-flag (+ \"$Label\" %s)) (user-flag %s)",
encoded->str, encoded->str, encoded->str);
@@ -975,8 +975,8 @@ append_one_label_expr (GString *out,
void
e_mail_labels_get_filter_code (EFilterElement *element,
- GString *out,
- EFilterPart *part)
+ GString *out,
+ EFilterPart *part)
{
const gchar *label_type, *versus;
gboolean is_not;
@@ -1013,7 +1013,7 @@ e_mail_labels_get_filter_code (EFilterElement *element,
GtkTreeModel *model;
GtkTreeIter iter;
gboolean valid;
-
+
shell = e_shell_get_default ();
shell_backend = e_shell_get_backend_by_name (shell, "mail");
@@ -1072,7 +1072,8 @@ message_parsed_cb (GObject *source_object,
soup_session = webkit_get_default_session ();
mails = g_object_get_data (G_OBJECT (soup_session), "mails");
if (!mails) {
- mails = g_hash_table_new_full (g_str_hash, g_str_equal,
+ mails = g_hash_table_new_full (
+ g_str_hash, g_str_equal,
(GDestroyNotify) g_free, NULL);
g_object_set_data (
G_OBJECT (soup_session), "mails", mails);
@@ -1099,8 +1100,9 @@ mbox_create_preview_cb (GObject *preview,
g_return_if_fail (preview_widget != NULL);
display = g_object_new (E_TYPE_MAIL_DISPLAY, NULL);
- g_object_set_data_full (preview, "mbox-imp-display",
- g_object_ref (display), g_object_unref);
+ g_object_set_data_full (
+ preview, "mbox-imp-display",
+ g_object_ref (display), g_object_unref);
*preview_widget = GTK_WIDGET (display);
}
@@ -1126,7 +1128,8 @@ mbox_fill_preview_cb (GObject *preview,
mail_session = e_mail_session_new (registry);
parser = e_mail_parser_new (CAMEL_SESSION (mail_session));
- e_mail_parser_parse (parser, NULL, msg->message_id, msg,
+ e_mail_parser_parse (
+ parser, NULL, msg->message_id, msg,
message_parsed_cb, NULL, preview);
g_object_unref (mail_session);
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 48f9d74..123352b 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -973,7 +973,8 @@ action_mail_smart_backward_cb (GtkAction *action,
} else {
- gtk_adjustment_set_value (adj,
+ gtk_adjustment_set_value (
+ adj,
value - gtk_adjustment_get_page_increment (adj));
return;
@@ -1059,7 +1060,8 @@ action_mail_smart_forward_cb (GtkAction *action,
} else {
- gtk_adjustment_set_value (adj,
+ gtk_adjustment_set_value (
+ adj,
value + gtk_adjustment_get_page_increment (adj));
return;
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index e3d7247..f51f8f1 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -488,8 +488,9 @@ mail_shell_view_load_view_collection (EShellViewClass *shell_view_class)
spec = e_table_specification_new ();
filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
if (!e_table_specification_load_from_file (spec, filename))
- g_critical ("Unable to load ETable specification file "
- "for mail");
+ g_critical (
+ "Unable to load ETable specification file "
+ "for mail");
g_free (filename);
factory = gal_view_factory_etable_new (spec);
@@ -1068,8 +1069,8 @@ typedef struct {
static gboolean
send_receive_can_use_service (EMailAccountStore *account_store,
- CamelService *service,
- GtkTreeIter *piter)
+ CamelService *service,
+ GtkTreeIter *piter)
{
GtkTreeModel *model;
GtkTreeIter iter;
@@ -1089,7 +1090,8 @@ send_receive_can_use_service (EMailAccountStore *account_store,
do {
adept = NULL;
- gtk_tree_model_get (model, &iter,
+ gtk_tree_model_get (
+ model, &iter,
E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE, &adept,
-1);
@@ -1107,7 +1109,8 @@ send_receive_can_use_service (EMailAccountStore *account_store,
if (!found)
return FALSE;
- gtk_tree_model_get (model, &iter,
+ gtk_tree_model_get (
+ model, &iter,
E_MAIL_ACCOUNT_STORE_COLUMN_ENABLED, &enabled,
E_MAIL_ACCOUNT_STORE_COLUMN_BUILTIN, &builtin,
-1);
@@ -1180,16 +1183,16 @@ send_receive_add_to_menu (SendReceiveData *data,
static void
send_receive_gather_services (gpointer menu_item,
- gpointer service,
- gpointer queue)
+ gpointer service,
+ gpointer queue)
{
g_queue_push_head (queue, service);
}
static gint
sort_services_cb (gconstpointer service1,
- gconstpointer service2,
- gpointer account_store)
+ gconstpointer service2,
+ gpointer account_store)
{
return e_mail_account_store_compare_services (account_store, CAMEL_SERVICE (service1), CAMEL_SERVICE (service2));
}
@@ -1363,7 +1366,8 @@ create_send_receive_submenu (EMailShellView *mail_shell_view)
do {
service = NULL;
- gtk_tree_model_get (model, &iter,
+ gtk_tree_model_get (
+ model, &iter,
E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE, &service,
-1);
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index ebbbcef..801362d 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -46,9 +46,9 @@ static const gchar *SEARCH_RESULTS_STATE =
static void
add_folders_from_store (GList **folders,
- CamelStore *store,
- GCancellable *cancellable,
- GError **error)
+ CamelStore *store,
+ GCancellable *cancellable,
+ GError **error)
{
CamelFolderInfo *root, *fi;
@@ -771,7 +771,8 @@ has_unread_mail (GtkTreeModel *model,
if (is_root) {
gboolean is_store = FALSE, is_draft = FALSE;
- gtk_tree_model_get (model, parent,
+ gtk_tree_model_get (
+ model, parent,
COL_UINT_UNREAD, &unread,
COL_BOOL_IS_STORE, &is_store,
COL_BOOL_IS_DRAFT, &is_draft,
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 58700f2..3a092ef 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -348,7 +348,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
*
* The mail composer preferences settings page.
*/
- ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.composerPrefs");
+ ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.composerPrefs");
l = NULL;
for (i = 0; i < G_N_ELEMENTS (emcp_items); i++)
l = g_slist_prepend (l, &emcp_items[i]);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 1877e28..4720470 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -242,7 +242,7 @@ jh_add_cb (GtkWidget *widget,
tok = g_strdup_printf ("%s=%s", name, value);
g_ptr_array_add (array, tok);
g_ptr_array_add (array, NULL);
- g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata);
+ g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const *) array->pdata);
g_ptr_array_free (array, TRUE);
g_strfreev (strv);
@@ -290,7 +290,7 @@ jh_remove_cb (GtkWidget *widget,
g_ptr_array_add (array, NULL);
- g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata);
+ g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const *) array->pdata);
g_strfreev (strv);
g_ptr_array_free (array, TRUE);
@@ -337,9 +337,10 @@ emmp_header_remove_sensitivity (EMMailerPrefs *prefs)
* disabled
*/
if (gtk_tree_selection_get_selected (selection, NULL, &iter)) {
- gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
- HEADER_LIST_IS_DEFAULT_COLUMN, &is_default,
- -1);
+ gtk_tree_model_get (
+ GTK_TREE_MODEL (prefs->header_list_store), &iter,
+ HEADER_LIST_IS_DEFAULT_COLUMN, &is_default,
+ -1);
if (is_default)
gtk_widget_set_sensitive (GTK_WIDGET (prefs->remove_header), FALSE);
else
@@ -384,9 +385,10 @@ emmp_header_add_sensitivity (EMMailerPrefs *prefs)
while (valid) {
gchar *header_name;
- gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
- HEADER_LIST_HEADER_COLUMN, &header_name,
- -1);
+ gtk_tree_model_get (
+ GTK_TREE_MODEL (prefs->header_list_store), &iter,
+ HEADER_LIST_HEADER_COLUMN, &header_name,
+ -1);
if (g_ascii_strcasecmp (header_name, entry_contents) == 0) {
gtk_widget_set_sensitive (GTK_WIDGET (prefs->add_header), FALSE);
g_free (header_name);
@@ -418,10 +420,11 @@ emmp_save_headers (EMMailerPrefs *prefs)
h.name = NULL;
- gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
- HEADER_LIST_HEADER_COLUMN, &h.name,
- HEADER_LIST_ENABLED_COLUMN, &enabled,
- -1);
+ gtk_tree_model_get (
+ GTK_TREE_MODEL (prefs->header_list_store), &iter,
+ HEADER_LIST_HEADER_COLUMN, &h.name,
+ HEADER_LIST_ENABLED_COLUMN, &enabled,
+ -1);
h.enabled = enabled;
if ((xml = e_mail_reader_header_to_xml (&h)))
@@ -450,10 +453,13 @@ emmp_header_list_enabled_toggled (GtkCellRendererToggle *cell,
gint enabled;
gtk_tree_model_get_iter (model, &iter, path);
- gtk_tree_model_get (model, &iter, HEADER_LIST_ENABLED_COLUMN, &enabled, -1);
+ gtk_tree_model_get (
+ model, &iter,
+ HEADER_LIST_ENABLED_COLUMN, &enabled, -1);
enabled = !enabled;
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, HEADER_LIST_ENABLED_COLUMN,
- enabled, -1);
+ gtk_list_store_set (
+ GTK_LIST_STORE (model), &iter,
+ HEADER_LIST_ENABLED_COLUMN, enabled, -1);
gtk_tree_path_free (path);
emmp_save_headers (prefs);
@@ -471,12 +477,13 @@ emmp_header_add_header (GtkWidget *widget,
if (text && (strlen (text) > 0)) {
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- HEADER_LIST_NAME_COLUMN, text,
- HEADER_LIST_ENABLED_COLUMN, TRUE,
- HEADER_LIST_HEADER_COLUMN, text,
- HEADER_LIST_IS_DEFAULT_COLUMN, FALSE,
- -1);
+ gtk_list_store_set (
+ GTK_LIST_STORE (model), &iter,
+ HEADER_LIST_NAME_COLUMN, text,
+ HEADER_LIST_ENABLED_COLUMN, TRUE,
+ HEADER_LIST_HEADER_COLUMN, text,
+ HEADER_LIST_IS_DEFAULT_COLUMN, FALSE,
+ -1);
gtk_entry_set_text (prefs->entry_header, "");
emmp_header_remove_sensitivity (prefs);
emmp_header_add_sensitivity (prefs);
@@ -491,9 +498,11 @@ emmp_header_remove_header (GtkWidget *button,
{
EMMailerPrefs *prefs = (EMMailerPrefs *) user_data;
GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store);
- GtkTreeSelection *selection = gtk_tree_view_get_selection (prefs->header_list);
+ GtkTreeSelection *selection;
GtkTreeIter iter;
+ selection = gtk_tree_view_get_selection (prefs->header_list);
+
if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
return;
@@ -528,7 +537,9 @@ toggle_button_toggled (GtkToggleButton *toggle,
const gchar *key;
key = g_object_get_data ((GObject *) toggle, "key");
- g_settings_set_boolean (prefs->settings, key, gtk_toggle_button_get_active (toggle));
+ g_settings_set_boolean (
+ prefs->settings, key,
+ gtk_toggle_button_get_active (toggle));
}
static void
@@ -536,7 +547,9 @@ junk_book_lookup_button_toggled (GtkToggleButton *toggle,
EMMailerPrefs *prefs)
{
toggle_button_toggled (toggle, prefs);
- gtk_widget_set_sensitive (GTK_WIDGET (prefs->junk_lookup_local_only), gtk_toggle_button_get_active (toggle));
+ gtk_widget_set_sensitive (
+ GTK_WIDGET (prefs->junk_lookup_local_only),
+ gtk_toggle_button_get_active (toggle));
}
static void
@@ -614,7 +627,8 @@ emmp_empty_trash_init (EMMailerPrefs *prefs,
hist = ii;
gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_set (
+ store, &iter,
0, gettext (empty_trash_frequency[ii].label),
-1);
}
@@ -662,7 +676,8 @@ emmp_empty_junk_init (EMMailerPrefs *prefs,
hist = ii;
gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_set (
+ store, &iter,
0, gettext (empty_trash_frequency[ii].label),
-1);
}
@@ -771,7 +786,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
*
* The main mail preferences page.
*/
- ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.prefs");
+ ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.prefs");
l = NULL;
for (i = 0; i < G_N_ELEMENTS (emmp_items); i++)
l = g_slist_prepend (l, &emmp_items[i]);
@@ -1043,15 +1058,17 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
g_signal_connect (
renderer, "toggled",
G_CALLBACK (emmp_header_list_enabled_toggled), prefs);
- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (prefs->header_list), -1,
- "Enabled", renderer,
- "active", HEADER_LIST_ENABLED_COLUMN,
- NULL);
+ gtk_tree_view_insert_column_with_attributes (
+ GTK_TREE_VIEW (prefs->header_list), -1,
+ "Enabled", renderer,
+ "active", HEADER_LIST_ENABLED_COLUMN,
+ NULL);
renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (prefs->header_list), -1,
- "Name", renderer,
- "text", HEADER_LIST_NAME_COLUMN,
- NULL);
+ gtk_tree_view_insert_column_with_attributes (
+ GTK_TREE_VIEW (prefs->header_list), -1,
+ "Name", renderer,
+ "text", HEADER_LIST_NAME_COLUMN,
+ NULL);
/* populated the listview with entries; firstly we add all the default headers, and then
* we add read header configuration out of settings. If a header in settings is a default header,
@@ -1065,7 +1082,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
h = g_malloc (sizeof (EMailReaderHeader));
h->is_default = TRUE;
h->name = g_strdup (default_headers[i]);
- h->enabled = strcmp ((gchar *)default_headers[i], "x-evolution-mailer") != 0;
+ h->enabled = strcmp ((gchar *) default_headers[i], "x-evolution-mailer") != 0;
g_hash_table_insert (default_header_hash, (gpointer) default_headers[i], h);
header_add_list = g_slist_append (header_add_list, h);
}
@@ -1106,12 +1123,13 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
name = _(h->name);
gtk_list_store_append (prefs->header_list_store, &iter);
- gtk_list_store_set (prefs->header_list_store, &iter,
- HEADER_LIST_NAME_COLUMN, name,
- HEADER_LIST_ENABLED_COLUMN, h->enabled,
- HEADER_LIST_IS_DEFAULT_COLUMN, h->is_default,
- HEADER_LIST_HEADER_COLUMN, h->name,
- -1);
+ gtk_list_store_set (
+ prefs->header_list_store, &iter,
+ HEADER_LIST_NAME_COLUMN, name,
+ HEADER_LIST_ENABLED_COLUMN, h->enabled,
+ HEADER_LIST_IS_DEFAULT_COLUMN, h->is_default,
+ HEADER_LIST_HEADER_COLUMN, h->name,
+ -1);
e_mail_reader_header_free (h);
p = p->next;
@@ -1159,12 +1177,12 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
widget = e_builder_get_widget (prefs->builder, "junk-module-options");
e_mail_junk_options_set_session (E_MAIL_JUNK_OPTIONS (widget), session);
- prefs->junk_header_check = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "junk_header_check");
- prefs->junk_header_tree = (GtkTreeView *)e_builder_get_widget (prefs->builder, "junk_header_tree");
- prefs->junk_header_add = (GtkButton *)e_builder_get_widget (prefs->builder, "junk_header_add");
- prefs->junk_header_remove = (GtkButton *)e_builder_get_widget (prefs->builder, "junk_header_remove");
- prefs->junk_book_lookup = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "lookup_book");
- prefs->junk_lookup_local_only = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "junk_lookup_local_only");
+ prefs->junk_header_check = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "junk_header_check");
+ prefs->junk_header_tree = (GtkTreeView *) e_builder_get_widget (prefs->builder, "junk_header_tree");
+ prefs->junk_header_add = (GtkButton *) e_builder_get_widget (prefs->builder, "junk_header_add");
+ prefs->junk_header_remove = (GtkButton *) e_builder_get_widget (prefs->builder, "junk_header_remove");
+ prefs->junk_book_lookup = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "lookup_book");
+ prefs->junk_lookup_local_only = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "junk_lookup_local_only");
toggle_button_init (
prefs, prefs->junk_book_lookup,
FALSE, "junk-lookup-addressbook",
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 3a7b335..b43c8a1 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -119,7 +119,7 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs,
#if 0
if (type == NETWORK_PROXY_AUTOCONFIG) {
gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity);
- d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
+ d (g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
} else
#endif
if (type == NETWORK_PROXY_MANUAL) {
@@ -147,7 +147,7 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs,
gtk_widget_set_sensitive ((GtkWidget *) prefs->auth_user, state);
gtk_widget_set_sensitive ((GtkWidget *) prefs->auth_pwd, state);
- d(g_print ("Setting sensitivity of manual proxy to: %d\n", sensitivity));
+ d (g_print ("Setting sensitivity of manual proxy to: %d\n", sensitivity));
}
}
@@ -211,11 +211,11 @@ widget_entry_changed_cb (GtkWidget *widget,
if (GTK_IS_SPIN_BUTTON (widget)) {
port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
g_settings_set_int (proxy_settings, key, port);
- d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, key, port));
+ d (g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, key, port));
} else if (GTK_IS_ENTRY (widget)) {
value = gtk_entry_get_text (GTK_ENTRY (widget));
g_settings_set_string (proxy_settings, key, value);
- d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, key, value));
+ d (g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, key, value));
}
}
@@ -331,7 +331,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
*
* The network preferences settings page.
*/
- ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.networkPrefs");
+ ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.networkPrefs");
l = NULL;
for (i = 0; i < G_N_ELEMENTS (emnp_items); i++)
l = g_slist_prepend (l, &emnp_items[i]);
@@ -353,14 +353,14 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
if (locked)
gtk_widget_set_sensitive ((GtkWidget *) prefs->sys_proxy, FALSE);
- d(g_print ("Sys settings ----!!! \n"));
+ d (g_print ("Sys settings ----!!! \n"));
prefs->no_proxy = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "rdoNoProxy"));
gtk_toggle_button_set_active (prefs->no_proxy, val == NETWORK_PROXY_DIRECT_CONNECTION);
if (locked)
gtk_widget_set_sensitive ((GtkWidget *) prefs->no_proxy, FALSE);
- d(g_print ("No proxy settings ----!!! \n"));
+ d (g_print ("No proxy settings ----!!! \n"));
/* no auto-proxy at the moment */
#if 0
@@ -377,7 +377,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy, FALSE);
#endif
- d(g_print ("Auto config settings ----!!! \n"));
+ d (g_print ("Auto config settings ----!!! \n"));
prefs->manual_proxy = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "rdoManualProxy"));
prefs->http_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtHttpHost"));
@@ -466,7 +466,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
if (locked)
gtk_widget_set_sensitive ((GtkWidget *) prefs->manual_proxy, FALSE);
- d(g_print ("Manual settings ----!!! \n"));
+ d (g_print ("Manual settings ----!!! \n"));
buf = g_settings_get_string (prefs->proxy_settings, "http-host");
gtk_entry_set_text (prefs->http_host, buf ? buf : "");
diff --git a/modules/online-accounts/camel-sasl-xoauth.c b/modules/online-accounts/camel-sasl-xoauth.c
index df07b9a..1d8ad23 100644
--- a/modules/online-accounts/camel-sasl-xoauth.c
+++ b/modules/online-accounts/camel-sasl-xoauth.c
@@ -415,8 +415,8 @@ sasl_xoauth_challenge_sync (CamelSasl *sasl,
error, CAMEL_SERVICE_ERROR,
CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
_("Cannot find a corresponding account in "
- "the org.gnome.OnlineAccounts service from "
- "which to obtain an authentication token."));
+ "the org.gnome.OnlineAccounts service from "
+ "which to obtain an authentication token."));
g_object_unref (goa_client);
return NULL;
}
diff --git a/modules/plugin-lib/e-plugin-lib.c b/modules/plugin-lib/e-plugin-lib.c
index 82c8be5..f80ddd2 100644
--- a/modules/plugin-lib/e-plugin-lib.c
+++ b/modules/plugin-lib/e-plugin-lib.c
@@ -153,9 +153,10 @@ plugin_lib_construct (EPlugin *plugin,
#ifdef G_OS_WIN32
{
gchar *mapped_location =
- e_util_replace_prefix (EVOLUTION_PREFIX,
- e_util_get_prefix (),
- plugin_lib->location);
+ e_util_replace_prefix (
+ EVOLUTION_PREFIX,
+ e_util_get_prefix (),
+ plugin_lib->location);
g_free (plugin_lib->location);
plugin_lib->location = mapped_location;
}
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index 482f336..39bc9b9 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -98,7 +98,7 @@ static void
eppm_set_label (GtkLabel *l,
const gchar *v)
{
- gtk_label_set_label(l, v?v:_("Unknown"));
+ gtk_label_set_label (l, v ? v:_("Unknown"));
}
static void
diff --git a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
index 889885c..58969a6 100644
--- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
@@ -90,10 +90,9 @@ static const gchar *ui_reader =
" </popup>"
"</ui>";
-
static void
toggle_part (GtkAction *action,
- EMailDisplayPopupExtension *extension)
+ EMailDisplayPopupExtension *extension)
{
EMailDisplayPopupPreferPlain *pp_extension = (EMailDisplayPopupPreferPlain *) extension;
WebKitDOMDocument *doc = pp_extension->document;
@@ -108,14 +107,16 @@ toggle_part (GtkAction *action,
g_free (uri);
query = soup_form_decode (soup_uri->query);
- g_hash_table_replace (query, g_strdup ("part_id"),
+ g_hash_table_replace (
+ query, g_strdup ("part_id"),
pp_extension->text_html_id ?
pp_extension->text_html_id :
pp_extension->text_plain_id);
- g_hash_table_replace (query, g_strdup ("mime_type"),
- pp_extension->text_html_id ?
- (gpointer) "text/html" :
- (gpointer) "text/plain");
+ g_hash_table_replace (
+ query, g_strdup ("mime_type"),
+ pp_extension->text_html_id ?
+ (gpointer) "text/html" :
+ (gpointer) "text/plain");
soup_uri_set_query_from_form (soup_uri, query);
g_hash_table_destroy (query);
@@ -151,11 +152,11 @@ GtkActionEntry entries[] = {
}
};
-const gint ID_LEN = G_N_ELEMENTS(".alternative-prefer-plain.");
+const gint ID_LEN = G_N_ELEMENTS (".alternative-prefer-plain.");
static void
set_text_plain_id (EMailDisplayPopupPreferPlain *extension,
- const gchar *id)
+ const gchar *id)
{
g_free (extension->text_plain_id);
extension->text_plain_id = g_strdup (id);
@@ -163,14 +164,13 @@ set_text_plain_id (EMailDisplayPopupPreferPlain *extension,
static void
set_text_html_id (EMailDisplayPopupPreferPlain *extension,
- const gchar *id)
+ const gchar *id)
{
g_free (extension->text_html_id);
extension->text_html_id = g_strdup (id);
}
-
-static GtkActionGroup*
+static GtkActionGroup *
create_group (EMailDisplayPopupExtension *extension)
{
EExtensible *extensible;
@@ -192,14 +192,15 @@ create_group (EMailDisplayPopupExtension *extension)
gtk_ui_manager_add_ui_from_string (ui_manager, ui_webview, -1, NULL);
action = gtk_action_group_get_action (group, "show-plain-text-part");
- g_signal_connect (action, "activate",
+ g_signal_connect (
+ action, "activate",
G_CALLBACK (toggle_part), extension);
action = gtk_action_group_get_action (group, "show-text-html-part");
- g_signal_connect (action, "activate",
+ g_signal_connect (
+ action, "activate",
G_CALLBACK (toggle_part), extension);
-
shell = e_shell_get_default ();
shell_window = e_shell_get_active_window (shell);
if (E_IS_SHELL_WINDOW (shell_window)) {
@@ -218,7 +219,7 @@ create_group (EMailDisplayPopupExtension *extension)
static void
mail_display_popup_prefer_plain_update_actions (EMailDisplayPopupExtension *extension,
- WebKitHitTestResult *context)
+ WebKitHitTestResult *context)
{
EMailDisplay *display;
GtkAction *action;
@@ -413,7 +414,6 @@ e_mail_display_popup_prefer_plain_class_finalize (EMailDisplayPopupPreferPlainCl
}
-
static void
e_mail_display_popup_prefer_plain_init (EMailDisplayPopupPreferPlain *extension)
{
diff --git a/modules/prefer-plain/e-mail-parser-prefer-plain.c b/modules/prefer-plain/e-mail-parser-prefer-plain.c
index b5f8db2..5237831 100644
--- a/modules/prefer-plain/e-mail-parser-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-parser-prefer-plain.c
@@ -69,7 +69,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "multipart/alternative",
+static const gchar * parser_mime_types[] = { "multipart/alternative",
"text/html",
NULL };
@@ -202,7 +202,8 @@ empe_prefer_plain_parse (EMailParserExtension *extension,
/* Enforcing text/plain, but wants HTML as attachment */
if (emp_pp->show_suppressed) {
- return make_part_attachment (parser, part, part_id,
+ return make_part_attachment (
+ parser, part, part_id,
FALSE, cancellable);
}
@@ -317,7 +318,7 @@ empe_prefer_plain_parse (EMailParserExtension *extension,
parser, sp, part_id, cancellable);
parts = g_slist_concat (
parts,
- e_mail_parser_wrap_as_attachment (
+ e_mail_parser_wrap_as_attachment (
parser, sp, sparts, part_id,
cancellable));
}
@@ -329,7 +330,6 @@ empe_prefer_plain_parse (EMailParserExtension *extension,
parts = g_slist_concat (parts, plain_text_parts);
-
g_string_truncate (part_id, partidlen);
return parts;
diff --git a/modules/prefer-plain/plugin/config-ui.c b/modules/prefer-plain/plugin/config-ui.c
index 29b81a6..411ef24 100644
--- a/modules/prefer-plain/plugin/config-ui.c
+++ b/modules/prefer-plain/plugin/config-ui.c
@@ -120,7 +120,7 @@ prefer_plain_page_factory (EPlugin *epl,
}
gtk_cell_layout_pack_start ((GtkCellLayout *) dropdown, cell, TRUE);
- gtk_cell_layout_set_attributes((GtkCellLayout *)dropdown, cell, "text", 0, NULL);
+ gtk_cell_layout_set_attributes ((GtkCellLayout *) dropdown, cell, "text", 0, NULL);
gtk_combo_box_set_model (dropdown, (GtkTreeModel *) store);
/*gtk_combo_box_set_active(dropdown, -1);*/
gtk_combo_box_set_active (dropdown, epp_mode);
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 3166220..98c7dfa 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -315,7 +315,7 @@ spam_assassin_command_full (const gchar **argv,
g_set_error_literal (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
_("SpamAssassin either crashed or "
- "failed to process a mail message"));
+ "failed to process a mail message"));
return source_data.exit_code;
}
diff --git a/modules/startup-wizard/e-startup-assistant.c b/modules/startup-wizard/e-startup-assistant.c
index f29ed69..86d6de1 100644
--- a/modules/startup-wizard/e-startup-assistant.c
+++ b/modules/startup-wizard/e-startup-assistant.c
@@ -152,8 +152,8 @@ startup_assistant_constructed (GObject *object)
e_mail_config_welcome_page_set_text (
E_MAIL_CONFIG_WELCOME_PAGE (nth_page),
_("Welcome to Evolution.\n\nThe next few screens will "
- "allow Evolution to connect to your email accounts, "
- "and to import files from other applications."));
+ "allow Evolution to connect to your email accounts, "
+ "and to import files from other applications."));
}
}
diff --git a/modules/text-highlight/e-mail-display-popup-text-highlight.c b/modules/text-highlight/e-mail-display-popup-text-highlight.c
index 18476c1..bd5d82a 100644
--- a/modules/text-highlight/e-mail-display-popup-text-highlight.c
+++ b/modules/text-highlight/e-mail-display-popup-text-highlight.c
@@ -46,7 +46,7 @@ typedef struct _EMailDisplayPopupTextHighlightClass {
#define E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST \
- ((obj), e_mail_display_popup_text_highlight_get_type(), EMailDisplayPopupTextHighlight))
+ ((obj), e_mail_display_popup_text_highlight_get_type (), EMailDisplayPopupTextHighlight))
GType e_mail_display_popup_text_highlight_get_type (void);
static void e_mail_display_popup_extension_interface_init (EMailDisplayPopupExtensionInterface *iface);
@@ -109,8 +109,8 @@ static GtkActionEntry entries[] = {
static void
reformat (GtkAction *old,
- GtkAction *action,
- gpointer user_data)
+ GtkAction *action,
+ gpointer user_data)
{
EMailDisplayPopupTextHighlight *th_extension;
WebKitDOMDocument *doc;
@@ -120,7 +120,6 @@ reformat (GtkAction *old,
GHashTable *query;
gchar *uri;
-
th_extension = E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT (user_data);
doc = th_extension->document;
if (!doc)
@@ -163,7 +162,7 @@ exit:
th_extension->document = NULL;
}
-static GtkActionGroup*
+static GtkActionGroup *
create_group (EMailDisplayPopupExtension *extension)
{
EExtensible *extensible;
@@ -217,7 +216,8 @@ create_group (EMailDisplayPopupExtension *extension)
NULL, NULL, action_index);
action_index++;
gtk_action_group_add_action (group, GTK_ACTION (action));
- g_signal_connect (action, "changed",
+ g_signal_connect (
+ action, "changed",
G_CALLBACK (reformat), extension);
gtk_radio_action_set_group (action, radio_group);
radio_group = gtk_radio_action_get_group (action);
@@ -226,15 +226,15 @@ create_group (EMailDisplayPopupExtension *extension)
gtk_ui_manager_add_ui (
ui_manager, merge_id,
- "/context/custom-actions-2/format-as-menu/format-as-actions",
+ "/context/custom-actions-2/format-as-menu/format-as-actions",
languages[i].action_name, languages[i].action_name,
- GTK_UI_MANAGER_AUTO, FALSE);
+ GTK_UI_MANAGER_AUTO, FALSE);
gtk_ui_manager_add_ui (
shell_ui_manager, shell_merge_id,
"/mail-preview-popup/mail-preview-popup-actions/format-as-menu/format-as-actions",
languages[i].action_name, languages[i].action_name,
- GTK_UI_MANAGER_AUTO, FALSE);
+ GTK_UI_MANAGER_AUTO, FALSE);
}
languages = get_additinal_languages (&len);
@@ -247,7 +247,8 @@ create_group (EMailDisplayPopupExtension *extension)
NULL, NULL, action_index);
action_index++;
gtk_action_group_add_action (group, GTK_ACTION (action));
- g_signal_connect (action, "changed",
+ g_signal_connect (
+ action, "changed",
G_CALLBACK (reformat), extension);
gtk_radio_action_set_group (action, radio_group);
@@ -257,15 +258,15 @@ create_group (EMailDisplayPopupExtension *extension)
gtk_ui_manager_add_ui (
ui_manager, merge_id,
- "/context/custom-actions-2/format-as-menu/format-as-other-menu",
+ "/context/custom-actions-2/format-as-menu/format-as-other-menu",
languages[i].action_name, languages[i].action_name,
- GTK_UI_MANAGER_AUTO, FALSE);
+ GTK_UI_MANAGER_AUTO, FALSE);
gtk_ui_manager_add_ui (
shell_ui_manager, shell_merge_id,
"/mail-preview-popup/mail-preview-popup-actions/format-as-menu/format-as-other-menu",
languages[i].action_name, languages[i].action_name,
- GTK_UI_MANAGER_AUTO, FALSE);
+ GTK_UI_MANAGER_AUTO, FALSE);
}
return group;
@@ -273,7 +274,7 @@ create_group (EMailDisplayPopupExtension *extension)
static void
update_actions (EMailDisplayPopupExtension *extension,
- WebKitHitTestResult *context)
+ WebKitHitTestResult *context)
{
EMailDisplayPopupTextHighlight *th_extension;
WebKitDOMNode *node;
@@ -283,7 +284,7 @@ update_actions (EMailDisplayPopupExtension *extension,
th_extension = E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT (extension);
if (th_extension->action_group == NULL) {
- th_extension->action_group = create_group(extension);
+ th_extension->action_group = create_group (extension);
}
th_extension->document = NULL;
@@ -291,7 +292,6 @@ update_actions (EMailDisplayPopupExtension *extension,
document = webkit_dom_node_get_owner_document (node);
uri = webkit_dom_document_get_document_uri (document);
-
/* If the part below context menu was made by text-highlight formatter,
* then try to check what formatter it's using at the moment and set
* it as active in the popup menu */
@@ -326,7 +326,7 @@ update_actions (EMailDisplayPopupExtension *extension,
}
} else {
- gtk_action_group_set_visible(
+ gtk_action_group_set_visible (
th_extension->action_group, FALSE);
}
diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c
index 643e54b..b9ce34d 100644
--- a/modules/text-highlight/e-mail-formatter-text-highlight.c
+++ b/modules/text-highlight/e-mail-formatter-text-highlight.c
@@ -82,7 +82,7 @@ get_default_font (void)
static gchar *
get_syntax (EMailPart *part,
- const gchar *uri)
+ const gchar *uri)
{
gchar *syntax = NULL;
CamelContentType *ct = NULL;
@@ -152,7 +152,6 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
return FALSE;
}
-
if (context->mode == E_MAIL_FORMATTER_MODE_PRINTING) {
CamelDataWrapper *dw;
@@ -245,10 +244,12 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
g_free (font);
}
- font_family = g_strdup_printf ("--font='%s'",
- pango_font_description_get_family (fd));
- font_size = g_strdup_printf ("--font-size=%d",
- pango_font_description_get_size (fd) / PANGO_SCALE);
+ font_family = g_strdup_printf (
+ "--font='%s'",
+ pango_font_description_get_family (fd));
+ font_size = g_strdup_printf (
+ "--font-size=%d",
+ pango_font_description_get_size (fd) / PANGO_SCALE);
argv[1] = font_family;
argv[2] = font_size;
diff --git a/modules/text-highlight/e-mail-parser-text-highlight.c b/modules/text-highlight/e-mail-parser-text-highlight.c
index 328e590..69aa1cc 100644
--- a/modules/text-highlight/e-mail-parser-text-highlight.c
+++ b/modules/text-highlight/e-mail-parser-text-highlight.c
@@ -60,10 +60,10 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
static GSList *
empe_text_highlight_parse (EMailParserExtension *extension,
- EMailParser *parser,
- CamelMimePart *part,
- GString *part_id,
- GCancellable *cancellable)
+ EMailParser *parser,
+ CamelMimePart *part,
+ GString *part_id,
+ GCancellable *cancellable)
{
GSList *parts;
gint len;
diff --git a/modules/text-highlight/languages.c b/modules/text-highlight/languages.c
index 957b0ad..7875cd6 100644
--- a/modules/text-highlight/languages.c
+++ b/modules/text-highlight/languages.c
@@ -30,21 +30,21 @@ G_LOCK_DEFINE_STATIC (mime_types);
static Language languages[] = {
{ "txt", N_("_Plain text"),
- (const gchar* []) { (gchar[]) { "text" }, NULL },
- (const gchar* []) { (gchar[]) { "text/plain" },
+ (const gchar *[]) { (gchar[]) { "text" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/plain" },
(gchar[]) { "text/*" }, NULL }
},
{ "assembler", N_("_Assembler"),
- (const gchar* []) { (gchar[]) { "asm" } , NULL },
- (const gchar* []) { (gchar[]) { "text/x-asm" }, NULL }
+ (const gchar *[]) { (gchar[]) { "asm" } , NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-asm" }, NULL }
},
{ "sh", N_("_Bash"),
- (const gchar* []) { (gchar[]) { "bash" }, (gchar[]) { "sh" },
+ (const gchar *[]) { (gchar[]) { "bash" }, (gchar[]) { "sh" },
(gchar[]) { "ebuild" }, (gchar[]) {"eclass" },
NULL },
- (const gchar* []) { (gchar[]) { "application/x-bsh" },
+ (const gchar *[]) { (gchar[]) { "application/x-bsh" },
(gchar[]) { "application/x-sh" },
(gchar[]) { "application/x-shar" },
(gchar[]) { "application/x-shellscript" },
@@ -52,112 +52,112 @@ static Language languages[] = {
},
{ "c", N_("_C/C++"),
- (const gchar* []) { (gchar[]) { "c" }, (gchar[]) { "c++" },
+ (const gchar *[]) { (gchar[]) { "c" }, (gchar[]) { "c++" },
(gchar[]) { "cc" }, (gchar[]) { "cpp" },
(gchar[]) { "cu" }, (gchar[]) { "cxx" },
(gchar[]) { "h" }, (gchar[]) { "hh" },
(gchar[]) { "hpp" }, (gchar[]) { "hxx" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-c" }, NULL }
+ (const gchar *[]) { (gchar[]) { "text/x-c" }, NULL }
},
{ "csharp", N_("_C#"),
- (const gchar* []) { (gchar[]) { "cs" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-csharp" }, NULL }
+ (const gchar *[]) { (gchar[]) { "cs" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-csharp" }, NULL }
},
{ "css", N_("_Cascade Style Sheet"),
- (const gchar* []) { (gchar[]) { "css" }, NULL },
- (const gchar* []) { (gchar[]) { "text/css" }, NULL }
+ (const gchar *[]) { (gchar[]) { "css" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/css" }, NULL }
},
{ "html", N_("_HTML"),
- (const gchar* []) { (gchar[]) { "html" }, (gchar[]) { "html" },
+ (const gchar *[]) { (gchar[]) { "html" }, (gchar[]) { "html" },
(gchar[]) { "xhtml" }, (gchar[]) { "dhtml" }, NULL },
- (const gchar* []) { NULL } /* Don't register text-highlight as formatter
- or parser of text/html as it would break
- all text/html emails. */
+ (const gchar *[]) { NULL } /* Don't register text-highlight as formatter
+ or parser of text / html as it would break
+ all text / html emails. */
},
{ "java", N_("_Java"),
- (const gchar* []) { (gchar[]) { "java" }, (gchar[]) { "groovy" },
+ (const gchar *[]) { (gchar[]) { "java" }, (gchar[]) { "groovy" },
(gchar[]) { "grv" }, NULL },
- (const gchar* []) { (gchar[]) { "text/java-source" }, NULL }
+ (const gchar *[]) { (gchar[]) { "text/java-source" }, NULL }
},
{ "js", N_("_JavaScript"),
- (const gchar* []) { (gchar[]) { "js" }, NULL },
- (const gchar* []) { (gchar[]) { "text/javascript" },
+ (const gchar *[]) { (gchar[]) { "js" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/javascript" },
(gchar[]) { "application/x-javascript" }, NULL }
},
{ "diff", N_("_Patch/diff"),
- (const gchar* []) { (gchar[]) { "diff" }, (gchar[]) { "patch" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-diff" },
- (gchar[]) { "text/x-patch" }, NULL }
+ (const gchar *[]) { (gchar[]) { "diff" }, (gchar[]) { "patch" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-diff" },
+ (gchar[]) { "text/x-patch" }, NULL }
},
{ "perl", N_("_Perl"),
- (const gchar* []) { (gchar[]) { "perl" }, (gchar[]) { "cgi"},
+ (const gchar *[]) { (gchar[]) { "perl" }, (gchar[]) { "cgi"},
(gchar[]) { "perl" }, (gchar[]) { "pl" },
(gchar[]) { "plex" }, (gchar[]) { "plx" },
(gchar[]) { "pm" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-script.perl" },
+ (const gchar *[]) { (gchar[]) { "text/x-script.perl" },
(gchar[]) { "text/x-script.perl-module" },
(gchar[]) { "application/x-pixclscript" },
(gchar[]) { "application/x-xpixmap" }, NULL }
},
{ "php", N_("_PHP"),
- (const gchar* []) { (gchar[]) { "php" }, (gchar[]) { "php3" },
+ (const gchar *[]) { (gchar[]) { "php" }, (gchar[]) { "php3" },
(gchar[]) { "php4" }, (gchar[]) { "php5" },
(gchar[]) { "php6" }, NULL },
- (const gchar* []) { (gchar[]) { "text/php" },
- (gchar[]) { "text/x-php" },
- (gchar[]) { "application/php" },
- (gchar[]) { "application/x-php" },
- (gchar[]) { "application/x-httpd-php" },
- (gchar[]) { "application/x-httpd-php-source" },
- NULL }
+ (const gchar *[]) { (gchar[]) { "text/php" },
+ (gchar[]) { "text/x-php" },
+ (gchar[]) { "application/php" },
+ (gchar[]) { "application/x-php" },
+ (gchar[]) { "application/x-httpd-php" },
+ (gchar[]) { "application/x-httpd-php-source" },
+ NULL }
},
{ "python", N_("_Python"),
- (const gchar* []) { (gchar[]) { "py" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-script.python" }, NULL }
+ (const gchar *[]) { (gchar[]) { "py" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-script.python" }, NULL }
},
{ "ruby", N_("_Ruby"),
- (const gchar* []) { (gchar[]) { "ruby" }, (gchar[]) { "pp" },
+ (const gchar *[]) { (gchar[]) { "ruby" }, (gchar[]) { "pp" },
(gchar[]) { "rb" }, (gchar[]) { "rjs" },
(gchar[]) { "ruby" }, NULL },
- (const gchar* []) { (gchar[]) { "application/x-ruby" }, NULL }
+ (const gchar *[]) { (gchar[]) { "application/x-ruby" }, NULL }
},
{ "tcl", N_("_Tcl/Tk"),
- (const gchar* []) { (gchar[]) { "tcl" }, (gchar[]) { "ictl" },
+ (const gchar *[]) { (gchar[]) { "tcl" }, (gchar[]) { "ictl" },
(gchar[]) { "wish" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-tcl" }, NULL }
+ (const gchar *[]) { (gchar[]) { "text/x-tcl" }, NULL }
},
{ "tex", N_("_TeX/LaTeX"),
- (const gchar* []) { (gchar[]) { "tex" }, (gchar[]) { "csl" },
+ (const gchar *[]) { (gchar[]) { "tex" }, (gchar[]) { "csl" },
(gchar[]) { "sty" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-tex" }, NULL }
+ (const gchar *[]) { (gchar[]) { "text/x-tex" }, NULL }
},
{ "vala", N_("_Vala"),
- (const gchar* []) { (gchar[]) { "vala" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-vala" }, NULL }
+ (const gchar *[]) { (gchar[]) { "vala" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-vala" }, NULL }
},
{ "vb", N_("_Visual Basic"),
- (const gchar* []) { (gchar[]) { "vb" }, (gchar[]) { "bas" },
+ (const gchar *[]) { (gchar[]) { "vb" }, (gchar[]) { "bas" },
(gchar[]) { "basic" }, (gchar[]) { "bi" },
(gchar[]) { "vbs" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { NULL }
},
{ "xml", N_("_XML"),
- (const gchar* []) { (gchar[]) { "xml" }, (gchar[]) { "dtd" },
+ (const gchar *[]) { (gchar[]) { "xml" }, (gchar[]) { "dtd" },
(gchar[]) { "ecf" }, (gchar[]) { "ent" },
(gchar[]) { "hdr" }, (gchar[]) { "hub" },
(gchar[]) { "jnlp" }, (gchar[]) { "nrm" },
@@ -166,7 +166,7 @@ static Language languages[] = {
(gchar[]) { "tld" }, (gchar[]) { "vxml" },
(gchar[]) { "wml" }, (gchar[]) { "xsd" },
(gchar[]) { "xsl" }, NULL },
- (const gchar* []) { (gchar[]) { "text/xml" },
+ (const gchar *[]) { (gchar[]) { "text/xml" },
(gchar[]) { "application/xml" },
(gchar[]) { "application/x-xml" }, NULL }
}
@@ -175,186 +175,186 @@ static Language languages[] = {
static struct Language other_languages[] = {
{ "actionscript", N_("_ActionScript"),
- (const gchar* []) { (gchar[]) { "as" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "as" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "ada", N_("_ADA95"),
- (const gchar* []) { (gchar[]) { "a" }, (gchar[]) { "adb" },
- (gchar[]) { "ads" }, (gchar[]) { "gnad" },
- NULL },
- (const gchar* []) { (gchar[]) { "text/x-adasrc" }, NULL }
+ (const gchar *[]) { (gchar[]) { "a" }, (gchar[]) { "adb" },
+ (gchar[]) { "ads" }, (gchar[]) { "gnad" },
+ NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-adasrc" }, NULL }
},
{ "algol", N_("_ALGOL 68"),
- (const gchar* []) { (gchar[]) { "alg" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "alg" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "awk", N_("(_G)AWK"),
- (const gchar* []) { (gchar[]) { "awk" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-awk" }, NULL }
+ (const gchar *[]) { (gchar[]) { "awk" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-awk" }, NULL }
},
{ "cobol", N_("_COBOL"),
- (const gchar* []) { (gchar[]) { "cbl" }, (gchar[]) { "cob" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-cobol" }, NULL }
+ (const gchar *[]) { (gchar[]) { "cbl" }, (gchar[]) { "cob" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-cobol" }, NULL }
},
{ "bat", N_("_DOS Batch"),
- (const gchar* []) { (gchar[]) { "bat" }, (gchar[]) { "cmd" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "bat" }, (gchar[]) { "cmd" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "d", N_("_D"),
- (const gchar* []) { (gchar[]) { "d" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "d" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "erlang", N_("_Erlang"),
- (const gchar* []) { (gchar[]) { "erl" }, (gchar[]) { "hrl" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-erlang" }, NULL }
+ (const gchar *[]) { (gchar[]) { "erl" }, (gchar[]) { "hrl" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-erlang" }, NULL }
},
{ "fortran77", N_("_FORTRAN 77"),
- (const gchar* []) { (gchar[]) { "f" }, (gchar[]) { "for" },
+ (const gchar *[]) { (gchar[]) { "f" }, (gchar[]) { "for" },
(gchar[]) { "ftn" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-fortran" }, NULL }
+ (const gchar *[]) { (gchar[]) { "text/x-fortran" }, NULL }
},
{ "fortran90", N_("_FORTRAN 90"),
- (const gchar* []) { (gchar[]) { "f90" }, (gchar[]) { "f95" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-fortran" }, NULL }
+ (const gchar *[]) { (gchar[]) { "f90" }, (gchar[]) { "f95" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-fortran" }, NULL }
},
{ "fsharp", N_("_F#"),
- (const gchar* []) { (gchar[]) { "fs" }, (gchar[]) { "fsx" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "fs" }, (gchar[]) { "fsx" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "go", N_("_Go"),
- (const gchar* []) { (gchar[]) { "go" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-go" }, NULL }
+ (const gchar *[]) { (gchar[]) { "go" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-go" }, NULL }
},
{ "haskell", N_("_Haskell"),
- (const gchar* []) { (gchar[]) { "hs" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-haskell" }, NULL }
+ (const gchar *[]) { (gchar[]) { "hs" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-haskell" }, NULL }
},
{ "jsp", N_("_JSP"),
- (const gchar* []) { (gchar[]) { "jsp" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-jsp" }, NULL }
+ (const gchar *[]) { (gchar[]) { "jsp" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-jsp" }, NULL }
},
{ "lisp", N_("_Lisp"),
- (const gchar* []) { (gchar[]) { "cl" }, (gchar[]) { "clisp" },
+ (const gchar *[]) { (gchar[]) { "cl" }, (gchar[]) { "clisp" },
(gchar[]) { "el" }, (gchar[]) { "lsp" },
(gchar[]) { "sbcl"}, (gchar[]) { "scom" },
NULL },
- (const gchar* []) { (gchar[]) { "text/x-emacs-lisp" }, NULL }
+ (const gchar *[]) { (gchar[]) { "text/x-emacs-lisp" }, NULL }
},
{ "lotus", N_("_Lotus"),
- (const gchar* []) { (gchar[]) { "ls" }, NULL },
- (const gchar* []) { (gchar[]) { "application/vnd.lotus-1-2-3" }, NULL }
+ (const gchar *[]) { (gchar[]) { "ls" }, NULL },
+ (const gchar *[]) { (gchar[]) { "application/vnd.lotus-1-2-3" }, NULL }
},
{ "lua", N_("_Lua"),
- (const gchar* []) { (gchar[]) { "lua" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-lua" }, NULL }
+ (const gchar *[]) { (gchar[]) { "lua" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-lua" }, NULL }
},
{ "maple", N_("_Maple"),
- (const gchar* []) { (gchar[]) { "mpl" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "mpl" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "matlab", N_("_Matlab"),
- (const gchar* []) { (gchar[]) { "m" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-matlab" }, NULL }
+ (const gchar *[]) { (gchar[]) { "m" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-matlab" }, NULL }
},
{ "maya", N_("_Maya"),
- (const gchar* []) { (gchar[]) { "mel" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "mel" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "oberon", N_("_Oberon"),
- (const gchar* []) { (gchar[]) { "ooc" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "ooc" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "objc", N_("_Objective C"),
- (const gchar* []) { (gchar[]) { "objc" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-objchdr" },
+ (const gchar *[]) { (gchar[]) { "objc" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-objchdr" },
(gchar[]) { "text/x-objcsrc" }, NULL }
},
{ "ocaml", N_("_OCaml"),
- (const gchar* []) { (gchar[]) { "ml" }, (gchar[]) { "mli" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-ocaml" }, NULL }
+ (const gchar *[]) { (gchar[]) { "ml" }, (gchar[]) { "mli" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-ocaml" }, NULL }
},
{ "octave", N_("_Octave"),
- (const gchar* []) { (gchar[]) { "octave" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "octave" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "os", N_("_Object Script"),
- (const gchar* []) { (gchar[]) { "os" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "os" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "pascal", N_("_Pascal"),
- (const gchar* []) { (gchar[]) { "pas" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-pascal" }, NULL }
+ (const gchar *[]) { (gchar[]) { "pas" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-pascal" }, NULL }
},
{ "pov", N_("_POV-Ray"),
- (const gchar* []) { (gchar[]) { "pov" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "pov" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "pro", N_("_Prolog"),
- (const gchar* []) { (gchar[]) { "pro" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "pro" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "ps", N_("_PostScript"),
- (const gchar* []) { (gchar[]) { "ps" } , NULL },
- (const gchar* []) { (gchar[]) { "application/postscript" }, NULL }
+ (const gchar *[]) { (gchar[]) { "ps" } , NULL },
+ (const gchar *[]) { (gchar[]) { "application/postscript" }, NULL }
},
{ "r", N_("_R"),
- (const gchar* []) { (gchar[]) { "r" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "r" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "spec", N_("_RPM Spec"),
- (const gchar* []) { (gchar[]) { "spec" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-rpm-spec" }, NULL }
+ (const gchar *[]) { (gchar[]) { "spec" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-rpm-spec" }, NULL }
},
{ "scala", N_("_Scala"),
- (const gchar* []) { (gchar[]) { "scala" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-scala" }, NULL }
+ (const gchar *[]) { (gchar[]) { "scala" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-scala" }, NULL }
},
{ "smalltalk", N_("_Smalltalk"),
- (const gchar* []) { (gchar[]) { "gst" }, (gchar[]) { "sq" },
+ (const gchar *[]) { (gchar[]) { "gst" }, (gchar[]) { "sq" },
(gchar[]) { "st" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { NULL }
},
{ "tcsh", N_("_TCSH"),
- (const gchar* []) { (gchar[]) { "tcsh" }, NULL },
- (const gchar* []) { NULL }
+ (const gchar *[]) { (gchar[]) { "tcsh" }, NULL },
+ (const gchar *[]) { NULL }
},
{ "vhd", N_("_VHDL"),
- (const gchar* []) { (gchar[]) { "vhd" }, NULL },
- (const gchar* []) { (gchar[]) { "text/x-vhdl" }, NULL }
+ (const gchar *[]) { (gchar[]) { "vhd" }, NULL },
+ (const gchar *[]) { (gchar[]) { "text/x-vhdl" }, NULL }
}
};
@@ -379,7 +379,7 @@ get_additinal_languages (gsize *len)
}
const gchar *
-get_syntax_for_ext(const gchar *extension)
+get_syntax_for_ext (const gchar *extension)
{
gint i;
gint j;
@@ -422,7 +422,7 @@ get_syntax_for_ext(const gchar *extension)
}
const gchar *
-get_syntax_for_mime_type(const gchar *mime_type)
+get_syntax_for_mime_type (const gchar *mime_type)
{
gint i;
gint j;
@@ -464,7 +464,6 @@ get_syntax_for_mime_type(const gchar *mime_type)
return NULL;
}
-
const gchar **
get_mime_types (void)
{
diff --git a/modules/text-highlight/languages.h b/modules/text-highlight/languages.h
index 03f1442..c530cc5 100644
--- a/modules/text-highlight/languages.h
+++ b/modules/text-highlight/languages.h
@@ -28,7 +28,7 @@ typedef struct Language {
const gchar **mime_types;
} Language;
-const gchar * get_syntax_for_ext (const gchar *extension);
+const gchar * get_syntax_for_ext (const gchar *extension);
const gchar * get_syntax_for_mime_type (const gchar *mime_type);
Language * get_default_langauges (gsize *len);
diff --git a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
index 79089a5..21bf74d 100644
--- a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
+++ b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
@@ -77,7 +77,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "application/vnd.ms-tnef",
+static const gchar * parser_mime_types[] = { "application/vnd.ms-tnef",
"application/ms-tnefl",
NULL };
@@ -132,11 +132,11 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
TNEFStruct tnef;
GSList *parts;
- tmpdir = e_mkdtemp("tnef-attachment-XXXXXX");
+ tmpdir = e_mkdtemp ("tnef-attachment-XXXXXX");
if (tmpdir == NULL)
return NULL;
- name = g_build_filename(tmpdir, ".evo-attachment.tnef", NULL);
+ name = g_build_filename (tmpdir, ".evo-attachment.tnef", NULL);
out = camel_stream_fs_new_with_name (name, O_RDWR | O_CREAT, 0666, NULL);
if (out == NULL) {
@@ -161,7 +161,7 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
TNEFInitialize (&tnef);
tnef.Debug = verbose;
if (TNEFParseFile (name, &tnef) == -1) {
- printf("ERROR processing file\n");
+ printf ("ERROR processing file\n");
}
processTnef (&tnef, tmpdir);
@@ -178,7 +178,7 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
mainpart = camel_mime_part_new ();
mp = camel_multipart_new ();
- camel_data_wrapper_set_mime_type((CamelDataWrapper *)mp, "multipart/mixed");
+ camel_data_wrapper_set_mime_type ((CamelDataWrapper *) mp, "multipart/mixed");
camel_multipart_set_boundary (mp, NULL);
camel_medium_set_content ((CamelMedium *) mainpart, (CamelDataWrapper *) mp);
@@ -190,9 +190,9 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
gchar *path;
const gchar *type;
- if (!strcmp(d->d_name, ".")
- || !strcmp(d->d_name, "..")
- || !strcmp(d->d_name, ".evo-attachment.tnef"))
+ if (!strcmp (d->d_name, ".")
+ || !strcmp (d->d_name, "..")
+ || !strcmp (d->d_name, ".evo-attachment.tnef"))
continue;
path = g_build_filename (tmpdir, d->d_name, NULL);
@@ -224,28 +224,29 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
closedir (dir);
len = part_id->len;
- g_string_append_printf(part_id, ".tnef");
+ g_string_append_printf (part_id, ".tnef");
parts = NULL;
if (camel_multipart_get_number (mp) > 0) {
CamelMimePart *part = camel_mime_part_new ();
- camel_medium_set_content ((CamelMedium *) part,
+ camel_medium_set_content (
+ (CamelMedium *) part,
CAMEL_DATA_WRAPPER (mp));
- parts = e_mail_parser_parse_part_as (parser, part,
- part_id, "multipart/mixed", cancellable);
+ parts = e_mail_parser_parse_part_as (
+ parser, part, part_id,
+ "multipart/mixed", cancellable);
g_object_unref (part);
}
g_string_truncate (part_id, len);
- if (parts) {
- parts = e_mail_parser_wrap_as_attachment (parser,
- part, parts, part_id, cancellable);
- }
+ if (parts)
+ parts = e_mail_parser_wrap_as_attachment (
+ parser, part, parts, part_id, cancellable);
g_object_unref (mp);
g_object_unref (mainpart);
@@ -334,13 +335,13 @@ processTnef (TNEFStruct *tnef,
/* First see if this requires special processing. */
/* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */
if (tnef->messageClass[0] != 0) {
- if (strcmp(tnef->messageClass, "IPM.Contact") == 0) {
+ if (strcmp (tnef->messageClass, "IPM.Contact") == 0) {
saveVCard (tnef, tmpdir);
}
- if (strcmp(tnef->messageClass, "IPM.Task") == 0) {
+ if (strcmp (tnef->messageClass, "IPM.Task") == 0) {
saveVTask (tnef, tmpdir);
}
- if (strcmp(tnef->messageClass, "IPM.Appointment") == 0) {
+ if (strcmp (tnef->messageClass, "IPM.Appointment") == 0) {
saveVCalendar (tnef, tmpdir);
foundCal = 1;
}
@@ -348,7 +349,7 @@ processTnef (TNEFStruct *tnef,
if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
PROP_TAG (PT_STRING8,0x24))) != MAPI_UNDEFINED) {
- if (strcmp(filename->data, "IPM.Appointment") == 0) {
+ if (strcmp (filename->data, "IPM.Appointment") == 0) {
/* If it's "indicated" twice, we don't want to save 2 calendar entries. */
if (foundCal == 0) {
saveVCalendar (tnef, tmpdir);
@@ -356,7 +357,7 @@ processTnef (TNEFStruct *tnef,
}
}
- if (strcmp(tnef->messageClass, "IPM.Microsoft Mail.Note") == 0) {
+ if (strcmp (tnef->messageClass, "IPM.Microsoft Mail.Note") == 0) {
if ((saveRTF == 1) && (tnef->subject.size > 0)) {
/* Description */
if ((filename = MAPIFindProperty (&(tnef->MapiProperties),
@@ -372,10 +373,11 @@ processTnef (TNEFStruct *tnef,
g_free (absfilename);
g_free (file);
- if ((fptr = fopen(ifilename, "wb"))==NULL) {
- printf("ERROR: Error writing file to disk!");
+ if ((fptr = fopen (ifilename, "wb")) == NULL) {
+ printf ("ERROR: Error writing file to disk!");
} else {
- fwrite (buf.data,
+ fwrite (
+ buf.data,
sizeof (BYTE),
buf.size,
fptr);
@@ -459,7 +461,7 @@ processTnef (TNEFStruct *tnef,
}
if (filename->size == 1) {
filename->size = 20;
- g_sprintf(tmpname, "file_%03i.dat", count);
+ g_sprintf (tmpname, "file_%03i.dat", count);
filename->data = tmpname;
}
absfilename = sanitize_filename (filename->data);
@@ -468,19 +470,21 @@ processTnef (TNEFStruct *tnef,
ifilename = g_build_filename (tmpdir, absfilename, NULL);
g_free (absfilename);
- if ((fptr = fopen(ifilename, "wb"))==NULL) {
- printf("ERROR: Error writing file to disk!");
+ if ((fptr = fopen (ifilename, "wb")) == NULL) {
+ printf ("ERROR: Error writing file to disk!");
} else {
if (object == 1) {
- fwrite (filedata->data + 16,
- sizeof (BYTE),
- filedata->size - 16,
- fptr);
+ fwrite (
+ filedata->data + 16,
+ sizeof (BYTE),
+ filedata->size - 16,
+ fptr);
} else {
- fwrite (filedata->data,
- sizeof (BYTE),
- filedata->size,
- fptr);
+ fwrite (
+ filedata->data,
+ sizeof (BYTE),
+ filedata->size,
+ fptr);
}
fclose (fptr);
}
@@ -529,42 +533,42 @@ saveVCard (TNEFStruct *tnef,
g_free (file);
g_free (absfilename);
- if ((fptr = fopen(ifilename, "wb"))==NULL) {
- printf("Error writing file to disk!");
+ if ((fptr = fopen (ifilename, "wb")) == NULL) {
+ printf ("Error writing file to disk!");
} else {
- fprintf(fptr, "BEGIN:VCARD\n");
- fprintf(fptr, "VERSION:2.1\n");
+ fprintf (fptr, "BEGIN:VCARD\n");
+ fprintf (fptr, "VERSION:2.1\n");
if (vl != MAPI_UNDEFINED) {
- fprintf(fptr, "FN:%s\n", vl->data);
+ fprintf (fptr, "FN:%s\n", vl->data);
}
- fprintProperty(tnef, fptr, PT_STRING8, PR_NICKNAME, "NICKNAME:%s\n");
- fprintUserProp(tnef, fptr, PT_STRING8, 0x8554, "MAILER:Microsoft Outlook %s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_SPOUSE_NAME, "X-EVOLUTION-SPOUSE:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_MANAGER_NAME, "X-EVOLUTION-MANAGER:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_ASSISTANT, "X-EVOLUTION-ASSISTANT:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_NICKNAME, "NICKNAME:%s\n");
+ fprintUserProp (tnef, fptr, PT_STRING8, 0x8554, "MAILER:Microsoft Outlook %s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_SPOUSE_NAME, "X-EVOLUTION-SPOUSE:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_MANAGER_NAME, "X-EVOLUTION-MANAGER:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_ASSISTANT, "X-EVOLUTION-ASSISTANT:%s\n");
/* Organizational */
if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) != MAPI_UNDEFINED) {
if (vl->size > 0) {
if ((vl->size == 1) && (vl->data[0] == 0)) {
} else {
- fprintf(fptr,"ORG:%s", vl->data);
+ fprintf (fptr,"ORG:%s", vl->data);
if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DEPARTMENT_NAME))) != MAPI_UNDEFINED) {
- fprintf(fptr,";%s", vl->data);
+ fprintf (fptr,";%s", vl->data);
}
- fprintf(fptr, "\n");
+ fprintf (fptr, "\n");
}
}
}
- fprintProperty(tnef, fptr, PT_STRING8, PR_OFFICE_LOCATION, "X-EVOLUTION-OFFICE:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_TITLE, "TITLE:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_PROFESSION, "ROLE:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_BODY, "NOTE:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_OFFICE_LOCATION, "X-EVOLUTION-OFFICE:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_TITLE, "TITLE:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_PROFESSION, "ROLE:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_BODY, "NOTE:%s\n");
if (tnef->body.size > 0) {
- fprintf(fptr, "NOTE;QUOTED-PRINTABLE:");
+ fprintf (fptr, "NOTE;QUOTED-PRINTABLE:");
quotedfprint (fptr, &(tnef->body));
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
}
/* Business Address */
@@ -588,35 +592,35 @@ saveVCard (TNEFStruct *tnef,
boolean = 1;
}
if (boolean == 1) {
- fprintf(fptr, "ADR;QUOTED-PRINTABLE;WORK:");
+ fprintf (fptr, "ADR;QUOTED-PRINTABLE;WORK:");
if (pobox != MAPI_UNDEFINED) {
quotedfprint (fptr, pobox);
}
- fprintf(fptr, ";;");
+ fprintf (fptr, ";;");
if (street != MAPI_UNDEFINED) {
quotedfprint (fptr, street);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (city != MAPI_UNDEFINED) {
quotedfprint (fptr, city);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (state != MAPI_UNDEFINED) {
quotedfprint (fptr, state);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (zip != MAPI_UNDEFINED) {
quotedfprint (fptr, zip);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (country != MAPI_UNDEFINED) {
quotedfprint (fptr, country);
}
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801b))) != MAPI_UNDEFINED) {
- fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
+ fprintf (fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
quotedfprint (fptr, vl);
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
}
}
@@ -641,35 +645,35 @@ saveVCard (TNEFStruct *tnef,
boolean = 1;
}
if (boolean == 1) {
- fprintf(fptr, "ADR;QUOTED-PRINTABLE;HOME:");
+ fprintf (fptr, "ADR;QUOTED-PRINTABLE;HOME:");
if (pobox != MAPI_UNDEFINED) {
quotedfprint (fptr, pobox);
}
- fprintf(fptr, ";;");
+ fprintf (fptr, ";;");
if (street != MAPI_UNDEFINED) {
quotedfprint (fptr, street);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (city != MAPI_UNDEFINED) {
quotedfprint (fptr, city);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (state != MAPI_UNDEFINED) {
quotedfprint (fptr, state);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (zip != MAPI_UNDEFINED) {
quotedfprint (fptr, zip);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (country != MAPI_UNDEFINED) {
quotedfprint (fptr, country);
}
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801a))) != MAPI_UNDEFINED) {
- fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
+ fprintf (fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
quotedfprint (fptr, vl);
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
}
}
@@ -694,52 +698,52 @@ saveVCard (TNEFStruct *tnef,
boolean = 1;
}
if (boolean == 1) {
- fprintf(fptr, "ADR;QUOTED-PRINTABLE;OTHER:");
+ fprintf (fptr, "ADR;QUOTED-PRINTABLE;OTHER:");
if (pobox != MAPI_UNDEFINED) {
quotedfprint (fptr, pobox);
}
- fprintf(fptr, ";;");
+ fprintf (fptr, ";;");
if (street != MAPI_UNDEFINED) {
quotedfprint (fptr, street);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (city != MAPI_UNDEFINED) {
quotedfprint (fptr, city);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (state != MAPI_UNDEFINED) {
quotedfprint (fptr, state);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (zip != MAPI_UNDEFINED) {
quotedfprint (fptr, zip);
}
- fprintf(fptr, ";");
+ fprintf (fptr, ";");
if (country != MAPI_UNDEFINED) {
quotedfprint (fptr, country);
}
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
}
- fprintProperty(tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_MOBILE_TELEPHONE_NUMBER, "TEL;CELL:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_RADIO_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-RADIO:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_CAR_TELEPHONE_NUMBER, "TEL;CAR:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_OTHER_TELEPHONE_NUMBER, "TEL;VOICE:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_PAGER_TELEPHONE_NUMBER, "TEL;PAGER:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_TELEX_NUMBER, "TEL;X-EVOLUTION-TELEX:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_ISDN_NUMBER, "TEL;ISDN:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_HOME2_TELEPHONE_NUMBER, "TEL;HOME:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_TTYTDD_PHONE_NUMBER, "TEL;X-EVOLUTION-TTYTDD:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_TELEPHONE_NUMBER, "TEL;HOME;VOICE:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_ASSISTANT_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-ASSISTANT:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_COMPANY_MAIN_PHONE_NUMBER, "TEL;WORK:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_TELEPHONE_NUMBER, "TEL;WORK:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS2_TELEPHONE_NUMBER, "TEL;WORK;VOICE:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_FAX_NUMBER, "TEL;PREF;FAX:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_FAX_NUMBER, "TEL;WORK;FAX:%s\n");
- fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_MOBILE_TELEPHONE_NUMBER, "TEL;CELL:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_RADIO_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-RADIO:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_CAR_TELEPHONE_NUMBER, "TEL;CAR:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_OTHER_TELEPHONE_NUMBER, "TEL;VOICE:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_PAGER_TELEPHONE_NUMBER, "TEL;PAGER:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_TELEX_NUMBER, "TEL;X-EVOLUTION-TELEX:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_ISDN_NUMBER, "TEL;ISDN:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_HOME2_TELEPHONE_NUMBER, "TEL;HOME:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_TTYTDD_PHONE_NUMBER, "TEL;X-EVOLUTION-TTYTDD:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_HOME_TELEPHONE_NUMBER, "TEL;HOME;VOICE:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_ASSISTANT_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-ASSISTANT:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_COMPANY_MAIN_PHONE_NUMBER, "TEL;WORK:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_BUSINESS_TELEPHONE_NUMBER, "TEL;WORK:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_BUSINESS2_TELEPHONE_NUMBER, "TEL;WORK;VOICE:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_PRIMARY_FAX_NUMBER, "TEL;PREF;FAX:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_BUSINESS_FAX_NUMBER, "TEL;WORK;FAX:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n");
/* Email addresses */
if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8083))) == MAPI_UNDEFINED) {
@@ -747,40 +751,40 @@ saveVCard (TNEFStruct *tnef,
}
if (vl != MAPI_UNDEFINED) {
if (vl->size > 0)
- fprintf(fptr, "EMAIL:%s\n", vl->data);
+ fprintf (fptr, "EMAIL:%s\n", vl->data);
}
if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8093))) == MAPI_UNDEFINED) {
vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8094));
}
if (vl != MAPI_UNDEFINED) {
if (vl->size > 0)
- fprintf(fptr, "EMAIL:%s\n", vl->data);
+ fprintf (fptr, "EMAIL:%s\n", vl->data);
}
if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a3))) == MAPI_UNDEFINED) {
vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a4));
}
if (vl != MAPI_UNDEFINED) {
if (vl->size > 0)
- fprintf(fptr, "EMAIL:%s\n", vl->data);
+ fprintf (fptr, "EMAIL:%s\n", vl->data);
}
- fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n");
- fprintUserProp(tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n");
+ fprintProperty (tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n");
+ fprintUserProp (tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n");
/* Birthday */
if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) {
- fprintf(fptr, "BDAY:");
+ fprintf (fptr, "BDAY:");
MAPISysTimetoDTR ((guchar *) vl->data, &thedate);
- fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
+ fprintf (fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
}
/* Anniversary */
if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_WEDDING_ANNIVERSARY))) != MAPI_UNDEFINED) {
- fprintf(fptr, "X-EVOLUTION-ANNIVERSARY:");
+ fprintf (fptr, "X-EVOLUTION-ANNIVERSARY:");
MAPISysTimetoDTR ((guchar *) vl->data, &thedate);
- fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
+ fprintf (fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
}
- fprintf(fptr, "END:VCARD\n");
+ fprintf (fptr, "END:VCARD\n");
fclose (fptr);
}
g_free (ifilename);
@@ -866,25 +870,25 @@ gchar * getRruleDayname (guchar a) {
*daystring = 0;
if (a & 0x01) {
- strcat(daystring, "SU,");
+ strcat (daystring, "SU,");
}
if (a & 0x02) {
- strcat(daystring, "MO,");
+ strcat (daystring, "MO,");
}
if (a & 0x04) {
- strcat(daystring, "TU,");
+ strcat (daystring, "TU,");
}
if (a & 0x08) {
- strcat(daystring, "WE,");
+ strcat (daystring, "WE,");
}
if (a & 0x10) {
- strcat(daystring, "TH,");
+ strcat (daystring, "TH,");
}
if (a & 0x20) {
- strcat(daystring, "FR,");
+ strcat (daystring, "FR,");
}
if (a & 0x40) {
- strcat(daystring, "SA,");
+ strcat (daystring, "SA,");
}
if (strlen (daystring)) {
@@ -902,70 +906,76 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef)
return;
}
- fprintf(fptr, "RRULE:FREQ=");
+ fprintf (fptr, "RRULE:FREQ=");
if (recur_data[0x04] == 0x0A) {
- fprintf(fptr, "DAILY");
+ fprintf (fptr, "DAILY");
if (recur_data[0x16] == 0x23 || recur_data[0x16] == 0x22 ||
recur_data[0x16] == 0x21) {
if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
PROP_TAG (PT_I2, 0x0011))) != MAPI_UNDEFINED) {
- fprintf(fptr, ";INTERVAL=%d", *(filename->data));
+ fprintf (fptr, ";INTERVAL=%d", *(filename->data));
}
if (recur_data[0x16] == 0x22 || recur_data[0x16] == 0x21) {
- fprintf(fptr, ";COUNT=%d",
- getRruleCount (recur_data[0x1B], recur_data[0x1A]));
+ fprintf (
+ fptr, ";COUNT=%d",
+ getRruleCount (recur_data[0x1B], recur_data[0x1A]));
}
} else if (recur_data[0x16] == 0x3E) {
- fprintf(fptr, ";BYDAY=MO,TU,WE,TH,FR");
+ fprintf (fptr, ";BYDAY=MO,TU,WE,TH,FR");
if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
- fprintf(fptr, ";COUNT=%d",
- getRruleCount (recur_data[0x1F], recur_data[0x1E]));
+ fprintf (
+ fptr, ";COUNT=%d",
+ getRruleCount (recur_data[0x1F], recur_data[0x1E]));
}
}
} else if (recur_data[0x04] == 0x0B) {
- fprintf(fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s",
- recur_data[0x0E], getRruleDayname (recur_data[0x16]));
+ fprintf (
+ fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s",
+ recur_data[0x0E], getRruleDayname (recur_data[0x16]));
if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
- fprintf(fptr, ";COUNT=%d",
+ fprintf (fptr, ";COUNT=%d",
getRruleCount (recur_data[0x1F], recur_data[0x1E]));
}
} else if (recur_data[0x04] == 0x0C) {
- fprintf(fptr, "MONTHLY");
+ fprintf (fptr, "MONTHLY");
if (recur_data[0x06] == 0x02) {
- fprintf(fptr, ";INTERVAL=%d;BYMONTHDAY=%d", recur_data[0x0E],
+ fprintf (fptr, ";INTERVAL=%d;BYMONTHDAY=%d", recur_data[0x0E],
recur_data[0x16]);
if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
- fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x1F],
- recur_data[0x1E]));
+ fprintf (
+ fptr, ";COUNT=%d", getRruleCount (recur_data[0x1F],
+ recur_data[0x1E]));
}
} else if (recur_data[0x06] == 0x03) {
- fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d",
+ fprintf (fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d",
getRruleDayname (recur_data[0x16]),
recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A],
recur_data[0x0E]);
if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) {
- fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23],
- recur_data[0x22]));
+ fprintf (
+ fptr, ";COUNT=%d", getRruleCount (recur_data[0x23],
+ recur_data[0x22]));
}
}
} else if (recur_data[0x04] == 0x0D) {
- fprintf(fptr, "YEARLY;BYMONTH=%d",
+ fprintf (
+ fptr, "YEARLY;BYMONTH=%d",
getRruleMonthNum (recur_data[0x0A], recur_data[0x0B]));
if (recur_data[0x06] == 0x02) {
- fprintf(fptr, ";BYMONTHDAY=%d", recur_data[0x16]);
+ fprintf (fptr, ";BYMONTHDAY=%d", recur_data[0x16]);
} else if (recur_data[0x06] == 0x03) {
- fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d",
+ fprintf (fptr, ";BYDAY=%s;BYSETPOS=%d",
getRruleDayname (recur_data[0x16]),
recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A]);
}
if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) {
- fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23],
+ fprintf (fptr, ";COUNT=%d", getRruleCount (recur_data[0x23],
recur_data[0x22]));
}
}
- fprintf(fptr, "\n");
+ fprintf (fptr, "\n");
}
void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
@@ -978,12 +988,12 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
dtr thedate;
ifilename = g_build_filename (tmpdir, "calendar.vcf", NULL);
- printf("%s\n", ifilename);
+ printf ("%s\n", ifilename);
- if ((fptr = fopen(ifilename, "wb"))==NULL) {
- printf("Error writing file to disk!");
+ if ((fptr = fopen (ifilename, "wb")) == NULL) {
+ printf ("Error writing file to disk!");
} else {
- fprintf(fptr, "BEGIN:VCALENDAR\n");
+ fprintf (fptr, "BEGIN:VCALENDAR\n");
if (tnef->messageClass[0] != 0) {
charptr2 = tnef->messageClass;
charptr = charptr2;
@@ -993,16 +1003,16 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
}
charptr++;
}
- if (strcmp(charptr2, ".MtgCncl") == 0) {
- fprintf(fptr, "METHOD:CANCEL\n");
+ if (strcmp (charptr2, ".MtgCncl") == 0) {
+ fprintf (fptr, "METHOD:CANCEL\n");
} else {
- fprintf(fptr, "METHOD:REQUEST\n");
+ fprintf (fptr, "METHOD:REQUEST\n");
}
} else {
- fprintf(fptr, "METHOD:REQUEST\n");
+ fprintf (fptr, "METHOD:REQUEST\n");
}
- fprintf(fptr, "VERSION:2.0\n");
- fprintf(fptr, "BEGIN:VEVENT\n");
+ fprintf (fptr, "VERSION:2.0\n");
+ fprintf (fptr, "BEGIN:VEVENT\n");
/* UID
* After alot of comparisons, I'm reasonably sure this is totally
@@ -1020,11 +1030,11 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
}
}
if (filename != NULL) {
- fprintf(fptr, "UID:");
+ fprintf (fptr, "UID:");
for (index = 0; index < filename->size; index++) {
- fprintf(fptr,"%02X", (guchar)filename->data[index]);
+ fprintf (fptr,"%02X", (guchar) filename->data[index]);
}
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
}
/* Sequence */
@@ -1032,18 +1042,18 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
PROP_TAG (PT_LONG, 0x8201))) != MAPI_UNDEFINED) {
dword_ptr = (DWORD *) filename->data;
- fprintf(fptr, "SEQUENCE:%i\n", (gint) *dword_ptr);
+ fprintf (fptr, "SEQUENCE:%i\n", (gint) *dword_ptr);
}
if ((filename = MAPIFindProperty (&(tnef->MapiProperties),
PROP_TAG (PT_BINARY, PR_SENDER_SEARCH_KEY)))
!= MAPI_UNDEFINED) {
charptr = filename->data;
- charptr2 = strstr(charptr, ":");
+ charptr2 = strstr (charptr, ":");
if (charptr2 == NULL)
charptr2 = charptr;
else
charptr2++;
- fprintf(fptr, "ORGANIZER;CN=\"%s\":MAILTO:%s\n",
+ fprintf (fptr, "ORGANIZER;CN=\"%s\":MAILTO:%s\n",
charptr2, charptr2);
}
@@ -1056,15 +1066,15 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
charptr = filename->data - 1;
while (charptr != NULL) {
charptr++;
- charptr2 = strstr(charptr, ";");
+ charptr2 = strstr (charptr, ";");
if (charptr2 != NULL) {
*charptr2 = 0;
}
while (*charptr == ' ')
charptr++;
- fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
- fprintf(fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
- fprintf(fptr, "CN=\"%s\":MAILTO:%s\n",
+ fprintf (fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
+ fprintf (fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
+ fprintf (fptr, "CN=\"%s\":MAILTO:%s\n",
charptr, charptr);
charptr = charptr2;
}
@@ -1077,15 +1087,15 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
charptr = filename->data - 1;
while (charptr != NULL) {
charptr++;
- charptr2 = strstr(charptr, ";");
+ charptr2 = strstr (charptr, ";");
if (charptr2 != NULL) {
*charptr2 = 0;
}
while (*charptr == ' ')
charptr++;
- fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
- fprintf(fptr, "ROLE=OPT-PARTICIPANT;RSVP=TRUE;");
- fprintf(fptr, "CN=\"%s\":MAILTO:%s\n",
+ fprintf (fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
+ fprintf (fptr, "ROLE=OPT-PARTICIPANT;RSVP=TRUE;");
+ fprintf (fptr, "CN=\"%s\":MAILTO:%s\n",
charptr, charptr);
charptr = charptr2;
}
@@ -1097,15 +1107,15 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
charptr = filename->data - 1;
while (charptr != NULL) {
charptr++;
- charptr2 = strstr(charptr, ";");
+ charptr2 = strstr (charptr, ";");
if (charptr2 != NULL) {
*charptr2 = 0;
}
while (*charptr == ' ')
charptr++;
- fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
- fprintf(fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
- fprintf(fptr, "CN=\"%s\":MAILTO:%s\n",
+ fprintf (fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
+ fprintf (fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
+ fprintf (fptr, "CN=\"%s\":MAILTO:%s\n",
charptr, charptr);
charptr = charptr2;
}
@@ -1117,9 +1127,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
if ((filename = MAPIFindProperty (&(tnef->MapiProperties),
PROP_TAG (PT_STRING8, PR_CONVERSATION_TOPIC)))
!= MAPI_UNDEFINED) {
- fprintf(fptr, "SUMMARY:");
+ fprintf (fptr, "SUMMARY:");
cstylefprint (fptr, filename);
- fprintf(fptr, "\n");
+ fprintf (fptr, "\n");
}
/* Description */
@@ -1128,7 +1138,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
!= MAPI_UNDEFINED) {
variableLength buf;
if ((buf.data = (gchar *) DecompressRTF (filename, &buf.size)) != NULL) {
- fprintf(fptr, "DESCRIPTION:");
+ fprintf (fptr, "DESCRIPTION:");
printRtf (fptr, &buf);
free (buf.data);
}
@@ -1145,7 +1155,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
}
}
if (filename != NULL) {
- fprintf(fptr,"LOCATION: %s\n", filename->data);
+ fprintf (fptr,"LOCATION: %s\n", filename->data);
}
/* Date Start */
filename = NULL;
@@ -1157,9 +1167,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
}
}
if (filename != NULL) {
- fprintf(fptr, "DTSTART:");
+ fprintf (fptr, "DTSTART:");
MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
- fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+ fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
thedate.wYear, thedate.wMonth, thedate.wDay,
thedate.wHour, thedate.wMinute, thedate.wSecond);
}
@@ -1173,9 +1183,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
}
}
if (filename != NULL) {
- fprintf(fptr, "DTEND:");
+ fprintf (fptr, "DTEND:");
MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
- fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+ fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
thedate.wYear, thedate.wMonth, thedate.wDay,
thedate.wHour, thedate.wMinute, thedate.wSecond);
}
@@ -1183,9 +1193,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
filename = NULL;
if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
PROP_TAG (PT_SYSTIME, 0x8202))) != MAPI_UNDEFINED) {
- fprintf(fptr, "CREATED:");
+ fprintf (fptr, "CREATED:");
MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
- fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+ fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
thedate.wYear, thedate.wMonth, thedate.wDay,
thedate.wHour, thedate.wMinute, thedate.wSecond);
}
@@ -1194,11 +1204,11 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
PROP_TAG (PT_BOOLEAN, 0x8506))) != MAPI_UNDEFINED) {
dword_ptr = (DWORD *) filename->data;
- fprintf(fptr, "CLASS:" );
+ fprintf (fptr, "CLASS:" );
if (*dword_ptr == 1) {
- fprintf(fptr,"PRIVATE\n");
+ fprintf (fptr,"PRIVATE\n");
} else {
- fprintf(fptr,"PUBLIC\n");
+ fprintf (fptr,"PUBLIC\n");
}
}
/* Recurrence */
@@ -1209,8 +1219,8 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
}
/* Wrap it up */
- fprintf(fptr, "END:VEVENT\n");
- fprintf(fptr, "END:VCALENDAR\n");
+ fprintf (fptr, "END:VEVENT\n");
+ fprintf (fptr, "END:VCALENDAR\n");
fclose (fptr);
}
g_free (ifilename);
@@ -1245,24 +1255,24 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
g_free (file);
g_free (absfilename);
- printf("%s\n", ifilename);
+ printf ("%s\n", ifilename);
- if ((fptr = fopen(ifilename, "wb"))==NULL) {
- printf("Error writing file to disk!");
+ if ((fptr = fopen (ifilename, "wb")) == NULL) {
+ printf ("Error writing file to disk!");
} else {
- fprintf(fptr, "BEGIN:VCALENDAR\n");
- fprintf(fptr, "VERSION:2.0\n");
- fprintf(fptr, "METHOD:PUBLISH\n");
+ fprintf (fptr, "BEGIN:VCALENDAR\n");
+ fprintf (fptr, "VERSION:2.0\n");
+ fprintf (fptr, "METHOD:PUBLISH\n");
filename = NULL;
- fprintf(fptr, "BEGIN:VTODO\n");
+ fprintf (fptr, "BEGIN:VTODO\n");
if (tnef->messageID[0] != 0) {
- fprintf(fptr,"UID:%s\n", tnef->messageID);
+ fprintf (fptr,"UID:%s\n", tnef->messageID);
}
filename = MAPIFindUserProp (&(tnef->MapiProperties), \
PROP_TAG (PT_STRING8, 0x8122));
if (filename != MAPI_UNDEFINED) {
- fprintf(fptr, "ORGANIZER:%s\n", filename->data);
+ fprintf (fptr, "ORGANIZER:%s\n", filename->data);
}
if ((filename = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DISPLAY_TO))) != MAPI_UNDEFINED) {
@@ -1272,35 +1282,35 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
charptr = filename->data - 1;
while (charptr != NULL) {
charptr++;
- charptr2 = strstr(charptr, ";");
+ charptr2 = strstr (charptr, ";");
if (charptr2 != NULL) {
*charptr2 = 0;
}
while (*charptr == ' ')
charptr++;
- fprintf(fptr, "ATTENDEE;CN=%s;ROLE=REQ-PARTICIPANT:%s\n", charptr, charptr);
+ fprintf (fptr, "ATTENDEE;CN=%s;ROLE=REQ-PARTICIPANT:%s\n", charptr, charptr);
charptr = charptr2;
}
}
if (tnef->subject.size > 0) {
- fprintf(fptr,"SUMMARY:");
+ fprintf (fptr,"SUMMARY:");
cstylefprint (fptr,&(tnef->subject));
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
}
if (tnef->body.size > 0) {
- fprintf(fptr,"DESCRIPTION:");
+ fprintf (fptr,"DESCRIPTION:");
cstylefprint (fptr,&(tnef->body));
- fprintf(fptr,"\n");
+ fprintf (fptr,"\n");
}
filename = MAPIFindProperty (&(tnef->MapiProperties), \
PROP_TAG (PT_SYSTIME, PR_CREATION_TIME));
if (filename != MAPI_UNDEFINED) {
- fprintf(fptr, "DTSTAMP:");
+ fprintf (fptr, "DTSTAMP:");
MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
- fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+ fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
thedate.wYear, thedate.wMonth, thedate.wDay,
thedate.wHour, thedate.wMinute, thedate.wSecond);
}
@@ -1308,18 +1318,18 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
filename = MAPIFindUserProp (&(tnef->MapiProperties), \
PROP_TAG (PT_SYSTIME, 0x8517));
if (filename != MAPI_UNDEFINED) {
- fprintf(fptr, "DUE:");
+ fprintf (fptr, "DUE:");
MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
- fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+ fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
thedate.wYear, thedate.wMonth, thedate.wDay,
thedate.wHour, thedate.wMinute, thedate.wSecond);
}
filename = MAPIFindProperty (&(tnef->MapiProperties), \
PROP_TAG (PT_SYSTIME, PR_LAST_MODIFICATION_TIME));
if (filename != MAPI_UNDEFINED) {
- fprintf(fptr, "LAST-MODIFIED:");
+ fprintf (fptr, "LAST-MODIFIED:");
MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
- fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+ fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
thedate.wYear, thedate.wMonth, thedate.wDay,
thedate.wHour, thedate.wMinute, thedate.wSecond);
}
@@ -1328,15 +1338,15 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
PROP_TAG (PT_BOOLEAN, 0x8506));
if (filename != MAPI_UNDEFINED) {
dword_ptr = (DWORD *) filename->data;
- fprintf(fptr, "CLASS:" );
+ fprintf (fptr, "CLASS:" );
if (*dword_ptr == 1) {
- fprintf(fptr,"PRIVATE\n");
+ fprintf (fptr,"PRIVATE\n");
} else {
- fprintf(fptr,"PUBLIC\n");
+ fprintf (fptr,"PUBLIC\n");
}
}
- fprintf(fptr, "END:VTODO\n");
- fprintf(fptr, "END:VCALENDAR\n");
+ fprintf (fptr, "END:VTODO\n");
+ fprintf (fptr, "END:VCALENDAR\n");
fclose (fptr);
}
g_free (ifilename);
@@ -1371,10 +1381,10 @@ void quotedfprint (FILE *fptr, variableLength *vl) {
for (index = 0; index < vl->size - 1; index++) {
if (vl->data[index] == '\n') {
- fprintf(fptr, "=0A");
+ fprintf (fptr, "=0A");
} else if (vl->data[index] == '\r') {
} else {
- fprintf(fptr, "%c", vl->data[index]);
+ fprintf (fptr, "%c", vl->data[index]);
}
}
}
@@ -1384,17 +1394,17 @@ void cstylefprint (FILE *fptr, variableLength *vl) {
for (index = 0; index < vl->size - 1; index++) {
if (vl->data[index] == '\n') {
- fprintf(fptr, "\\n");
+ fprintf (fptr, "\\n");
} else if (vl->data[index] == '\r') {
/* Print nothing. */
} else if (vl->data[index] == ';') {
- fprintf(fptr, "\\;");
+ fprintf (fptr, "\\;");
} else if (vl->data[index] == ',') {
- fprintf(fptr, "\\,");
+ fprintf (fptr, "\\,");
} else if (vl->data[index] == '\\') {
- fprintf(fptr, "\\");
+ fprintf (fptr, "\\");
} else {
- fprintf(fptr, "%c", vl->data[index]);
+ fprintf (fptr, "%c", vl->data[index]);
}
}
}
@@ -1426,19 +1436,19 @@ void printRtf (FILE *fptr, variableLength *vl) {
}
if ((brace_ct == 1) && (key == 0)) {
if (*byte == '\n') {
- fprintf(fptr, "\\n");
+ fprintf (fptr, "\\n");
} else if (*byte == '\r') {
/* Print nothing. */
} else if (*byte == ';') {
- fprintf(fptr, "\\;");
+ fprintf (fptr, "\\;");
} else if (*byte == ',') {
- fprintf(fptr, "\\,");
+ fprintf (fptr, "\\,");
} else if (*byte == '\\') {
- fprintf(fptr, "\\");
+ fprintf (fptr, "\\");
} else {
- fprintf(fptr, "%c", *byte);
+ fprintf (fptr, "%c", *byte);
}
}
}
- fprintf(fptr, "\n");
+ fprintf (fptr, "\n");
}
diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index 0daa6d7..9bd4785 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -60,7 +60,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
E_TYPE_MAIL_FORMATTER_EXTENSION,
e_mail_formatter_formatter_extension_interface_init));
-static const gchar* formatter_mime_types[] = { "text/vcard", "text/x-vcard",
+static const gchar * formatter_mime_types[] = { "text/vcard", "text/x-vcard",
"text/directory", NULL };
static gboolean
@@ -152,8 +152,8 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension,
"<iframe width=\"100%%\" height=\"auto\" frameborder=\"0\""
"src=\"%s\" name=\"%s\"></iframe>"
"</div>",
- part->id, access_key, html_label,
- uri, part->id);
+ part->id, access_key, html_label,
+ uri, part->id);
camel_stream_write_string (stream, str, cancellable, NULL);
g_free (str);
g_free (html_label);
diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c
index e0efd87..319775b 100644
--- a/modules/vcard-inline/e-mail-parser-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c
@@ -72,7 +72,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
E_TYPE_MAIL_PARSER_EXTENSION,
e_mail_parser_parser_extension_interface_init));
-static const gchar* parser_mime_types[] = { "text/vcard", "text/x-vcard",
+static const gchar * parser_mime_types[] = { "text/vcard", "text/x-vcard",
"text/directory", NULL };
static void
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 5f34941..0079014 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -176,7 +176,7 @@ get_next_word (GByteArray *msg_text,
*from = (*from) + 1;
}
} else if (new_line && *from + 3 < msg_text->len &&
- strncmp ((const gchar *) (msg_text->data + (*from)), "-- \n", 4) == 0) {
+ strncmp ((const gchar *) (msg_text->data + (*from)), "-- \n", 4) == 0) {
/* signature delimiter finishes message text */
*from = msg_text->len;
return FALSE;
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index c78bdca..e0d3ca3 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -93,7 +93,7 @@ e_plugin_lib_enable (EPlugin *ep,
if (enable) {
gint interval;
- d(fprintf (stderr, "BBDB spinning up...\n"));
+ d (fprintf (stderr, "BBDB spinning up...\n"));
g_idle_add (bbdb_timeout, ep);
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 9d01ccd..9935278 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -125,7 +125,7 @@ bbdb_sync_buddy_list_check (void)
/* Reprocess the buddy list if it's been updated. */
last_sync_str = g_settings_get_string (settings, CONF_KEY_GAIM_LAST_SYNC_TIME);
- if (last_sync_str == NULL || !strcmp ((const gchar *)last_sync_str, ""))
+ if (last_sync_str == NULL || !strcmp ((const gchar *) last_sync_str, ""))
last_sync_time = (time_t) 0;
else
last_sync_time = (time_t) g_ascii_strtoull (last_sync_str, NULL, 10);
@@ -462,7 +462,7 @@ get_all_blocked (xmlNodePtr node,
if (child->children)
get_all_blocked (child, blocked);
- if (!strcmp ((const gchar *)child->name, "block")) {
+ if (!strcmp ((const gchar *) child->name, "block")) {
gchar *name = get_node_text (child);
if (name)
@@ -490,14 +490,14 @@ bbdb_get_gaim_buddy_list (void)
}
root = xmlDocGetRootElement (buddy_xml);
- if (strcmp ((const gchar *)root->name, "purple")) {
+ if (strcmp ((const gchar *) root->name, "purple")) {
fprintf (stderr, "bbdb: Could not parse Pidgin buddy list.\n");
xmlFreeDoc (buddy_xml);
return NULL;
}
for (child = root->children; child != NULL; child = child->next) {
- if (!strcmp ((const gchar *)child->name, "privacy")) {
+ if (!strcmp ((const gchar *) child->name, "privacy")) {
get_all_blocked (child, &blocked);
break;
}
@@ -505,7 +505,7 @@ bbdb_get_gaim_buddy_list (void)
blist = NULL;
for (child = root->children; child != NULL; child = child->next) {
- if (!strcmp ((const gchar *)child->name, "blist")) {
+ if (!strcmp ((const gchar *) child->name, "blist")) {
blist = child;
break;
}
@@ -519,7 +519,7 @@ bbdb_get_gaim_buddy_list (void)
}
for (child = blist->children; child != NULL; child = child->next) {
- if (!strcmp ((const gchar *)child->name, "group"))
+ if (!strcmp ((const gchar *) child->name, "group"))
parse_buddy_group (child, &buddies, blocked);
}
@@ -555,7 +555,7 @@ static gchar *
get_node_text (xmlNodePtr node)
{
if (node->children == NULL || node->children->content == NULL ||
- strcmp ((gchar *)node->children->name, "text"))
+ strcmp ((gchar *) node->children->name, "text"))
return NULL;
return g_strdup ((gchar *) node->children->content);
@@ -589,7 +589,7 @@ parse_contact (xmlNodePtr contact,
gboolean is_blocked = FALSE;
for (child = contact->children; child != NULL; child = child->next) {
- if (!strcmp ((const gchar *)child->name, "buddy")) {
+ if (!strcmp ((const gchar *) child->name, "buddy")) {
buddy = child;
break;
}
@@ -607,22 +607,22 @@ parse_contact (xmlNodePtr contact,
gb->proto = e_xml_get_string_prop_by_name (buddy, (const guchar *)"proto");
for (child = buddy->children; child != NULL && !is_blocked; child = child->next) {
- if (!strcmp ((const gchar *)child->name, "setting")) {
+ if (!strcmp ((const gchar *) child->name, "setting")) {
gchar *setting_type;
setting_type = e_xml_get_string_prop_by_name (
child, (const guchar *)"name");
- if (!strcmp ((const gchar *)setting_type, "buddy_icon"))
+ if (!strcmp ((const gchar *) setting_type, "buddy_icon"))
gb->icon = get_buddy_icon_from_setting (child);
g_free (setting_type);
- } else if (!strcmp ((const gchar *)child->name, "name")) {
+ } else if (!strcmp ((const gchar *) child->name, "name")) {
gb->account_name = get_node_text (child);
is_blocked = g_slist_find_custom (
blocked, gb->account_name,
(GCompareFunc) strcmp) != NULL;
- } else if (!strcmp ((const gchar *)child->name, "alias"))
+ } else if (!strcmp ((const gchar *) child->name, "alias"))
gb->alias = get_node_text (child);
}
@@ -641,7 +641,7 @@ parse_buddy_group (xmlNodePtr group,
xmlNodePtr child;
for (child = group->children; child != NULL; child = child->next) {
- if (strcmp ((const gchar *)child->name, "contact"))
+ if (strcmp ((const gchar *) child->name, "contact"))
continue;
parse_contact (child, buddies, blocked);
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c
index 02f5f63..14799fb 100644
--- a/plugins/dbx-import/dbx-importer.c
+++ b/plugins/dbx-import/dbx-importer.c
@@ -172,9 +172,9 @@ org_gnome_evolution_readdbx_supported (EPlugin *epl,
if (!memcmp (signature, oe56_mbox_sig, sizeof (oe56_mbox_sig))) {
ret = TRUE;
} else if (!memcmp (signature, oe56_flist_sig, sizeof (oe56_flist_sig))) {
- d(printf("Found DBX folder list file\n"));
+ d (printf ("Found DBX folder list file\n"));
} else if (!memcmp (signature, oe4_mbox_sig, sizeof (oe4_mbox_sig))) {
- d(printf("Found OE4 DBX file\n"));
+ d (printf ("Found OE4 DBX file\n"));
}
}
close (fd);
@@ -339,7 +339,7 @@ static gboolean dbx_load_index_table (DbxImporter *m, guint32 pos, guint32 *inde
struct _dbx_indexstruct index;
gint i;
- d(printf("Loading index table at 0x%x\n", pos));
+ d (printf ("Loading index table at 0x%x\n", pos));
if (dbx_pread (m->dbx_fd, &tindex, sizeof (tindex), pos) != sizeof (tindex)) {
g_set_error (
@@ -359,7 +359,7 @@ static gboolean dbx_load_index_table (DbxImporter *m, guint32 pos, guint32 *inde
return FALSE;
}
- d(printf("Index at %x: indexCount %x, anotherTablePtr %x\n",
+ d (printf ("Index at %x: indexCount %x, anotherTablePtr %x\n",
pos, tindex.indexCount, tindex.anotherTablePtr));
if (tindex.indexCount > 0) {
@@ -367,7 +367,7 @@ static gboolean dbx_load_index_table (DbxImporter *m, guint32 pos, guint32 *inde
return FALSE;
}
- d(printf("Index at %x has ptrCount %d\n", pos, tindex.ptrCount));
+ d (printf ("Index at %x has ptrCount %d\n", pos, tindex.ptrCount));
pos += sizeof (tindex);
@@ -424,12 +424,12 @@ static gboolean dbx_load_indices (DbxImporter *m)
m->index_count = itemcount = GUINT32_FROM_LE (itemcount);
m->indices = g_malloc (itemcount * 4);
- d(printf("indexptr %x, itemcount %d\n", indexptr, itemcount));
+ d (printf ("indexptr %x, itemcount %d\n", indexptr, itemcount));
if (indexptr && !dbx_load_index_table (m, indexptr, &index_ofs))
return FALSE;
- d(printf("Loaded %d of %d indices\n", index_ofs, m->index_count));
+ d (printf ("Loaded %d of %d indices\n", index_ofs, m->index_count));
if (index_ofs < m->index_count) {
g_set_error (
@@ -457,7 +457,7 @@ dbx_read_mail_body (DbxImporter *m,
lseek (bodyfd, 0, SEEK_SET);
while (offset) {
- d(printf("Reading mail data chunk from %x\n", offset));
+ d (printf ("Reading mail data chunk from %x\n", offset));
if (dbx_pread (m->dbx_fd, &hdr, sizeof (hdr), offset) != sizeof (hdr)) {
g_set_error (
@@ -557,23 +557,23 @@ dbx_read_email (DbxImporter *m,
switch (type) {
case 0x01:
*flags = buffer[hdr.count*4 + val];
- d(printf("Got type 0x01 flags %02x\n", *flags));
+ d (printf ("Got type 0x01 flags %02x\n", *flags));
break;
case 0x81:
*flags = val;
- d(printf("Got type 0x81 flags %02x\n", *flags));
+ d (printf ("Got type 0x81 flags %02x\n", *flags));
break;
case 0x04:
dataptr = GUINT32_FROM_LE (*(guint32 *)(buffer + hdr.count *4 + val));
- d(printf("Got type 0x04 data pointer %x\n", dataptr));
+ d (printf ("Got type 0x04 data pointer %x\n", dataptr));
break;
case 0x84:
dataptr = val;
- d(printf("Got type 0x84 data pointer %x\n", dataptr));
+ d (printf ("Got type 0x84 data pointer %x\n", dataptr));
break;
default:
/* We don't care about anything else */
- d(printf("Ignoring type %02x datum\n", type));
+ d (printf ("Ignoring type %02x datum\n", type));
break;
}
}
@@ -619,7 +619,7 @@ dbx_import_file (DbxImporter *m)
cancellable, &m->base.error);
if (!folder)
return;
- d(printf("importing to %s\n", camel_folder_get_full_name(folder)));
+ d (printf ("importing to %s\n", camel_folder_get_full_name (folder)));
camel_folder_freeze (folder);
@@ -638,7 +638,7 @@ dbx_import_file (DbxImporter *m)
if (!dbx_load_indices (m))
goto out;
- tmpfile = e_mkstemp("dbx-import-XXXXXX");
+ tmpfile = e_mkstemp ("dbx-import-XXXXXX");
if (tmpfile == -1) {
g_set_error (
&m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
@@ -658,7 +658,7 @@ dbx_import_file (DbxImporter *m)
camel_operation_progress (cancellable, 100 * i / m->index_count);
if (!dbx_read_email (m, m->indices[i], tmpfile, &dbx_flags)) {
- d(printf("Cannot read email index %d at %x\n",
+ d (printf ("Cannot read email index %d at %x\n",
i, m->indices[i]));
if (m->base.error != NULL)
goto out;
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index c683eb9..07d0f28 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -252,13 +252,13 @@ epech_load_from_settings (GSettings *settings,
memset (&temp_header_value_details, 0, sizeof (CustomSubHeader));
temp_header_details.sub_header_type_value = g_array_new (TRUE, TRUE, sizeof (CustomSubHeader));
parse_header_list = g_strsplit_set (headers[pos], "=;,", -1);
- temp_header_details.header_type_value = g_string_new("");
+ temp_header_details.header_type_value = g_string_new ("");
if (temp_header_details.header_type_value) {
g_string_assign (temp_header_details.header_type_value, parse_header_list[0]);
}
for (index = 0; parse_header_list[index + 1] ; ++index) {
- temp_header_value_details.sub_header_string_value = g_string_new("");
+ temp_header_value_details.sub_header_string_value = g_string_new ("");
if (temp_header_value_details.sub_header_string_value) {
g_string_assign (temp_header_value_details.sub_header_string_value, parse_header_list[index + 1]);
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 6b0d375..cac0a63 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -78,7 +78,7 @@ ee_editor_command_changed (GtkWidget *textbox)
GSettings *settings;
editor = gtk_entry_get_text (GTK_ENTRY (textbox));
- d(printf ("\n\aeditor is : [%s] \n\a", editor));
+ d (printf ("\n\aeditor is : [%s] \n\a", editor));
/* GSettings access for every key-press. Sucky ? */
settings = g_settings_new ("org.gnome.evolution.plugin.external-editor");
@@ -93,7 +93,7 @@ ee_editor_immediate_launch_changed (GtkWidget *checkbox)
GSettings *settings;
immediately = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
- d(printf ("\n\aimmediate launch is : [%d] \n\a", immediately));
+ d (printf ("\n\aimmediate launch is : [%d] \n\a", immediately));
settings = g_settings_new ("org.gnome.evolution.plugin.external-editor");
g_settings_set_boolean (settings, "launch-on-key-press", immediately);
@@ -264,7 +264,7 @@ async_external_editor (EMsgComposer *composer)
gsize length = 0;
close (fd);
- d(printf ("\n\aTemporary-file Name is : [%s] \n\a", filename));
+ d (printf ("\n\aTemporary-file Name is : [%s] \n\a", filename));
/* Push the text (if there is one) from the composer to the file */
content = gtkhtml_editor_get_text_plain (GTKHTML_EDITOR (composer), &length);
@@ -349,7 +349,7 @@ async_external_editor (EMsgComposer *composer)
#else
if (status) {
#endif
- d(printf ("\n\nsome problem here with external editor\n\n"));
+ d (printf ("\n\nsome problem here with external editor\n\n"));
g_idle_add ((GSourceFunc) enable_composer, composer);
return;
} else {
@@ -377,10 +377,10 @@ async_external_editor (EMsgComposer *composer)
static void launch_editor (GtkAction *action, EMsgComposer *composer)
{
- d(printf ("\n\nexternal_editor plugin is launched \n\n"));
+ d (printf ("\n\nexternal_editor plugin is launched \n\n"));
if (editor_running ()) {
- d(printf("not opening editor, because it's still running\n"));
+ d (printf ("not opening editor, because it's still running\n"));
return;
}
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 319e7b7..205bfff 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -1074,7 +1074,7 @@ pst_create_folder (PstImporter *m)
pos = dest + strlen (parent);
while (pos != NULL && pos < dest_end) {
- pos = g_strstr_len (pos+1, dest_end-pos, "/");
+ pos = g_strstr_len (pos + 1, dest_end - pos, "/");
if (pos != NULL) {
CamelFolder *folder;
@@ -1739,7 +1739,7 @@ set_cal_attachments (ECalClient *cal,
orig_filename = camel_mime_part_get_filename (part);
if (orig_filename == NULL) {
- g_warning("Ignoring unnamed attachment");
+ g_warning ("Ignoring unnamed attachment");
attach = attach->next;
continue; /* Ignore unnamed attachments */
}
@@ -1753,7 +1753,7 @@ set_cal_attachments (ECalClient *cal,
dirname = g_path_get_dirname (path);
if (g_mkdir_with_parents (dirname, 0777) == -1) {
- g_warning("Could not create directory %s: %s", dirname, g_strerror(errno));
+ g_warning ("Could not create directory %s: %s", dirname, g_strerror (errno));
g_free (dirname);
attach = attach->next;
continue;
@@ -1762,14 +1762,14 @@ set_cal_attachments (ECalClient *cal,
if (g_access (path, F_OK) == 0) {
if (g_access (path, W_OK) != 0) {
- g_warning("Could not write file %s - file exists", path);
+ g_warning ("Could not write file %s - file exists", path);
attach = attach->next;
continue;
}
}
if (g_stat (path, &st) != -1 && !S_ISREG (st.st_mode)) {
- g_warning("Could not write file %s - not a file", path);
+ g_warning ("Could not write file %s - not a file", path);
attach = attach->next;
continue;
}
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 30f3760..4193ae5 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -327,7 +327,7 @@ ask_password (GMountOperation *op,
username = soup_uri_get_user (soup_uri);
password = e_passwords_get_password (NULL, ms->uri->location);
req_pass = ((username && *username) && !(ms->uri->service_type == TYPE_ANON_FTP &&
- !strcmp (username, "anonymous"))) ? TRUE:FALSE;
+ !strcmp (username, "anonymous"))) ? TRUE : FALSE;
if (!password && req_pass) {
gboolean remember = FALSE;
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index 44217c0..465fff1 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -85,7 +85,7 @@ migrateURI (const gchar *xml,
for (p = root->children; p != NULL; p = p->next) {
xmlChar *uid = xmlGetProp (p, (const guchar *)"uid");
- if (strcmp ((gchar *)p->name, "source") == 0) {
+ if (strcmp ((gchar *) p->name, "source") == 0) {
events = g_slist_append (events, uid);
} else {
g_free (uid);
@@ -145,7 +145,7 @@ e_publish_uri_from_xml (const gchar *xml)
return NULL;
root = doc->children;
- if (strcmp ((gchar *)root->name, "uri") != 0)
+ if (strcmp ((gchar *) root->name, "uri") != 0)
return NULL;
if ((username = xmlGetProp (root, (const guchar *)"username"))) {
@@ -185,9 +185,9 @@ e_publish_uri_from_xml (const gchar *xml)
else if (uri->fb_duration_value > 100)
uri->fb_duration_value = 100;
- if (fb_duration_type && g_str_equal ((gchar *)fb_duration_type, "days"))
+ if (fb_duration_type && g_str_equal ((gchar *) fb_duration_type, "days"))
uri->fb_duration_type = FB_DURATION_DAYS;
- else if (fb_duration_type && g_str_equal ((gchar *)fb_duration_type, "months"))
+ else if (fb_duration_type && g_str_equal ((gchar *) fb_duration_type, "months"))
uri->fb_duration_type = FB_DURATION_MONTHS;
else
uri->fb_duration_type = FB_DURATION_WEEKS;
@@ -196,7 +196,7 @@ e_publish_uri_from_xml (const gchar *xml)
for (p = root->children; p != NULL; p = p->next) {
xmlChar *uid = xmlGetProp (p, (const guchar *)"uid");
- if (strcmp ((gchar *)p->name, "event") == 0) {
+ if (strcmp ((gchar *) p->name, "event") == 0) {
events = g_slist_append (events, uid);
} else {
g_free (uid);
@@ -234,15 +234,15 @@ e_publish_uri_to_xml (EPublishUri *uri)
enabled = g_strdup_printf ("%d", uri->enabled);
frequency = g_strdup_printf ("%d", uri->publish_frequency);
format = g_strdup_printf ("%d", uri->publish_format);
- xmlSetProp (root, (const guchar *)"location", (guchar *)uri->location);
- xmlSetProp (root, (const guchar *)"enabled", (guchar *)enabled);
- xmlSetProp (root, (const guchar *)"frequency", (guchar *)frequency);
- xmlSetProp (root, (const guchar *)"format", (guchar *)format);
- xmlSetProp (root, (const guchar *)"publish_time", (guchar *)uri->last_pub_time);
+ xmlSetProp (root, (const guchar *)"location", (guchar *) uri->location);
+ xmlSetProp (root, (const guchar *)"enabled", (guchar *) enabled);
+ xmlSetProp (root, (const guchar *)"frequency", (guchar *) frequency);
+ xmlSetProp (root, (const guchar *)"format", (guchar *) format);
+ xmlSetProp (root, (const guchar *)"publish_time", (guchar *) uri->last_pub_time);
g_free (format);
format = g_strdup_printf ("%d", uri->fb_duration_value);
- xmlSetProp (root, (xmlChar *)"fb_duration_value", (xmlChar *)format);
+ xmlSetProp (root, (xmlChar *)"fb_duration_value", (xmlChar *) format);
if (uri->fb_duration_type == FB_DURATION_DAYS)
xmlSetProp (root, (xmlChar *)"fb_duration_type", (xmlChar *)"days");
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index de59cd5..e5b2be3 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -348,11 +348,11 @@ do_save_calendar_csv (FormatHandler *handler,
config = g_new (CsvConfig, 1);
tmp = gtk_entry_get_text (GTK_ENTRY (d->delimiter_entry));
- config->delimiter = userstring_to_systemstring (tmp?tmp:", ");
+ config->delimiter = userstring_to_systemstring (tmp ? tmp:", ");
tmp = gtk_entry_get_text (GTK_ENTRY (d->newline_entry));
- config->newline = userstring_to_systemstring (tmp?tmp:"\\n");
+ config->newline = userstring_to_systemstring (tmp ? tmp:"\\n");
tmp = gtk_entry_get_text (GTK_ENTRY (d->quote_entry));
- config->quote = userstring_to_systemstring (tmp?tmp:"\"");
+ config->quote = userstring_to_systemstring (tmp ? tmp:"\"");
config->header = gtk_toggle_button_get_active (
GTK_TOGGLE_BUTTON (d->header_check));
@@ -570,9 +570,9 @@ create_options_widget (FormatHandler *handler)
_("Prepend a _header"));
/* Advanced CSV options */
- gtk_entry_set_text (GTK_ENTRY(d->delimiter_entry), ", ");
- gtk_entry_set_text (GTK_ENTRY(d->quote_entry), "\"");
- gtk_entry_set_text (GTK_ENTRY(d->newline_entry), "\\n");
+ gtk_entry_set_text (GTK_ENTRY (d->delimiter_entry), ", ");
+ gtk_entry_set_text (GTK_ENTRY (d->quote_entry), "\"");
+ gtk_entry_set_text (GTK_ENTRY (d->newline_entry), "\\n");
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 0c7d97c..c4326cc 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -150,7 +150,7 @@ add_time_to_rdf (xmlNodePtr node,
/* Not sure about this property */
timezone = calendar_config_get_timezone ();
tmp = g_strdup_printf ("http://www.w3.org/2002/12/cal/tzd/%s#tz";, timezone);
- xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (guchar *)tmp);
+ xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (guchar *) tmp);
g_free (tmp);
g_free (timezone);
g_free (str);
@@ -214,7 +214,7 @@ do_save_calendar_rdf (FormatHandler *handler,
GSList *iter;
xmlBufferPtr buffer = xmlBufferCreate ();
- xmlDocPtr doc = xmlNewDoc((xmlChar *) "1.0");
+ xmlDocPtr doc = xmlNewDoc ((xmlChar *) "1.0");
xmlNodePtr fnode;
doc->children = xmlNewDocNode (doc, NULL, (const guchar *)"rdf:RDF", NULL);
@@ -234,14 +234,14 @@ do_save_calendar_rdf (FormatHandler *handler,
xmlNewChild (fnode, NULL, (const guchar *)"calscale", (const guchar *)"GREGORIAN");
temp = calendar_config_get_timezone ();
- xmlNewChild (fnode, NULL, (const guchar *)"x-wr:timezone", (guchar *)temp);
+ xmlNewChild (fnode, NULL, (const guchar *)"x-wr:timezone", (guchar *) temp);
g_free (temp);
xmlNewChild (fnode, NULL, (const guchar *)"method", (const guchar *)"PUBLISH");
- xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *)e_source_get_uid (primary_source));
+ xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *) e_source_get_uid (primary_source));
- xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *)e_source_get_display_name (primary_source));
+ xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *) e_source_get_display_name (primary_source));
/* Version of this RDF-format */
xmlNewChild (fnode, NULL, (const guchar *)"version", (const guchar *)"2.0");
@@ -261,7 +261,7 @@ do_save_calendar_rdf (FormatHandler *handler,
/* Getting the stuff */
e_cal_component_get_uid (comp, &temp_constchar);
tmp_str = g_strdup_printf ("#%s", temp_constchar);
- xmlSetProp (node, (const guchar *)"about", (guchar *)tmp_str);
+ xmlSetProp (node, (const guchar *)"about", (guchar *) tmp_str);
g_free (tmp_str);
add_string_to_rdf (node, "uid",temp_constchar);
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index f218bce..75876f9 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -176,7 +176,7 @@ commit_changes (UIData *ui)
/* Check if the keyword and value are not empty */
if ((keyword) && (value) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)
&& (g_utf8_strlen (g_strstrip (value), -1) > 0)) {
- key = g_strdup_printf("%s=%s", keyword, value);
+ key = g_strdup_printf ("%s=%s", keyword, value);
g_variant_builder_add (&b, "s", key);
}
@@ -1118,9 +1118,9 @@ build_template_menus_recurse (CamelStore *local_store,
action = gtk_action_new (
action_name, action_label, NULL, NULL);
- g_object_set_data(G_OBJECT (action), "template-uid", (gpointer) uid);
+ g_object_set_data (G_OBJECT (action), "template-uid", (gpointer) uid);
- g_object_set_data(G_OBJECT (action), "template-folder", folder);
+ g_object_set_data (G_OBJECT (action), "template-folder", folder);
g_signal_connect (
action, "activate",
diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index e339a1f..4833ab5 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -61,7 +61,7 @@ e_shell_detect_meego (gboolean *is_meego,
*is_meego = *small_screen = FALSE;
- moblin_string = (guchar *)g_getenv ("EVO_MEEGO");
+ moblin_string = (guchar *) g_getenv ("EVO_MEEGO");
if (!moblin_string) {
GdkScreen *screen;
GdkDisplay *display;
@@ -82,8 +82,9 @@ e_shell_detect_meego (gboolean *is_meego,
if (!module)
return;
g_module_symbol (module, "XFree", (gpointer) &fns.XFree);
- g_module_symbol (module, "XGetWindowProperty",
- (gpointer) &fns.XGetWindowProperty);
+ g_module_symbol (
+ module, "XGetWindowProperty",
+ (gpointer) &fns.XGetWindowProperty);
if (!fns.XFree || !fns.XGetWindowProperty) {
fprintf (stderr, "defective X server\n");
goto exit;
@@ -127,12 +128,13 @@ e_shell_detect_meego (gboolean *is_meego,
/* use meego theming tweaks */
*is_meego = TRUE;
- props = g_strsplit ((gchar *)moblin_string, ":", -1);
+ props = g_strsplit ((gchar *) moblin_string, ":", -1);
for (i = 0; props && props[i]; i++) {
gchar **pair = g_strsplit (props[i], "=", 2);
- g_warning ("pair '%s'='%s'", pair ? pair[0] : "<null>",
- pair && pair[0] ? pair[1] : "<null>");
+ g_warning (
+ "pair '%s'='%s'", pair ? pair[0] : "<null>",
+ pair && pair[0] ? pair[1] : "<null>");
/* Hunt for session-type=small-screen */
if (pair && pair[0] && !g_ascii_strcasecmp (pair[0], "session-type"))
diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c
index a5952be..22ba9c8 100644
--- a/shell/e-shell-settings.c
+++ b/shell/e-shell-settings.c
@@ -58,10 +58,11 @@ shell_settings_value_equal (const GValue *v1,
if (G_VALUE_HOLDS_STRING (v1) &&
G_VALUE_HOLDS_STRING (v2)) {
- return g_strcmp0 (g_value_get_string (v1),
- g_value_get_string (v2)) == 0;
+ return g_strcmp0 (
+ g_value_get_string (v1),
+ g_value_get_string (v2)) == 0;
} else if (G_VALUE_HOLDS_UCHAR (v1) &&
- G_VALUE_HOLDS_UCHAR (v2)) {
+ G_VALUE_HOLDS_UCHAR (v2)) {
return g_value_get_uchar (v1) == g_value_get_uchar (v2);
} else if (G_VALUE_HOLDS_CHAR (v1) &&
G_VALUE_HOLDS_CHAR (v2)) {
@@ -96,8 +97,11 @@ shell_settings_value_equal (const GValue *v1,
}
if (is_debug)
- g_debug ("%s: Cannot compare '%s' with '%s'",
- G_STRFUNC, G_VALUE_TYPE_NAME (v1), G_VALUE_TYPE_NAME (v2));
+ g_debug (
+ "%s: Cannot compare '%s' with '%s'",
+ G_STRFUNC,
+ G_VALUE_TYPE_NAME (v1),
+ G_VALUE_TYPE_NAME (v2));
return FALSE;
}
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index a8e47d4..1e7e27b 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -904,7 +904,7 @@ e_shell_view_class_init (EShellViewClass *class)
"shell-content",
"Shell Content Widget",
"The content widget appears in "
- "a shell window's right pane",
+ "a shell window's right pane",
E_TYPE_SHELL_CONTENT,
G_PARAM_READABLE));
@@ -921,7 +921,7 @@ e_shell_view_class_init (EShellViewClass *class)
"shell-sidebar",
"Shell Sidebar Widget",
"The sidebar widget appears in "
- "a shell window's left pane",
+ "a shell window's left pane",
E_TYPE_SHELL_SIDEBAR,
G_PARAM_READABLE));
@@ -937,7 +937,7 @@ e_shell_view_class_init (EShellViewClass *class)
"shell-taskbar",
"Shell Taskbar Widget",
"The taskbar widget appears at "
- "the bottom of a shell window",
+ "the bottom of a shell window",
E_TYPE_SHELL_TASKBAR,
G_PARAM_READABLE));
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index bfc1ca9..247b381 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -655,7 +655,7 @@ action_about_cb (GtkAction *action,
"documenters", documenters,
"translator-credits", translator_credits,
"logo-icon-name", "evolution",
- "license-type", GTK_LICENSE_GPL_2_0,
+ "license-type", GTK_LICENSE_GPL_2_0,
NULL);
}
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index ede1400..8193b52 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -101,7 +101,8 @@ shell_window_toolbar_update_new_menu (EShellWindow *shell_window,
EShellView *shell_view;
EShellBackend *shell_backend;
- shell_view = e_shell_window_peek_shell_view (shell_window,
+ shell_view = e_shell_window_peek_shell_view (
+ shell_window,
e_shell_window_get_active_view (shell_window));
g_return_if_fail (shell_view != NULL);
@@ -130,7 +131,8 @@ shell_window_backend_prefer_item_changed_cb (EShellBackend *backend,
EShellView *shell_view;
EShellBackend *shell_backend;
- shell_view = e_shell_window_peek_shell_view (shell_window,
+ shell_view = e_shell_window_peek_shell_view (
+ shell_window,
e_shell_window_get_active_view (shell_window));
g_return_if_fail (shell_view != NULL);
@@ -138,7 +140,8 @@ shell_window_backend_prefer_item_changed_cb (EShellBackend *backend,
if (shell_backend != backend)
return;
- e_shell_window_set_toolbar_new_prefer_item (shell_window,
+ e_shell_window_set_toolbar_new_prefer_item (
+ shell_window,
e_shell_backend_get_prefer_new_item (shell_backend));
}
@@ -753,8 +756,9 @@ shell_window_realize (GtkWidget *widget)
EShellWindow *shell_window;
shell_window = E_SHELL_WINDOW (widget);
- e_shell_adapt_window_size (shell_window->priv->shell,
- GTK_WINDOW (widget));
+ e_shell_adapt_window_size (
+ shell_window->priv->shell,
+ GTK_WINDOW (widget));
/* Chain up to parent's dispose() method. */
GTK_WIDGET_CLASS (e_shell_window_parent_class)->realize (widget);
@@ -933,7 +937,7 @@ e_shell_window_class_init (EShellWindowClass *class)
"switcher-visible",
"Switcher Visible",
"Whether the shell window's "
- "switcher buttons are visible",
+ "switcher buttons are visible",
TRUE,
G_PARAM_READWRITE));
diff --git a/shell/es-event.c b/shell/es-event.c
index 3ca16f9..4dc3a5a 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -61,7 +61,7 @@ es_event_peek (void)
*
* This is the hook point which emits shell events.
*/
- e_event_construct(&es_event->event, "org.gnome.evolution.shell.events");
+ e_event_construct (&es_event->event, "org.gnome.evolution.shell.events");
}
return es_event;
diff --git a/shell/main.c b/shell/main.c
index 93b22b1..c954b82 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -182,20 +182,20 @@ show_development_warning (void)
/* xgettext:no-c-format */
/* Preview/Alpha/Beta version warning message */
_("Hi. Thanks for taking the time to download this preview release\n"
- "of the Evolution groupware suite.\n"
- "\n"
- "This version of Evolution is not yet complete. It is getting close,\n"
- "but some features are either unfinished or do not work properly.\n"
- "\n"
- "If you want a stable version of Evolution, we urge you to uninstall\n"
- "this version, and install version %s instead.\n"
- "\n"
- "If you find bugs, please report them to us at bugzilla.gnome.org.\n"
- "This product comes with no warranty and is not intended for\n"
- "individuals prone to violent fits of anger.\n"
- "\n"
- "We hope that you enjoy the results of our hard work, and we\n"
- "eagerly await your contributions!\n"),
+ "of the Evolution groupware suite.\n"
+ "\n"
+ "This version of Evolution is not yet complete. It is getting close,\n"
+ "but some features are either unfinished or do not work properly.\n"
+ "\n"
+ "If you want a stable version of Evolution, we urge you to uninstall\n"
+ "this version, and install version %s instead.\n"
+ "\n"
+ "If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+ "This product comes with no warranty and is not intended for\n"
+ "individuals prone to violent fits of anger.\n"
+ "\n"
+ "We hope that you enjoy the results of our hard work, and we\n"
+ "eagerly await your contributions!\n"),
STABLE_VERSION);
label = gtk_label_new (text);
g_free (text);
@@ -205,8 +205,7 @@ show_development_warning (void)
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
- label = gtk_label_new (_("Thanks\n"
- "The Evolution Team\n"));
+ label = gtk_label_new (_("Thanks\nThe Evolution Team\n"));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_misc_set_alignment (GTK_MISC (label), 1, .5);
@@ -558,8 +557,9 @@ main (gint argc,
* language, so don't bother with the localisations
* provided by other things then either. Reset thread
* locale to "en-US" and C library locale to "C". */
- SetThreadLocale (MAKELCID (MAKELANGID (LANG_ENGLISH, SUBLANG_ENGLISH_US),
- SORT_DEFAULT));
+ SetThreadLocale (
+ MAKELCID (MAKELANGID (LANG_ENGLISH, SUBLANG_ENGLISH_US),
+ SORT_DEFAULT));
setlocale (LC_ALL, "C");
}
#endif
@@ -567,14 +567,14 @@ main (gint argc,
if (start_online && start_offline) {
g_printerr (
_("%s: --online and --offline cannot be used "
- "together.\n Run '%s --help' for more "
- "information.\n"), argv[0], argv[0]);
+ "together.\n Run '%s --help' for more "
+ "information.\n"), argv[0], argv[0]);
exit (1);
} else if (force_online && start_offline) {
g_printerr (
_("%s: --force-online and --offline cannot be used "
- "together.\n Run '%s --help' for more "
- "information.\n"), argv[0], argv[0]);
+ "together.\n Run '%s --help' for more "
+ "information.\n"), argv[0], argv[0]);
exit (1);
}
diff --git a/smclient/eggsmclient-xsmp.c b/smclient/eggsmclient-xsmp.c
index dcaa574..087640c 100644
--- a/smclient/eggsmclient-xsmp.c
+++ b/smclient/eggsmclient-xsmp.c
@@ -851,7 +851,7 @@ save_state (EggSMClientXSMP *xsmp)
for (i = 0; i < restart->len; i++)
restart->pdata[i] = g_shell_quote (restart->pdata[i]);
g_ptr_array_add (restart, NULL);
- exec = g_strjoinv (" ", (gchar **)restart->pdata);
+ exec = g_strjoinv (" ", (gchar **) restart->pdata);
g_strfreev ((gchar **) restart->pdata);
g_ptr_array_free (restart, FALSE);
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index 5827d98..7037b26 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -62,7 +62,7 @@ catd_response (GtkWidget *w,
case GTK_RESPONSE_ACCEPT: {
GtkWidget *dialog = certificate_viewer_show (data->cert);
- g_signal_stop_emission_by_name(w, "response");
+ g_signal_stop_emission_by_name (w, "response");
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->dialog));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -103,8 +103,8 @@ ca_trust_dialog_show (ECert *cert,
ctd_data->email_checkbutton = e_builder_get_widget (ctd_data->builder, "email_trust_checkbutton");
ctd_data->objsign_checkbutton = e_builder_get_widget (ctd_data->builder, "objsign_trust_checkbutton");
- w = e_builder_get_widget(ctd_data->builder, "ca-trust-label");
- txt = g_strdup_printf(_("Certificate '%s' is a CA certificate.\n\nEdit trust settings:"), e_cert_get_cn(cert));
+ w = e_builder_get_widget (ctd_data->builder, "ca-trust-label");
+ txt = g_strdup_printf (_("Certificate '%s' is a CA certificate.\n\nEdit trust settings:"), e_cert_get_cn (cert));
gtk_label_set_text ((GtkLabel *) w, txt);
g_free (txt);
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index f18a28f..3a52b82 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -83,7 +83,7 @@ ctd_response (GtkWidget *w,
/* *icert is already declared earlier in this function? */
CERTCertificate *icert = e_cert_get_internal_cert (data->cacert);
- g_signal_stop_emission_by_name(w, "response");
+ g_signal_stop_emission_by_name (w, "response");
ca_trust_dialog_set_trust (dialog,
e_cert_trust_has_trusted_ca (icert->trust, TRUE, FALSE, FALSE),
@@ -125,10 +125,10 @@ cert_trust_dialog_show (ECert *cert)
ctd_data->dialog = e_builder_get_widget (ctd_data->builder, "cert-trust-dialog");
ctd_data->cert = g_object_ref (cert);
ctd_data->cacert = e_cert_get_ca_cert (cert);
- ctd_data->trust_button = e_builder_get_widget(ctd_data->builder, "cert-trust");
- ctd_data->notrust_button = e_builder_get_widget(ctd_data->builder, "cert-notrust");
+ ctd_data->trust_button = e_builder_get_widget (ctd_data->builder, "cert-trust");
+ ctd_data->notrust_button = e_builder_get_widget (ctd_data->builder, "cert-notrust");
- ctd_data->label = e_builder_get_widget(ctd_data->builder, "trust-label");
+ ctd_data->label = e_builder_get_widget (ctd_data->builder, "trust-label");
g_signal_connect (
ctd_data->dialog, "response",
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index f8a3a1b..3f8648f 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -89,7 +89,7 @@ static CertTreeColumn yourcerts_columns[] = {
{ G_TYPE_OBJECT, NULL, NULL, FALSE } /* Hidden column for ECert * object */
};
-static const gchar* yourcerts_mime_types[] = { "application/x-x509-user-cert", "application/x-pkcs12", NULL };
+static const gchar * yourcerts_mime_types[] = { "application/x-x509-user-cert", "application/x-pkcs12", NULL };
static CertTreeColumn contactcerts_columns[] = {
@@ -109,7 +109,7 @@ static CertTreeColumn contactcerts_columns[] = {
{ G_TYPE_OBJECT, NULL, NULL, FALSE }
};
-static const gchar* contactcerts_mime_types[] = { "application/x-x509-email-cert", "application/x-x509-ca-cert", NULL };
+static const gchar * contactcerts_mime_types[] = { "application/x-x509-email-cert", "application/x-x509-ca-cert", NULL };
static CertTreeColumn authoritycerts_columns[] = {
@@ -127,7 +127,7 @@ static CertTreeColumn authoritycerts_columns[] = {
{ G_TYPE_OBJECT, NULL, NULL, FALSE }
};
-static const gchar* authoritycerts_mime_types[] = { "application/x-x509-ca-cert", NULL };
+static const gchar * authoritycerts_mime_types[] = { "application/x-x509-ca-cert", NULL };
typedef struct {
GtkTreeView *treeview;
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 6691d1f..9273ae9 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -270,7 +270,7 @@ fill_in_details (CertificateViewerData *cvm_data,
GTK_TREE_MODEL (cvm_data->hierarchy_store));
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cvm_data->hierarchy_tree),
- -1, "Cert", gtk_cell_renderer_text_new(),
+ -1, "Cert", gtk_cell_renderer_text_new (),
"text", 0, NULL);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cvm_data->hierarchy_tree));
@@ -282,7 +282,7 @@ fill_in_details (CertificateViewerData *cvm_data,
cvm_data->fields_tree = e_builder_get_widget (cvm_data->builder, "cert-fields-treeview");
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cvm_data->fields_tree),
- -1, "Field", gtk_cell_renderer_text_new(),
+ -1, "Field", gtk_cell_renderer_text_new (),
"text", 0, NULL);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cvm_data->fields_tree));
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index a5135d2..71f3545 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -115,12 +115,12 @@ ecs_cert_changed (GtkWidget *w,
GtkTextBuffer *buffer;
GString *text;
- text = g_string_new("");
+ text = g_string_new ("");
node = ecs_find_current (ecs);
if (node) {
/* FIXME: add serial no, validity date, uses */
- g_string_append_printf(text, _("Issued to:\n Subject: %s\n"), node->cert->subjectName);
- g_string_append_printf(text, _("Issued by:\n Subject: %s\n"), node->cert->issuerName);
+ g_string_append_printf (text, _("Issued to:\n Subject: %s\n"), node->cert->subjectName);
+ g_string_append_printf (text, _("Issued by:\n Subject: %s\n"), node->cert->issuerName);
}
buffer = gtk_text_view_get_buffer ((GtkTextView *) p->description);
@@ -167,13 +167,13 @@ e_cert_selector_new (gint type,
builder = gtk_builder_new ();
e_load_ui_builder_definition (builder, "smime-ui.ui");
- p->combobox = e_builder_get_widget(builder, "cert_combobox");
- p->description = e_builder_get_widget(builder, "cert_description");
+ p->combobox = e_builder_get_widget (builder, "cert_combobox");
+ p->description = e_builder_get_widget (builder, "cert_description");
- w = e_builder_get_widget(builder, "cert_selector_vbox");
+ w = e_builder_get_widget (builder, "cert_selector_vbox");
content_area = gtk_dialog_get_content_area (GTK_DIALOG (ecs));
gtk_box_pack_start (GTK_BOX (content_area), w, TRUE, TRUE, 3);
- gtk_window_set_title(GTK_WINDOW(ecs), _("Select certificate"));
+ gtk_window_set_title (GTK_WINDOW (ecs), _("Select certificate"));
switch (type) {
case E_CERT_SELECTOR_SIGNER:
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index c9dc1ca..c74ac0a 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -495,7 +495,7 @@ install_loadable_roots (void)
};
for (i = 0; i < G_N_ELEMENTS (paths_to_check); i++) {
- gchar *dll_path = g_module_build_path (paths_to_check [i], "nssckbi");
+ gchar *dll_path = g_module_build_path (paths_to_check[i], "nssckbi");
if (g_file_test (dll_path, G_FILE_TEST_EXISTS)) {
PRInt32 modType;
@@ -503,7 +503,7 @@ install_loadable_roots (void)
/* Delete the existing module */
SECMOD_DeleteModule ("Mozilla Root Certs", &modType);
- SECMOD_AddNewModule("Mozilla Root Certs",dll_path, 0, 0);
+ SECMOD_AddNewModule ("Mozilla Root Certs",dll_path, 0, 0);
g_free (dll_path);
break;
}
@@ -937,7 +937,7 @@ handle_ca_cert_download (ECertDB *cert_db,
CERT_NewTempCertificate (certdb, &der, nsnull, PR_FALSE, PR_TRUE);
if (!tmpCert2) {
- NS_ASSERTION(0, "Couldn't create temp cert from DER blob\n");
+ NS_ASSERTION (0, "Couldn't create temp cert from DER blob\n");
continue; /* Let's try to import the rest of 'em */
}
nickname.Adopt (CERT_MakeCANickname (tmpCert2));
@@ -1163,14 +1163,14 @@ default_nickname (CERTCertificate *cert)
username = CERT_GetCommonName (&cert->subject);
if (username == NULL)
- username = PL_strdup("");
+ username = PL_strdup ("");
if (username == NULL)
goto loser;
caname = CERT_GetOrgName (&cert->issuer);
if (caname == NULL)
- caname = PL_strdup("");
+ caname = PL_strdup ("");
if (caname == NULL)
goto loser;
@@ -1190,7 +1190,7 @@ default_nickname (CERTCertificate *cert)
goto loser;
}
if (!PK11_IsInternal (slot)) {
- tmp = PR_smprintf("%s:%s", PK11_GetTokenName(slot), nickname);
+ tmp = PR_smprintf ("%s:%s", PK11_GetTokenName (slot), nickname);
PR_Free (nickname);
nickname = tmp;
tmp = NULL;
@@ -1198,7 +1198,7 @@ default_nickname (CERTCertificate *cert)
tmp = nickname;
while (1) {
if (count > 1) {
- nickname = PR_smprintf("%s #%d", tmp, count);
+ nickname = PR_smprintf ("%s #%d", tmp, count);
}
if (nickname == NULL)
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index c3d0b7e..7b06a80 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -198,7 +198,7 @@ e_cert_populate (ECert *cert)
exploded_tm.tm_mday = explodedTime.tm_mday;
exploded_tm.tm_mon = explodedTime.tm_month;
exploded_tm.tm_year = explodedTime.tm_year - 1900;
- e_utf8_strftime (buf, sizeof(buf), _("%d/%m/%Y"), &exploded_tm);
+ e_utf8_strftime (buf, sizeof (buf), _("%d/%m/%Y"), &exploded_tm);
cert->priv->issued_on_string = g_strdup (buf);
PR_ExplodeTime (
@@ -210,7 +210,7 @@ e_cert_populate (ECert *cert)
exploded_tm.tm_mday = explodedTime.tm_mday;
exploded_tm.tm_mon = explodedTime.tm_month;
exploded_tm.tm_year = explodedTime.tm_year - 1900;
- e_utf8_strftime (buf, sizeof(buf), _("%d/%m/%Y"), &exploded_tm);
+ e_utf8_strftime (buf, sizeof (buf), _("%d/%m/%Y"), &exploded_tm);
cert->priv->expires_on_string = g_strdup (buf);
}
@@ -396,13 +396,13 @@ e_cert_get_usage (ECert *cert)
{
if (cert->priv->usage_string == NULL) {
gint i;
- GString *str = g_string_new("");
+ GString *str = g_string_new ("");
CERTCertificate *icert = e_cert_get_internal_cert (cert);
for (i = 0; i < G_N_ELEMENTS (usageinfo); i++) {
if (icert->keyUsage & usageinfo[i].bit) {
if (str->len != 0)
- g_string_append(str, ", ");
+ g_string_append (str, ", ");
g_string_append (str, _(usageinfo[i].text));
}
}
@@ -561,7 +561,7 @@ get_default_oid_format (SECItem *oid,
gulong val = oid->data[0];
guint i = val % 40;
val /= 40;
- written = PR_snprintf(buf, 300, "%lu %u ", val, i);
+ written = PR_snprintf (buf, 300, "%lu %u ", val, i);
if (written < 0)
return FALSE;
len = written;
@@ -581,7 +581,7 @@ get_default_oid_format (SECItem *oid,
val = (val << 7) | (j & 0x7f);
if (j & 0x80)
continue;
- written = PR_snprintf(&buf[len], sizeof(buf)-len, "%lu ", val);
+ written = PR_snprintf (&buf[len], sizeof (buf) - len, "%lu ", val);
if (written < 0)
return FALSE;
@@ -690,7 +690,7 @@ process_raw_bytes (SECItem *data,
PRUint32 i;
gchar buffer[5];
for (i = 0; i < data->len; i++) {
- PR_snprintf(buffer, 5, "%02x ", data->data[i]);
+ PR_snprintf (buffer, 5, "%02x ", data->data[i]);
g_string_append (str, buffer);
if ((i + 1) % 16 == 0) {
g_string_append (str, "\n");
@@ -1097,11 +1097,11 @@ create_tbs_certificate_asn1_struct (ECert *cert,
#ifdef notyet
nsCOMPtr < nsIASN1Sequence> validitySequence = new nsNSSASN1Sequence ();
- nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertDumpValidity").get(),
+ nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpValidity").get (),
text);
validitySequence->SetDisplayName (text);
asn1Objects->AppendElement (validitySequence, PR_FALSE);
- nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertDumpNotBefore").get(),
+ nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpNotBefore").get (),
text);
nsCOMPtr < nsIX509CertValidity> validityData;
GetValidity (getter_AddRefs (validityData));
@@ -1114,7 +1114,7 @@ create_tbs_certificate_asn1_struct (ECert *cert,
if (NS_FAILED (rv))
return rv;
- nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertDumpNotAfter").get(),
+ nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpNotAfter").get (),
text);
rv = ProcessTime (notAfter, text.get (), validitySequence);
if (NS_FAILED (rv))
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 5445efe..a35dd57 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -444,7 +444,7 @@ zone_display_name_with_offset (icaltimezone *zone)
if (icaltimezone_get_builtin_timezone (display_name))
display_name = _(display_name);
- return g_strdup_printf("%s (%s)", display_name, buffer);
+ return g_strdup_printf ("%s (%s)", display_name, buffer);
}
static const gchar *
@@ -703,7 +703,7 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd,
gtk_label_set_text (GTK_LABEL (priv->preview_label),
zone ? display : "");
timezone_combo_set_active_text (GTK_COMBO_BOX (priv->timezone_combo),
- zone ? zone_display_name(zone) : "");
+ zone ? zone_display_name (zone) : "");
set_map_timezone (etd, zone);
g_free (display);
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index fb0d852..79d3104 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -358,7 +358,7 @@ gal_define_views_dialog_set_collection (GalDefineViewsDialog *dialog,
COL_GALVIEW_NAME, GTK_SORT_ASCENDING);
if (dialog->builder) {
- GtkWidget *widget = e_builder_get_widget(dialog->builder, "label-views");
+ GtkWidget *widget = e_builder_get_widget (dialog->builder, "label-views");
if (widget && GTK_IS_LABEL (widget)) {
if (collection->title) {
gchar *text = g_strdup_printf (_("Define Views for %s"),
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index bdfd970..3fc6d70 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -197,7 +197,7 @@ static gpointer
gdvm_initialize_value (ETableModel *etc,
gint col)
{
- return g_strdup("");
+ return g_strdup ("");
}
static gboolean
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index e05e153..662b928 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -101,7 +101,7 @@ gal_view_generate_string (GalViewCollection *collection,
if (which == 1)
ret_val = g_strdup (gal_view_get_title (view));
else
- ret_val = g_strdup_printf("%s_%d", gal_view_get_title(view), which);
+ ret_val = g_strdup_printf ("%s_%d", gal_view_get_title (view), which);
for (pointer = ret_val; *pointer; pointer = g_utf8_next_char (pointer)) {
if (!g_unichar_isalnum (g_utf8_get_char (pointer))) {
gchar *ptr = pointer;
@@ -363,10 +363,10 @@ load_single_file (GalViewCollection *collection,
item->ever_changed = local;
item->changed = FALSE;
item->built_in = !local;
- item->id = e_xml_get_string_prop_by_name(node, (const guchar *)"id");
- item->filename = e_xml_get_string_prop_by_name(node, (const guchar *)"filename");
- item->title = e_xml_get_translated_utf8_string_prop_by_name(node, (const guchar *)"title");
- item->type = e_xml_get_string_prop_by_name(node, (const guchar *)"type");
+ item->id = e_xml_get_string_prop_by_name (node, (const guchar *)"id");
+ item->filename = e_xml_get_string_prop_by_name (node, (const guchar *)"filename");
+ item->title = e_xml_get_translated_utf8_string_prop_by_name (node, (const guchar *)"title");
+ item->type = e_xml_get_string_prop_by_name (node, (const guchar *)"type");
item->collection = collection;
item->view_changed_id = 0;
@@ -392,7 +392,7 @@ load_single_dir (GalViewCollection *collection,
xmlDoc *doc = NULL;
xmlNode *root;
xmlNode *child;
- gchar *filename = g_build_filename(dir, "galview.xml", NULL);
+ gchar *filename = g_build_filename (dir, "galview.xml", NULL);
gchar *default_view;
if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
@@ -416,10 +416,10 @@ load_single_dir (GalViewCollection *collection,
gboolean found = FALSE;
gint i;
- if (!strcmp ((gchar *)child->name, "text"))
+ if (!strcmp ((gchar *) child->name, "text"))
continue;
- id = e_xml_get_string_prop_by_name(child, (const guchar *)"id");
+ id = e_xml_get_string_prop_by_name (child, (const guchar *)"id");
for (i = 0; i < collection->view_count; i++) {
if (!strcmp (id, collection->view_data[i]->id)) {
if (!local)
@@ -485,7 +485,7 @@ gal_view_collection_load (GalViewCollection *collection)
g_return_if_fail (!collection->loaded);
if ((g_mkdir_with_parents (collection->local_dir, 0777) == -1) && (errno != EEXIST))
- g_warning ("Unable to create dir %s: %s", collection->local_dir, g_strerror(errno));
+ g_warning ("Unable to create dir %s: %s", collection->local_dir, g_strerror (errno));
load_single_dir (collection, collection->local_dir, TRUE);
load_single_dir (collection, collection->system_dir, FALSE);
@@ -513,12 +513,12 @@ gal_view_collection_save (GalViewCollection *collection)
g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
g_return_if_fail (collection->local_dir != NULL);
- doc = xmlNewDoc((const guchar *)"1.0");
- root = xmlNewNode(NULL, (const guchar *)"GalViewCollection");
+ doc = xmlNewDoc ((const guchar *)"1.0");
+ root = xmlNewNode (NULL, (const guchar *)"GalViewCollection");
xmlDocSetRootElement (doc, root);
if (collection->default_view && !collection->default_view_built_in) {
- e_xml_set_string_prop_by_name(root, (const guchar *)"default-view", collection->default_view);
+ e_xml_set_string_prop_by_name (root, (const guchar *)"default-view", collection->default_view);
}
for (i = 0; i < collection->view_count; i++) {
@@ -527,11 +527,11 @@ gal_view_collection_save (GalViewCollection *collection)
item = collection->view_data[i];
if (item->ever_changed) {
- child = xmlNewChild(root, NULL, (const guchar *)"GalView", NULL);
- e_xml_set_string_prop_by_name(child, (const guchar *)"id", item->id);
- e_xml_set_string_prop_by_name(child, (const guchar *)"title", item->title);
- e_xml_set_string_prop_by_name(child, (const guchar *)"filename", item->filename);
- e_xml_set_string_prop_by_name(child, (const guchar *)"type", item->type);
+ child = xmlNewChild (root, NULL, (const guchar *)"GalView", NULL);
+ e_xml_set_string_prop_by_name (child, (const guchar *)"id", item->id);
+ e_xml_set_string_prop_by_name (child, (const guchar *)"title", item->title);
+ e_xml_set_string_prop_by_name (child, (const guchar *)"filename", item->filename);
+ e_xml_set_string_prop_by_name (child, (const guchar *)"type", item->type);
if (item->changed) {
filename = g_build_filename (collection->local_dir, item->filename, NULL);
@@ -546,14 +546,14 @@ gal_view_collection_save (GalViewCollection *collection)
item = collection->removed_view_data[i];
- child = xmlNewChild(root, NULL, (const guchar *)"GalView", NULL);
- e_xml_set_string_prop_by_name(child, (const guchar *)"id", item->id);
- e_xml_set_string_prop_by_name(child, (const guchar *)"title", item->title);
- e_xml_set_string_prop_by_name(child, (const guchar *)"type", item->type);
+ child = xmlNewChild (root, NULL, (const guchar *)"GalView", NULL);
+ e_xml_set_string_prop_by_name (child, (const guchar *)"id", item->id);
+ e_xml_set_string_prop_by_name (child, (const guchar *)"title", item->title);
+ e_xml_set_string_prop_by_name (child, (const guchar *)"type", item->type);
}
- filename = g_build_filename(collection->local_dir, "galview.xml", NULL);
+ filename = g_build_filename (collection->local_dir, "galview.xml", NULL);
if (e_xml_save_file (filename, doc) == -1)
- g_warning ("Unable to save view to %s - %s", filename, g_strerror(errno));
+ g_warning ("Unable to save view to %s - %s", filename, g_strerror (errno));
xmlFreeDoc (doc);
g_free (filename);
}
@@ -649,7 +649,7 @@ gal_view_collection_append (GalViewCollection *collection,
item->title = g_strdup (gal_view_get_title (view));
item->type = g_strdup (gal_view_get_type_code (view));
item->id = gal_view_generate_id (collection, view);
- item->filename = g_strdup_printf("%s.galview", item->id);
+ item->filename = g_strdup_printf ("%s.galview", item->id);
item->view = view;
item->collection = collection;
g_object_ref (view);
@@ -710,7 +710,7 @@ gal_view_collection_copy_view (GalViewCollection *collection,
item->title = g_strdup (gal_view_get_title (view));
item->type = g_strdup (gal_view_get_type_code (view));
item->id = gal_view_generate_id (collection, view);
- item->filename = g_strdup_printf("%s.galview", item->id);
+ item->filename = g_strdup_printf ("%s.galview", item->id);
item->view = gal_view_clone (view);
item->collection = collection;
@@ -743,7 +743,7 @@ gal_view_collection_append_with_title (GalViewCollection *collection,
gal_view_set_title (view, title);
- d(g_print("%s: %p\n", G_STRFUNC, view));
+ d (g_print ("%s: %p\n", G_STRFUNC, view));
item = g_new (GalViewCollectionItem, 1);
item->ever_changed = TRUE;
@@ -752,7 +752,7 @@ gal_view_collection_append_with_title (GalViewCollection *collection,
item->title = g_strdup (gal_view_get_title (view));
item->type = g_strdup (gal_view_get_type_code (view));
item->id = gal_view_generate_id (collection, view);
- item->filename = g_strdup_printf("%s.galview", item->id);
+ item->filename = g_strdup_printf ("%s.galview", item->id);
item->view = view;
item->collection = collection;
g_object_ref (view);
@@ -781,7 +781,7 @@ gal_view_collection_set_nth_view (GalViewCollection *collection,
g_return_val_if_fail (i >= 0, NULL);
g_return_val_if_fail (i < collection->view_count, NULL);
- d(g_print("%s: %p\n", G_STRFUNC, view));
+ d (g_print ("%s: %p\n", G_STRFUNC, view));
item = collection->view_data[i];
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index 2bb621b..e73b6fb 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -87,7 +87,7 @@ save_current_view (GalViewInstance *instance)
xmlDoc *doc;
xmlNode *root;
- doc = xmlNewDoc((const guchar *)"1.0");
+ doc = xmlNewDoc ((const guchar *)"1.0");
root = xmlNewNode (NULL, (const guchar *)"GalViewCurrentView");
xmlDocSetRootElement (doc, root);
@@ -97,7 +97,7 @@ save_current_view (GalViewInstance *instance)
e_xml_set_string_prop_by_name (root, (const guchar *)"current_view_type", instance->current_type);
if (e_xml_save_file (instance->current_view_filename, doc) == -1)
- g_warning ("Unable to save view to %s - %s", instance->current_view_filename, g_strerror(errno));
+ g_warning ("Unable to save view to %s - %s", instance->current_view_filename, g_strerror (errno));
xmlFreeDoc (doc);
}
@@ -390,7 +390,7 @@ gal_view_instance_set_current_view_id (GalViewInstance *instance,
g_return_if_fail (instance != NULL);
g_return_if_fail (GAL_IS_VIEW_INSTANCE (instance));
- d(g_print("%s: view_id set to %s\n", G_STRFUNC, view_id));
+ d (g_print ("%s: view_id set to %s\n", G_STRFUNC, view_id));
if (instance->current_id && !strcmp (instance->current_id, view_id))
return;
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 36d7429..0e99e32 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -54,7 +54,7 @@ gal_view_new_dialog_set_property (GObject *object,
switch (property_id) {
case PROP_NAME:
- entry = e_builder_get_widget(dialog->builder, "entry-name");
+ entry = e_builder_get_widget (dialog->builder, "entry-name");
if (entry && GTK_IS_ENTRY (entry)) {
gtk_entry_set_text (GTK_ENTRY (entry), g_value_get_string (value));
}
@@ -78,7 +78,7 @@ gal_view_new_dialog_get_property (GObject *object,
switch (property_id) {
case PROP_NAME:
- entry = e_builder_get_widget(dialog->builder, "entry-name");
+ entry = e_builder_get_widget (dialog->builder, "entry-name");
if (entry && GTK_IS_ENTRY (entry)) {
g_value_set_string (value, gtk_entry_get_text (GTK_ENTRY (entry)));
}
@@ -169,7 +169,7 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog)
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_title (GTK_WINDOW(dialog), _("Define New View"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Define New View"));
dialog->collection = NULL;
dialog->selected_factory = NULL;
@@ -242,8 +242,8 @@ gal_view_new_dialog_construct (GalViewNewDialog *dialog,
GtkCellRenderer *rend;
dialog->collection = collection;
- dialog->list = e_builder_get_widget(dialog->builder,"list-type-list");
- dialog->entry = e_builder_get_widget(dialog->builder, "entry-name");
+ dialog->list = e_builder_get_widget (dialog->builder,"list-type-list");
+ dialog->entry = e_builder_get_widget (dialog->builder, "entry-name");
dialog->list_store = gtk_list_store_new (
2, G_TYPE_STRING, G_TYPE_POINTER);
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 87c2537..9907db7 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -2746,7 +2746,7 @@ e_calendar_item_set_first_month (ECalendarItem *calitem,
new_year = year;
new_month = month;
- e_calendar_item_normalize_date (calitem, &new_year, &new_month);
+ e_calendar_item_normalize_date (calitem, &new_year, &new_month);
if (calitem->year == new_year && calitem->month == new_month)
return;
@@ -3493,9 +3493,9 @@ e_calendar_item_show_popup_menu (ECalendarItem *calitem,
submenu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
- g_object_set_data(G_OBJECT(submenu), "year",
+ g_object_set_data (G_OBJECT (submenu), "year",
GINT_TO_POINTER (year));
- g_object_set_data(G_OBJECT(submenu), "month_offset",
+ g_object_set_data (G_OBJECT (submenu), "month_offset",
GINT_TO_POINTER (month_offset));
for (month = 0; month < 12; month++) {
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 00c0695..8cd1338 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -454,7 +454,7 @@ canvas_button_event (GtkWidget *widget,
canvas = GNOME_CANVAS (widget);
bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (canvas));
- d(g_print ("button %d, event type %d, grabbed=%p, current=%p\n",
+ d (g_print ("button %d, event type %d, grabbed=%p, current=%p\n",
event->button,
event->type,
canvas->grabbed_item,
@@ -793,7 +793,7 @@ e_canvas_item_set_reflow_callback (GnomeCanvasItem *item,
g_return_if_fail (func != NULL);
g_object_set_data (
- G_OBJECT(item), "ECanvasItem::reflow_callback",
+ G_OBJECT (item), "ECanvasItem::reflow_callback",
(gpointer) func);
}
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 7732626..d35988c 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -388,7 +388,7 @@ e_map_set_hadjustment_values (EMap *map)
g_object_set (adj,
"lower", 0.0,
"upper", new_upper,
- "page-size", (gdouble)allocation.height,
+ "page-size", (gdouble) allocation.height,
"step-increment", allocation.height * 0.1,
"page-increment", allocation.height * 0.9,
NULL);
@@ -416,7 +416,7 @@ e_map_set_vadjustment_values (EMap *map)
g_object_set (adj,
"lower", 0.0,
"upper", new_upper,
- "page-size", (gdouble)allocation.height,
+ "page-size", (gdouble) allocation.height,
"step-increment", allocation.height * 0.1,
"page-increment", allocation.height * 0.9,
NULL);
diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c
index 986d66f..722ee23 100644
--- a/widgets/misc/e-preferences-window.c
+++ b/widgets/misc/e-preferences-window.c
@@ -75,13 +75,13 @@ preferences_window_filter_view (GtkTreeModel *model,
return TRUE;
gtk_tree_model_get (model, iter, COLUMN_ID, &str, -1);
- if (strncmp(window->priv->filter_view, "mail", 4) == 0) {
+ if (strncmp (window->priv->filter_view, "mail", 4) == 0) {
/* Show everything except calendar */
if (str && (strncmp (str, "cal", 3) == 0))
visible = FALSE;
else
visible = TRUE;
- } else if (strncmp(window->priv->filter_view, "cal", 3) == 0) {
+ } else if (strncmp (window->priv->filter_view, "cal", 3) == 0) {
/* Show only calendar and nothing else */
if (str && (strncmp (str, "cal", 3) != 0))
visible = FALSE;
@@ -537,7 +537,7 @@ e_preferences_window_filter_page (EPreferencesWindow *window,
/* XXX: We need a better solution to hide the icon view when
* there is just one entry */
- if (strncmp(page_name, "cal", 3) == 0) {
+ if (strncmp (page_name, "cal", 3) == 0) {
gtk_widget_hide (window->priv->scroll);
} else
gtk_widget_show (window->priv->scroll);
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 54507d2..4b54c58 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -451,7 +451,7 @@ get_widgets (ESendOptionsDialog *sod)
priv->priority = e_builder_get_widget (builder, "combo-priority");
priv->status = e_builder_get_widget (builder, "status-tracking");
priv->security = e_builder_get_widget (builder, "security-combo");
- priv->notebook = (GtkNotebook *)e_builder_get_widget (builder, "notebook");
+ priv->notebook = (GtkNotebook *) e_builder_get_widget (builder, "notebook");
priv->reply_request = e_builder_get_widget (builder, "reply-request-button");
priv->reply_convenient = e_builder_get_widget (builder, "reply-convinient");
priv->reply_within = e_builder_get_widget (builder, "reply-within");
diff --git a/widgets/misc/e-spell-entry.c b/widgets/misc/e-spell-entry.c
index c232dbc..afc8c0e 100644
--- a/widgets/misc/e-spell-entry.c
+++ b/widgets/misc/e-spell-entry.c
@@ -510,7 +510,7 @@ spell_entry_add_suggestions_menu (ESpellEntry *entry,
/* Above the separator, show the suggestions menu */
icon = gtk_image_new_from_stock (GTK_STOCK_SPELL_CHECK, GTK_ICON_SIZE_MENU);
- mi = gtk_image_menu_item_new_with_label(_("Spelling Suggestions"));
+ mi = gtk_image_menu_item_new_with_label (_("Spelling Suggestions"));
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), icon);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), build_spelling_menu (entry, word));
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index b1d726d..802e402 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -2756,7 +2756,7 @@ e_web_view_get_default_settings (void)
settings = webkit_web_settings_new ();
g_object_set (G_OBJECT (settings),
- "enable-frame-flattening", TRUE,
+ "enable-frame-flattening", TRUE,
"enable-java-applet", FALSE,
"enable-html5-database", FALSE,
"enable-html5-local-storage", FALSE,
diff --git a/widgets/misc/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c
index c71f4f4..b66a991 100644
--- a/widgets/misc/ea-calendar-cell.c
+++ b/widgets/misc/ea-calendar-cell.c
@@ -86,7 +86,7 @@ e_calendar_cell_new (ECalendarItem *calitem,
cell->column = column;
#ifdef ACC_DEBUG
- g_print ("EvoAcc: e_calendar_cell created %p\n", (gpointer)cell);
+ g_print ("EvoAcc: e_calendar_cell created %p\n", (gpointer) cell);
#endif
return cell;
diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c
index aca4b91..80b9010 100644
--- a/widgets/misc/ea-calendar-item.c
+++ b/widgets/misc/ea-calendar-item.c
@@ -1208,7 +1208,7 @@ e_calendar_item_get_day_extents (ECalendarItem *calitem,
new_year = year;
new_month = month;
- e_calendar_item_normalize_date (calitem, &new_year, &new_month);
+ e_calendar_item_normalize_date (calitem, &new_year, &new_month);
num_months = calitem->rows * calitem->cols;
months_offset = (new_year - calitem->year) * 12
+ new_month - calitem->month;
@@ -1338,7 +1338,7 @@ ea_calendar_set_focus_object (EaCalendarItem *ea_calitem,
AtkObject *old_cell;
old_cell = (AtkObject *) g_object_get_data (
- G_OBJECT(ea_calitem), "gail-focus-object");
+ G_OBJECT (ea_calitem), "gail-focus-object");
if (old_cell && EA_IS_CALENDAR_CELL (old_cell)) {
old_state_set = atk_object_ref_state_set (old_cell);
atk_state_set_remove_state (old_state_set, ATK_STATE_FOCUSED);
@@ -1349,6 +1349,6 @@ ea_calendar_set_focus_object (EaCalendarItem *ea_calitem,
state_set = atk_object_ref_state_set (item_cell);
atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
- g_object_set_data (G_OBJECT(ea_calitem), "gail-focus-object", item_cell);
+ g_object_set_data (G_OBJECT (ea_calitem), "gail-focus-object", item_cell);
g_object_unref (state_set);
}
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index c6d1a8e..2127fc0 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -108,7 +108,7 @@ on_date_range_changed (ECalendarItem *calitem)
gint start_year, start_month, start_day;
gint end_year, end_month, end_day;
- e_calendar_item_get_date_range (calitem,
+ e_calendar_item_get_date_range (calitem,
&start_year, &start_month, &start_day,
&end_year, &end_month, &end_day);
@@ -128,7 +128,7 @@ on_selection_changed (ECalendarItem *calitem)
{
GDate start_date, end_date;
- e_calendar_item_get_selection (calitem, &start_date, &end_date);
+ e_calendar_item_get_selection (calitem, &start_date, &end_date);
g_print ("Selection changed (D/M/Y): %i/%i/%i - %i/%i/%i\n",
g_date_get_day (&start_date),
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 20a1916..422f9da 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -388,7 +388,7 @@ e_cell_combo_show_popup (ECellCombo *ecc,
gtk_widget_show (ecc->popup_window);
e_cell_popup_set_shown (E_CELL_POPUP (ecc), TRUE);
- d(g_print("%s: popup_shown = TRUE\n", __FUNCTION__));
+ d (g_print ("%s: popup_shown = TRUE\n", __FUNCTION__));
}
/* Calculates the size and position of the popup window (like GtkCombo). */
@@ -603,7 +603,7 @@ e_cell_combo_button_press (GtkWidget *popup_window,
gtk_widget_hide (ecc->popup_window);
e_cell_popup_set_shown (E_CELL_POPUP (ecc), FALSE);
- d(g_print("%s: popup_shown = FALSE\n", __FUNCTION__));
+ d (g_print ("%s: popup_shown = FALSE\n", __FUNCTION__));
/* We don't want to update the cell here. Since the list is in browse
* mode there will always be one item selected, so when we popup the
@@ -644,7 +644,7 @@ e_cell_combo_button_release (GtkWidget *popup_window,
gtk_widget_hide (ecc->popup_window);
e_cell_popup_set_shown (E_CELL_POPUP (ecc), FALSE);
- d(g_print("%s: popup_shown = FALSE\n", __FUNCTION__));
+ d (g_print ("%s: popup_shown = FALSE\n", __FUNCTION__));
e_cell_combo_update_cell (ecc);
e_cell_combo_restart_edit (ecc);
@@ -677,7 +677,7 @@ e_cell_combo_key_press (GtkWidget *popup_window,
gtk_widget_hide (ecc->popup_window);
e_cell_popup_set_shown (E_CELL_POPUP (ecc), FALSE);
- d(g_print("%s: popup_shown = FALSE\n", __FUNCTION__));
+ d (g_print ("%s: popup_shown = FALSE\n", __FUNCTION__));
if (event->keyval != GDK_KEY_Escape)
e_cell_combo_update_cell (ecc);
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 98bbf89..6bca769 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -166,7 +166,7 @@ ecv_draw (ECellView *ecell_view,
/* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row);
if (width < hbox_view->def_size_cols[i])
width = hbox_view->def_size_cols[i];
- printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */
+ printf ("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */
e_cell_draw (
hbox_view->subcell_views[i], cr,
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index b330a95..8f01847 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -47,7 +47,7 @@ ecd_get_text (ECellText *cell,
} else {
fsize = ((gfloat) size) / 1024.0;
if (fsize < 1024.0) {
- return g_strdup_printf ("%d K", (gint)fsize);
+ return g_strdup_printf ("%d K", (gint) fsize);
} else {
fsize /= 1024.0;
return g_strdup_printf ("%.1f MB", fsize);
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 54998bc..6e28c8b 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -950,7 +950,7 @@ ect_event (ECellView *ecell_view,
case GDK_BUTTON_PRESS: /* Fall Through */
d (press = TRUE);
case GDK_BUTTON_RELEASE:
- d(g_print ("%s: %s\n", __FUNCTION__, press ? "GDK_BUTTON_PRESS" : "GDK_BUTTON_RELEASE"));
+ d (g_print ("%s: %s\n", __FUNCTION__, press ? "GDK_BUTTON_PRESS" : "GDK_BUTTON_RELEASE"));
event->button.x -= 4;
event->button.y -= 1;
if ((!edit_display)
diff --git a/widgets/table/e-popup-menu.c b/widgets/table/e-popup-menu.c
index faffd9d..3e82496 100644
--- a/widgets/table/e-popup-menu.c
+++ b/widgets/table/e-popup-menu.c
@@ -70,7 +70,7 @@ e_popup_menu_create_with_domain (EPopupMenu *menu_list,
gint i;
for (i = 0; menu_list[i].name; i++) {
- if (strcmp ("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) {
+ if (strcmp ("", menu_list[i].name) && !(menu_list[i].disable_mask & hide_mask)) {
last_non_separator = i;
}
}
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index a242d95..033b693 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -80,7 +80,7 @@ etcs_init (ETableColumnSpecification *specification)
{
specification->model_col = 0;
specification->compare_col = 0;
- specification->title = g_strdup("");
+ specification->title = g_strdup ("");
specification->pixbuf = NULL;
specification->expansion = 0;
@@ -123,7 +123,7 @@ e_table_column_specification_load_from_node (ETableColumnSpecification *etcs,
etcs->priority = e_xml_get_integer_prop_by_name_with_default (node, (const guchar *)"priority", 0);
if (etcs->title == NULL)
- etcs->title = g_strdup("");
+ etcs->title = g_strdup ("");
}
xmlNode *
@@ -132,24 +132,24 @@ e_table_column_specification_save_to_node (ETableColumnSpecification *specificat
{
xmlNode *node;
if (parent)
- node = xmlNewChild(parent, NULL, (const guchar *)"ETableColumn", NULL);
+ node = xmlNewChild (parent, NULL, (const guchar *)"ETableColumn", NULL);
else
- node = xmlNewNode(NULL, (const guchar *)"ETableColumn");
+ node = xmlNewNode (NULL, (const guchar *)"ETableColumn");
- e_xml_set_integer_prop_by_name(node, (const guchar *)"model_col", specification->model_col);
+ e_xml_set_integer_prop_by_name (node, (const guchar *)"model_col", specification->model_col);
if (specification->compare_col != specification->model_col)
- e_xml_set_integer_prop_by_name(node, (const guchar *)"compare_col", specification->compare_col);
- e_xml_set_string_prop_by_name(node, (const guchar *)"_title", specification->title);
- e_xml_set_string_prop_by_name(node, (const guchar *)"pixbuf", specification->pixbuf);
-
- e_xml_set_double_prop_by_name(node, (const guchar *)"expansion", specification->expansion);
- e_xml_set_integer_prop_by_name(node, (const guchar *)"minimum_width", specification->minimum_width);
- e_xml_set_bool_prop_by_name(node, (const guchar *)"resizable", specification->resizable);
- e_xml_set_bool_prop_by_name(node, (const guchar *)"disabled", specification->disabled);
-
- e_xml_set_string_prop_by_name(node, (const guchar *)"cell", specification->cell);
- e_xml_set_string_prop_by_name(node, (const guchar *)"compare", specification->compare);
- e_xml_set_string_prop_by_name(node, (const guchar *)"search", specification->search);
+ e_xml_set_integer_prop_by_name (node, (const guchar *)"compare_col", specification->compare_col);
+ e_xml_set_string_prop_by_name (node, (const guchar *)"_title", specification->title);
+ e_xml_set_string_prop_by_name (node, (const guchar *)"pixbuf", specification->pixbuf);
+
+ e_xml_set_double_prop_by_name (node, (const guchar *)"expansion", specification->expansion);
+ e_xml_set_integer_prop_by_name (node, (const guchar *)"minimum_width", specification->minimum_width);
+ e_xml_set_bool_prop_by_name (node, (const guchar *)"resizable", specification->resizable);
+ e_xml_set_bool_prop_by_name (node, (const guchar *)"disabled", specification->disabled);
+
+ e_xml_set_string_prop_by_name (node, (const guchar *)"cell", specification->cell);
+ e_xml_set_string_prop_by_name (node, (const guchar *)"compare", specification->compare);
+ e_xml_set_string_prop_by_name (node, (const guchar *)"search", specification->search);
if (specification->priority != 0)
e_xml_set_integer_prop_by_name (node, (const guchar *)"priority", specification->priority);
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 728616d..3547bb3 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -879,13 +879,13 @@ configure_sort_dialog (ETableConfig *config,
snprintf (
buffer, sizeof (buffer),
- "radiobutton-ascending-sort-%d", i+1);
+ "radiobutton-ascending-sort-%d", i + 1);
config->sort[i].radio_ascending = e_builder_get_widget (
builder, buffer);
snprintf (
buffer, sizeof (buffer),
- "radiobutton-descending-sort-%d", i+1);
+ "radiobutton-descending-sort-%d", i + 1);
config->sort[i].radio_descending = e_builder_get_widget (
builder, buffer);
@@ -999,19 +999,19 @@ configure_group_dialog (ETableConfig *config,
snprintf (
buffer, sizeof (buffer),
- "radiobutton-ascending-group-%d", i+1);
+ "radiobutton-ascending-group-%d", i + 1);
config->group[i].radio_ascending = e_builder_get_widget (
builder, buffer);
snprintf (
buffer, sizeof (buffer),
- "radiobutton-descending-group-%d", i+1);
+ "radiobutton-descending-group-%d", i + 1);
config->group[i].radio_descending = e_builder_get_widget (
builder, buffer);
snprintf (
buffer, sizeof (buffer),
- "checkbutton-group-%d", i+1);
+ "checkbutton-group-%d", i + 1);
config->group[i].view_check = e_builder_get_widget (
builder, buffer);
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 5b99c3a..6e69ccd 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -199,7 +199,7 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos
dialog = GTK_DIALOG (e_table_field_chooser_dialog);
e_table_field_chooser_dialog->etfc = NULL;
- e_table_field_chooser_dialog->dnd_code = g_strdup("");
+ e_table_field_chooser_dialog->dnd_code = g_strdup ("");
e_table_field_chooser_dialog->full_header = NULL;
e_table_field_chooser_dialog->header = NULL;
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 25e1f3f..32d2904 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -424,7 +424,7 @@ etfci_drag_data_get (GtkWidget *widget,
ETableFieldChooserItem *etfci)
{
if (etfci->drag_col != -1) {
- gchar *string = g_strdup_printf("%d", etfci->drag_col);
+ gchar *string = g_strdup_printf ("%d", etfci->drag_col);
gtk_selection_data_set (selection_data,
GDK_SELECTION_TYPE_STRING,
sizeof (string[0]),
@@ -590,7 +590,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci,
etfci_drag_types[0].target = g_strdup_printf (
"%s-%s", etfci_drag_types[0].target, etfci->dnd_code);
- d(g_print ("etfci - %s\n", etfci_drag_types[0].target));
+ d (g_print ("etfci - %s\n", etfci_drag_types[0].target));
list = gtk_target_list_new (etfci_drag_types, G_N_ELEMENTS (etfci_drag_types));
context = gtk_drag_begin (widget, list, GDK_ACTION_MOVE, 1, event);
g_free ((gpointer) etfci_drag_types[0].target);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 937a3cc..9841b99 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -357,7 +357,7 @@ compute_text (ETableGroupContainer *etgc,
* Finally the %d is replaced with count of items in this group.
* Example: "Family name: Smith (13 items)"
*/
- text = g_strdup_printf (ngettext("%s: %s (%d item)",
+ text = g_strdup_printf (ngettext ("%s: %s (%d item)",
"%s: %s (%d items)",
child_node->count),
etgc->ecol->text, child_node->string,
@@ -369,7 +369,7 @@ compute_text (ETableGroupContainer *etgc,
* The %d is replaced with count of items in this group.
* Example: "Smith (13 items)"
*/
- text = g_strdup_printf (ngettext("%s (%d item)",
+ text = g_strdup_printf (ngettext ("%s (%d item)",
"%s (%d items)",
child_node->count),
child_node->string,
@@ -1387,7 +1387,7 @@ static gboolean
e_table_group_container_data_left (EPrintable *ep,
ETGCPrintContext *groupcontext)
{
- g_signal_stop_emission_by_name(ep, "data_left");
+ g_signal_stop_emission_by_name (ep, "data_left");
return groupcontext->child != NULL;
}
@@ -1423,7 +1423,7 @@ e_table_group_container_height (EPrintable *ep,
g_object_ref (child_printable);
else {
if (!child) {
- g_signal_stop_emission_by_name(ep, "height");
+ g_signal_stop_emission_by_name (ep, "height");
return 0;
} else {
child_node = child->data;
@@ -1465,7 +1465,7 @@ e_table_group_container_height (EPrintable *ep,
}
if (child_printable)
g_object_unref (child_printable);
- g_signal_stop_emission_by_name(ep, "height");
+ g_signal_stop_emission_by_name (ep, "height");
return height;
}
@@ -1491,7 +1491,7 @@ e_table_group_container_will_fit (EPrintable *ep,
g_object_ref (child_printable);
else {
if (!child) {
- g_signal_stop_emission_by_name(ep, "will_fit");
+ g_signal_stop_emission_by_name (ep, "will_fit");
return will_fit;
} else {
child_node = child->data;
@@ -1535,7 +1535,7 @@ e_table_group_container_will_fit (EPrintable *ep,
if (child_printable)
g_object_unref (child_printable);
- g_signal_stop_emission_by_name(ep, "will_fit");
+ g_signal_stop_emission_by_name (ep, "will_fit");
return will_fit;
}
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 730a7b7..fba38ab 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -283,7 +283,7 @@ etgl_realize (GnomeCanvasItem *item)
etgl->item = E_TABLE_ITEM (gnome_canvas_item_new (
GNOME_CANVAS_GROUP (etgl),
e_table_item_get_type (),
- "ETableHeader", E_TABLE_GROUP(etgl)->header,
+ "ETableHeader", E_TABLE_GROUP (etgl)->header,
"ETableModel", etgl->ets,
"alternating_row_colors", etgl->alternating_row_colors,
"horizontal_draw_grid", etgl->horizontal_draw_grid,
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 8054a95..ef24716 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -398,12 +398,12 @@ ethi_find_col_by_x (ETableHeaderItem *ethi,
gint x1 = 0;
gint col;
- d(g_print ("%s:%d: x = %d, x1 = %d\n", __FUNCTION__, __LINE__, x, x1));
+ d (g_print ("%s:%d: x = %d, x1 = %d\n", __FUNCTION__, __LINE__, x, x1));
x1 += ethi->group_indent_width;
if (x < x1) {
- d(g_print ("%s:%d: Returning 0\n", __FUNCTION__, __LINE__));
+ d (g_print ("%s:%d: Returning 0\n", __FUNCTION__, __LINE__));
return 0;
}
@@ -411,13 +411,13 @@ ethi_find_col_by_x (ETableHeaderItem *ethi,
ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
if ((x >= x1) && (x <= x1 + ecol->width)) {
- d(g_print ("%s:%d: Returning %d\n", __FUNCTION__, __LINE__, col));
+ d (g_print ("%s:%d: Returning %d\n", __FUNCTION__, __LINE__, col));
return col;
}
x1 += ecol->width;
}
- d(g_print ("%s:%d: Returning %d\n", __FUNCTION__, __LINE__, cols - 1));
+ d (g_print ("%s:%d: Returning %d\n", __FUNCTION__, __LINE__, cols - 1));
return cols - 1;
}
@@ -594,7 +594,7 @@ do_drag_motion (ETableHeaderItem *ethi,
(y >= 0) && (y <= (ethi->height))) {
GdkDragAction suggested_action;
gint col;
- d(g_print("In header\n"));
+ d (g_print ("In header\n"));
col = ethi_find_col_by_x_nearest (ethi, x);
suggested_action = gdk_drag_context_get_suggested_action (context);
@@ -863,7 +863,7 @@ ethi_drag_data_get (GtkWidget *canvas,
if (ethi->drag_col != -1) {
ETableCol *ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
- gchar *string = g_strdup_printf("%d", ecol->col_idx);
+ gchar *string = g_strdup_printf ("%d", ecol->col_idx);
gtk_selection_data_set (selection_data,
GDK_SELECTION_TYPE_STRING,
sizeof (string[0]),
@@ -896,7 +896,7 @@ ethi_drag_drop (GtkWidget *canvas,
if (col != -1) {
gchar *target = g_strdup_printf (
"%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code);
- d(g_print ("ethi - %s\n", target));
+ d (g_print ("ethi - %s\n", target));
gtk_drag_get_data (
canvas, context,
gdk_atom_intern (target, FALSE),
@@ -1675,7 +1675,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi,
GtkWidget *menu_item, *sub_menu;
ETableSortColumn column;
gboolean ascending = TRUE;
- d( g_print("ethi_header_context_menu: \n") );
+ d ( g_print ("ethi_header_context_menu: \n") );
info->ethi = ethi;
info->col = ethi_find_col_by_x (ethi, event->x);
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 616da4b..b9e2cce 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -240,7 +240,7 @@ eti_grab (ETableItem *eti,
guint32 time)
{
GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
- d(g_print ("%s: time: %d\n", __FUNCTION__, time));
+ d (g_print ("%s: time: %d\n", __FUNCTION__, time));
if (eti->grabbed_count == 0) {
eti->gtk_grabbed = FALSE;
eti->grab_cancelled = FALSE;
@@ -251,7 +251,7 @@ eti_grab (ETableItem *eti,
NULL, time,
grab_cancelled,
eti) != GDK_GRAB_SUCCESS) {
- d(g_print ("%s: gtk_grab_add\n", __FUNCTION__));
+ d (g_print ("%s: gtk_grab_add\n", __FUNCTION__));
gtk_grab_add (GTK_WIDGET (item->canvas));
eti->gtk_grabbed = TRUE;
}
@@ -264,14 +264,14 @@ eti_ungrab (ETableItem *eti,
guint32 time)
{
GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
- d(g_print ("%s: time: %d\n", __FUNCTION__, time));
+ d (g_print ("%s: time: %d\n", __FUNCTION__, time));
eti->grabbed_count--;
if (eti->grabbed_count == 0) {
if (eti->grab_cancelled) {
eti->grab_cancelled = FALSE;
} else {
if (eti->gtk_grabbed) {
- d(g_print ("%s: gtk_grab_remove\n", __FUNCTION__));
+ d (g_print ("%s: gtk_grab_remove\n", __FUNCTION__));
gtk_grab_remove (GTK_WIDGET (item->canvas));
eti->gtk_grabbed = FALSE;
}
@@ -285,7 +285,7 @@ eti_ungrab (ETableItem *eti,
inline static gboolean
eti_editing (ETableItem *eti)
{
- d(g_print("%s: %s\n", __FUNCTION__, (eti->editing_col == -1) ? "false":"true"));
+ d (g_print ("%s: %s\n", __FUNCTION__, (eti->editing_col == -1) ? "false":"true"));
if (eti->editing_col == -1)
return FALSE;
@@ -1012,7 +1012,7 @@ eti_show_cursor (ETableItem *eti,
cursor_row = e_selection_model_cursor_row (eti->selection);
#endif
- d(g_print ("%s: cursor row: %d\n", __FUNCTION__, cursor_row));
+ d (g_print ("%s: cursor row: %d\n", __FUNCTION__, cursor_row));
if (cursor_row != -1) {
cursor_row = model_to_view_row (eti, cursor_row);
@@ -1051,11 +1051,11 @@ eti_check_cursor_bounds (ETableItem *eti)
return;
}
- d(g_print ("%s: model cursor row: %d\n", __FUNCTION__, cursor_row));
+ d (g_print ("%s: model cursor row: %d\n", __FUNCTION__, cursor_row));
cursor_row = model_to_view_row (eti, cursor_row);
- d(g_print ("%s: cursor row: %d\n", __FUNCTION__, cursor_row));
+ d (g_print ("%s: cursor row: %d\n", __FUNCTION__, cursor_row));
eti_get_region (eti,
0, cursor_row, eti->cols - 1, cursor_row,
@@ -1066,14 +1066,14 @@ eti_check_cursor_bounds (ETableItem *eti)
eti->cursor_y2 = y2;
eti->cursor_on_screen = e_canvas_item_area_shown (GNOME_CANVAS_ITEM (eti), x1, y1, x2, y2);
- d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
+ d (g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
}
static void
eti_maybe_show_cursor (ETableItem *eti,
gint delay)
{
- d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
+ d (g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
if (eti->cursor_on_screen)
eti_show_cursor (eti, delay);
eti_check_cursor_bounds (eti);
@@ -1097,7 +1097,7 @@ eti_idle_show_cursor_cb (gpointer data)
static void
eti_idle_maybe_show_cursor (ETableItem *eti)
{
- d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
+ d (g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
if (eti->cursor_on_screen) {
g_object_ref (eti);
if (!eti->cursor_idle_id)
@@ -1122,7 +1122,7 @@ static void
eti_freeze (ETableItem *eti)
{
eti->frozen_count++;
- d(g_print ("%s: %d\n", __FUNCTION__, eti->frozen_count));
+ d (g_print ("%s: %d\n", __FUNCTION__, eti->frozen_count));
}
static void
@@ -1132,7 +1132,7 @@ eti_unfreeze (ETableItem *eti)
return;
eti->frozen_count--;
- d(g_print ("%s: %d\n", __FUNCTION__, eti->frozen_count));
+ d (g_print ("%s: %d\n", __FUNCTION__, eti->frozen_count));
if (eti->frozen_count == 0 && eti->queue_show_cursor) {
eti_show_cursor (eti, 0);
eti_check_cursor_bounds (eti);
@@ -1796,7 +1796,7 @@ eti_unrealize (GnomeCanvasItem *item)
ETableItem *eti = E_TABLE_ITEM (item);
if (eti->grabbed_count > 0) {
- d(g_print ("%s: eti_ungrab\n", __FUNCTION__));
+ d (g_print ("%s: eti_ungrab\n", __FUNCTION__));
eti_ungrab (eti, -1);
}
@@ -2272,14 +2272,14 @@ eti_e_cell_event (ETableItem *item,
ret_val = e_cell_event (ecell_view, event, model_col, view_col, row, flags, &actions);
if (actions & E_CELL_GRAB) {
- d(g_print ("%s: eti_grab\n", __FUNCTION__));
+ d (g_print ("%s: eti_grab\n", __FUNCTION__));
eti_grab (item, time);
item->grabbed_col = view_col;
item->grabbed_row = row;
}
if (actions & E_CELL_UNGRAB) {
- d(g_print ("%s: eti_ungrab\n", __FUNCTION__));
+ d (g_print ("%s: eti_ungrab\n", __FUNCTION__));
eti_ungrab (item, time);
item->grabbed_col = -1;
item->grabbed_row = -1;
@@ -2313,7 +2313,7 @@ eti_event (GnomeCanvasItem *item,
gint new_cursor_row, new_cursor_col;
ECellFlags flags = 0;
- d(g_print("%s: GDK_BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
+ d (g_print ("%s: GDK_BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
switch (e->button.button) {
case 1: /* Fall through. */
@@ -2402,7 +2402,7 @@ eti_event (GnomeCanvasItem *item,
eti->drag_y = realy;
eti->drag_state = e->button.state;
eti->grabbed = TRUE;
- d(g_print ("%s: eti_grab\n", __FUNCTION__));
+ d (g_print ("%s: eti_grab\n", __FUNCTION__));
eti_grab (eti, e->button.time);
}
@@ -2433,10 +2433,10 @@ eti_event (GnomeCanvasItem *item,
gint col, row;
gint cursor_row, cursor_col;
- d(g_print("%s: GDK_BUTTON_RELEASE received, button %d\n", __FUNCTION__, e->button.button));
+ d (g_print ("%s: GDK_BUTTON_RELEASE received, button %d\n", __FUNCTION__, e->button.button));
if (eti->grabbed_count > 0) {
- d(g_print ("%s: eti_ungrab\n", __FUNCTION__));
+ d (g_print ("%s: eti_ungrab\n", __FUNCTION__));
eti_ungrab (eti, e->button.time);
}
@@ -2459,7 +2459,7 @@ eti_event (GnomeCanvasItem *item,
#if d(!)0
{
gboolean cell_found = find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1);
- g_print("%s: find_cell(%f, %f) = %s(%d, %d, %f, %f)\n", __FUNCTION__, e->button.x, e->button.y,
+ g_print ("%s: find_cell(%f, %f) = %s(%d, %d, %f, %f)\n", __FUNCTION__, e->button.x, e->button.y,
cell_found?"true":"false", col, row, x1, y1);
}
#endif
@@ -2472,13 +2472,13 @@ eti_event (GnomeCanvasItem *item,
"cursor_col", &cursor_col,
NULL);
- d(g_print("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n"
+ d (g_print ("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n"
"eti_editing: %s, row:%d:%d, col:%d:%d\n", __FUNCTION__, e->button.button, __LINE__,
- eti_editing(eti)?"true":"false", cursor_row, view_to_model_row(eti, row), cursor_col, view_to_model_col(eti, col)));
+ eti_editing (eti)?"true":"false", cursor_row, view_to_model_row (eti, row), cursor_col, view_to_model_col (eti, col)));
if (eti_editing (eti) && cursor_row == view_to_model_row (eti, row) && cursor_col == view_to_model_col (eti, col)) {
- d(g_print("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n", __FUNCTION__, e->button.button, __LINE__))
+ d (g_print ("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n", __FUNCTION__, e->button.button, __LINE__))
;
ecell_view = eti->cell_views[col];
@@ -2511,7 +2511,7 @@ eti_event (GnomeCanvasItem *item,
gdouble x1, y1;
#endif
- d(g_print("%s: GDK_2BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
+ d (g_print ("%s: GDK_2BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
/*
* click_count is so that if you click on two
@@ -2550,7 +2550,7 @@ eti_event (GnomeCanvasItem *item,
}
if (eti->grabbed_count > 0) {
- d(g_print ("%s: eti_ungrab\n", __FUNCTION__));
+ d (g_print ("%s: eti_ungrab\n", __FUNCTION__));
eti_ungrab (eti, e->button.time);
}
@@ -2626,7 +2626,7 @@ eti_event (GnomeCanvasItem *item,
gint cursor_row, cursor_col;
gint handled = TRUE;
- d(g_print("%s: GDK_KEY_PRESS received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
+ d (g_print ("%s: GDK_KEY_PRESS received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
g_object_get (eti->selection,
"cursor_row", &cursor_row,
@@ -2827,7 +2827,7 @@ eti_event (GnomeCanvasItem *item,
case GDK_KEY_RELEASE: {
gint cursor_row, cursor_col;
- d(g_print("%s: GDK_KEY_RELEASE received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
+ d (g_print ("%s: GDK_KEY_RELEASE received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
g_object_get (eti->selection,
"cursor_row", &cursor_row,
@@ -2849,7 +2849,7 @@ eti_event (GnomeCanvasItem *item,
case GDK_LEAVE_NOTIFY:
d (leave = TRUE);
case GDK_ENTER_NOTIFY:
- d(g_print("%s: %s received\n", __FUNCTION__, leave ? "GDK_LEAVE_NOTIFY" : "GDK_ENTER_NOTIFY"));
+ d (g_print ("%s: %s received\n", __FUNCTION__, leave ? "GDK_LEAVE_NOTIFY" : "GDK_ENTER_NOTIFY"));
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,
@@ -2861,7 +2861,7 @@ eti_event (GnomeCanvasItem *item,
break;
case GDK_FOCUS_CHANGE:
- d(g_print("%s: GDK_FOCUS_CHANGE received, %s\n", __FUNCTION__, e->focus_change.in ? "in": "out"));
+ d (g_print ("%s: GDK_FOCUS_CHANGE received, %s\n", __FUNCTION__, e->focus_change.in ? "in": "out"));
if (e->focus_change.in) {
if (eti->save_row != -1 &&
eti->save_col != -1 &&
@@ -3341,7 +3341,7 @@ e_table_item_enter_edit (ETableItem *eti,
g_return_if_fail (eti != NULL);
g_return_if_fail (E_IS_TABLE_ITEM (eti));
- d(g_print("%s: %d, %d, eti_editing() = %s\n", __FUNCTION__, col, row, eti_editing(eti)?"true":"false"));
+ d (g_print ("%s: %d, %d, eti_editing() = %s\n", __FUNCTION__, col, row, eti_editing (eti)?"true":"false"));
if (eti_editing (eti))
e_table_item_leave_edit_(eti);
@@ -3367,7 +3367,7 @@ e_table_item_leave_edit (ETableItem *eti)
g_return_if_fail (eti != NULL);
g_return_if_fail (E_IS_TABLE_ITEM (eti));
- d(g_print("%s: eti_editing() = %s\n", __FUNCTION__, eti_editing(eti)?"true":"false"));
+ d (g_print ("%s: eti_editing() = %s\n", __FUNCTION__, eti_editing (eti)?"true":"false"));
if (!eti_editing (eti))
return;
@@ -3641,7 +3641,7 @@ e_table_item_data_left (EPrintable *ep,
ETableItem *item = itemcontext->item;
gint rows_printed = itemcontext->rows_printed;
- g_signal_stop_emission_by_name(ep, "data_left");
+ g_signal_stop_emission_by_name (ep, "data_left");
return rows_printed < item->rows;
}
@@ -3698,7 +3698,7 @@ e_table_item_height (EPrintable *ep,
if (max_height != -1 && (!quantize) && yd > max_height)
yd = max_height;
- g_signal_stop_emission_by_name(ep, "height");
+ g_signal_stop_emission_by_name (ep, "height");
return yd;
}
@@ -3748,7 +3748,7 @@ e_table_item_will_fit (EPrintable *ep,
g_free (widths);
- g_signal_stop_emission_by_name(ep, "will_fit");
+ g_signal_stop_emission_by_name (ep, "will_fit");
return ret_val;
}
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 15b5286..7c12496 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -30,7 +30,7 @@
#include "e-table-model.h"
#define ETM_FROZEN(e) \
- (GPOINTER_TO_INT (g_object_get_data (G_OBJECT(e), "frozen")) != 0)
+ (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (e), "frozen")) != 0)
#define d(x)
@@ -443,7 +443,7 @@ print_tabs (void)
{
gint i;
for (i = 0; i < depth; i++)
- g_print("\t");
+ g_print ("\t");
}
#endif
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index ff38d94..503b6a4 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -148,7 +148,7 @@ one_value_to_string (ETableModel *etm,
if (one->source)
return e_table_model_value_to_string (one->source, col, value);
else
- return g_strdup("");
+ return g_strdup ("");
}
static void
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index c85731b..4740c0f 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -372,14 +372,14 @@ e_table_sort_info_load_from_node (ETableSortInfo *info,
if (state_version <= 0.05) {
i = 0;
- for (grouping = node->xmlChildrenNode; grouping && !strcmp ((gchar *)grouping->name, "group"); grouping = grouping->xmlChildrenNode) {
+ for (grouping = node->xmlChildrenNode; grouping && !strcmp ((gchar *) grouping->name, "group"); grouping = grouping->xmlChildrenNode) {
ETableSortColumn column;
column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column");
column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending");
e_table_sort_info_grouping_set_nth (info, i++, column);
}
i = 0;
- for (; grouping && !strcmp ((gchar *)grouping->name, "leaf"); grouping = grouping->xmlChildrenNode) {
+ for (; grouping && !strcmp ((gchar *) grouping->name, "leaf"); grouping = grouping->xmlChildrenNode) {
ETableSortColumn column;
column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column");
column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending");
@@ -394,11 +394,11 @@ e_table_sort_info_load_from_node (ETableSortInfo *info,
if (grouping->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp ((gchar *)grouping->name, "group")) {
+ if (!strcmp ((gchar *) grouping->name, "group")) {
column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column");
column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending");
e_table_sort_info_grouping_set_nth (info, gcnt++, column);
- } else if (!strcmp ((gchar *)grouping->name, "leaf")) {
+ } else if (!strcmp ((gchar *) grouping->name, "leaf")) {
column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column");
column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending");
e_table_sort_info_sorting_set_nth (info, scnt++, column);
@@ -431,7 +431,7 @@ e_table_sort_info_save_to_node (ETableSortInfo *info,
for (i = 0; i < group_count; i++) {
ETableSortColumn column = e_table_sort_info_grouping_get_nth (info, i);
- xmlNode *new_node = xmlNewChild(grouping, NULL, (const guchar *)"group", NULL);
+ xmlNode *new_node = xmlNewChild (grouping, NULL, (const guchar *)"group", NULL);
e_xml_set_integer_prop_by_name (new_node, (const guchar *)"column", column.column);
e_xml_set_bool_prop_by_name (new_node, (const guchar *)"ascending", column.ascending);
@@ -439,7 +439,7 @@ e_table_sort_info_save_to_node (ETableSortInfo *info,
for (i = 0; i < sort_count; i++) {
ETableSortColumn column = e_table_sort_info_sorting_get_nth (info, i);
- xmlNode *new_node = xmlNewChild(grouping, NULL, (const guchar *)"leaf", NULL);
+ xmlNode *new_node = xmlNewChild (grouping, NULL, (const guchar *)"leaf", NULL);
e_xml_set_integer_prop_by_name (new_node, (const guchar *)"column", column.column);
e_xml_set_bool_prop_by_name (new_node, (const guchar *)"ascending", column.ascending);
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index fe5f644..022e4e9 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -261,7 +261,7 @@ ets_proxy_model_rows_inserted (ETableSubset *etss,
e_table_model_row_inserted (etm, i);
}
- d(g_print("inserted row %d", row));
+ d (g_print ("inserted row %d", row));
row++;
}
if (full_change)
@@ -307,7 +307,7 @@ ets_proxy_model_rows_deleted (ETableSubset *etss,
e_table_model_no_change (etm);
}
- d(g_print("deleted row %d count %d", row, count));
+ d (g_print ("deleted row %d count %d", row, count));
d (e_table_subset_print_debugging (etss));
}
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 7dc50c4..022c27a 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -294,7 +294,7 @@ static void
ets_sort_info_changed (ETableSortInfo *info,
ETableSorter *ets)
{
- d(g_print ("sort info changed\n"));
+ d (g_print ("sort info changed\n"));
ets_clean (ets);
}
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 5cc0f34..e5f5b17 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -193,8 +193,8 @@ e_table_specification_load_from_node (ETableSpecification *specification,
specification->alternating_row_colors = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"alternating-row-colors", TRUE);
specification->horizontal_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"horizontal-draw-grid");
specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"vertical-draw-grid");
- if (e_xml_get_bool_prop_by_name_with_default(node, (const guchar *)"draw-grid", TRUE) ==
- e_xml_get_bool_prop_by_name_with_default(node, (const guchar *)"draw-grid", FALSE)) {
+ if (e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"draw-grid", TRUE) ==
+ e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"draw-grid", FALSE)) {
specification->horizontal_draw_grid =
specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"draw-grid");
}
@@ -249,12 +249,12 @@ e_table_specification_load_from_node (ETableSpecification *specification,
specification->columns = NULL;
for (children = node->xmlChildrenNode; children; children = children->next) {
- if (!strcmp ((gchar *)children->name, "ETableColumn")) {
+ if (!strcmp ((gchar *) children->name, "ETableColumn")) {
ETableColumnSpecification *col_spec = e_table_column_specification_new ();
e_table_column_specification_load_from_node (col_spec, children);
list = g_list_append (list, col_spec);
- } else if (specification->state == NULL && !strcmp ((gchar *)children->name, "ETableState")) {
+ } else if (specification->state == NULL && !strcmp ((gchar *) children->name, "ETableState")) {
specification->state = e_table_state_new ();
e_table_state_load_from_node (specification->state, children);
e_table_sort_info_set_can_group (specification->state->sort_info, specification->allow_grouping);
@@ -381,15 +381,15 @@ e_table_specification_save_to_node (ETableSpecification *specification,
case GTK_SELECTION_MULTIPLE:
s = "extended";
}
- xmlSetProp (node, (const guchar *)"selection-mode", (guchar *)s);
+ xmlSetProp (node, (const guchar *)"selection-mode", (guchar *) s);
if (specification->cursor_mode == E_CURSOR_LINE)
s = "line";
else
s = "cell";
- xmlSetProp (node, (const guchar *)"cursor-mode", (guchar *)s);
+ xmlSetProp (node, (const guchar *)"cursor-mode", (guchar *) s);
- xmlSetProp (node, (const guchar *)"_click-to-add-message", (guchar *)specification->click_to_add_message);
- xmlSetProp (node, (const guchar *)"gettext-domain", (guchar *)specification->domain);
+ xmlSetProp (node, (const guchar *)"_click-to-add-message", (guchar *) specification->click_to_add_message);
+ xmlSetProp (node, (const guchar *)"gettext-domain", (guchar *) specification->domain);
if (specification->columns) {
gint i;
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index cfc8661..61c0e5c 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -180,7 +180,7 @@ e_table_state_load_from_node (ETableState *state,
state->sort_info = NULL;
children = node->xmlChildrenNode;
for (; children; children = children->next) {
- if (!strcmp ((gchar *)children->name, "column")) {
+ if (!strcmp ((gchar *) children->name, "column")) {
int_and_double *column_info = g_new (int_and_double, 1);
column_info->column = e_xml_get_integer_prop_by_name (
@@ -191,7 +191,7 @@ e_table_state_load_from_node (ETableState *state,
list = g_list_append (list, column_info);
} else if (state->sort_info == NULL &&
- !strcmp ((gchar *)children->name, "grouping")) {
+ !strcmp ((gchar *) children->name, "grouping")) {
state->sort_info = e_table_sort_info_new ();
e_table_sort_info_load_from_node (
state->sort_info, children, state_version);
@@ -244,7 +244,7 @@ e_table_state_save_to_string (ETableState *state)
g_return_val_if_fail (E_IS_TABLE_STATE (state), NULL);
- doc = xmlNewDoc((const guchar *)"1.0");
+ doc = xmlNewDoc ((const guchar *)"1.0");
xmlDocSetRootElement (doc, e_table_state_save_to_node (state, NULL));
xmlDocDumpMemory (doc, &string, &length);
xmlFreeDoc (doc);
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index 0d5cd1a..ae4e891 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -84,7 +84,7 @@ etss_get_view_row (ETableSubset *etss,
for (i = initial; i < end; i++) {
if (map_table[i] == row) {
- d(g_print("a) Found %d from %d\n", i, etss->last_access));
+ d (g_print ("a) Found %d from %d\n", i, etss->last_access));
etss->last_access = i;
return i;
}
@@ -92,7 +92,7 @@ etss_get_view_row (ETableSubset *etss,
for (i = initial - 1; i >= start; i--) {
if (map_table[i] == row) {
- d(g_print("b) Found %d from %d\n", i, etss->last_access));
+ d (g_print ("b) Found %d from %d\n", i, etss->last_access));
etss->last_access = i;
return i;
}
@@ -100,7 +100,7 @@ etss_get_view_row (ETableSubset *etss,
for (i = 0; i < n; i++) {
if (map_table[i] == row) {
- d(g_print("c) Found %d from %d\n", i, etss->last_access));
+ d (g_print ("c) Found %d from %d\n", i, etss->last_access));
etss->last_access = i;
return i;
}
@@ -179,7 +179,7 @@ etss_value_at (ETableModel *etm,
g_return_val_if_fail (VALID_ROW (etss, row), NULL);
etss->last_access = row;
- d(g_print("g) Setting last_access to %d\n", row));
+ d (g_print ("g) Setting last_access to %d\n", row));
return e_table_model_value_at (etss->source, col, MAP_ROW (etss, row));
}
@@ -194,7 +194,7 @@ etss_set_value_at (ETableModel *etm,
g_return_if_fail (VALID_ROW (etss, row));
etss->last_access = row;
- d(g_print("h) Setting last_access to %d\n", row));
+ d (g_print ("h) Setting last_access to %d\n", row));
e_table_model_set_value_at (etss->source, col, MAP_ROW (etss, row), val);
}
@@ -227,7 +227,7 @@ etss_get_save_id (ETableModel *etm,
if (e_table_model_has_save_id (etss->source))
return e_table_model_get_save_id (etss->source, MAP_ROW (etss, row));
else
- return g_strdup_printf ("%d", MAP_ROW(etss, row));
+ return g_strdup_printf ("%d", MAP_ROW (etss, row));
}
static void
@@ -557,6 +557,6 @@ e_table_subset_print_debugging (ETableSubset *table_model)
{
gint i;
for (i = 0; i < table_model->n_map; i++) {
- g_print("%8d\n", table_model->map_table[i]);
+ g_print ("%8d\n", table_model->map_table[i]);
}
}
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index da88629..8b10837 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -51,7 +51,7 @@ e_table_state_to_header (GtkWidget *widget,
nh = e_table_header_new ();
g_value_init (val, G_TYPE_DOUBLE);
g_value_set_double (val, e_table_header_width_extras (widget));
- g_object_set_property (G_OBJECT(nh), "width_extras", val);
+ g_object_set_property (G_OBJECT (nh), "width_extras", val);
g_free (val);
for (column = 0; column < state->col_count; column++) {
@@ -128,7 +128,7 @@ et_col_spec_to_col (ETableColumnSpecification *col_spec,
}
col->search = search;
- if (col_spec->sortable && !strcmp(col_spec->sortable, "false"))
+ if (col_spec->sortable && !strcmp (col_spec->sortable, "false"))
col->sortable = FALSE;
else
col->sortable = TRUE;
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index aab2643..a555353 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -720,7 +720,7 @@ e_table_setup_header (ETable *e_table)
gtk_widget_show (GTK_WIDGET (e_table->header_canvas));
- pointer = g_strdup_printf("%p", (gpointer) e_table);
+ pointer = g_strdup_printf ("%p", (gpointer) e_table);
e_table->header_item = gnome_canvas_item_new (
gnome_canvas_root (e_table->header_canvas),
@@ -1787,7 +1787,7 @@ et_real_construct (ETable *e_table,
G_CALLBACK (sort_info_changed), e_table);
g_value_set_object (val, e_table->sort_info);
- g_object_set_property (G_OBJECT(e_table->header), "sort_info", val);
+ g_object_set_property (G_OBJECT (e_table->header), "sort_info", val);
g_free (val);
e_table->sorter = e_table_sorter_new (
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 3ba402d..9280f3c 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -962,12 +962,12 @@ e_tree_model_value_to_string (ETreeModel *etree,
gint col,
gconstpointer value)
{
- g_return_val_if_fail(etree != NULL, g_strdup(""));
+ g_return_val_if_fail (etree != NULL, g_strdup (""));
if (ETM_CLASS (etree)->value_to_string)
return ETM_CLASS (etree)->value_to_string (etree, col, value);
else
- return g_strdup("");
+ return g_strdup ("");
}
/**
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index ecc278b..e88deb4 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -180,7 +180,7 @@ check_last_access (ETreeSorted *ets,
return NULL;
if (ets->priv->last_access == corresponding) {
- d(g_print("Found last access %p at %p.", ets->priv->last_access, ets->priv->last_access));
+ d (g_print ("Found last access %p at %p.", ets->priv->last_access, ets->priv->last_access));
return ets->priv->last_access;
}
@@ -195,14 +195,14 @@ check_last_access (ETreeSorted *ets,
for (i = initial; i < end; i++) {
if (parent->children[i] && parent->children[i]->corresponding == corresponding) {
- d(g_print("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
+ d (g_print ("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
return parent->children[i];
}
}
for (i = initial - 1; i >= start; i--) {
if (parent->children[i] && parent->children[i]->corresponding == corresponding) {
- d(g_print("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
+ d (g_print ("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
return parent->children[i];
}
}
@@ -226,7 +226,7 @@ find_path (ETreeSorted *ets,
check_last = check_last_access (ets, corresponding);
if (check_last) {
- d(g_print(" (find_path)\n"));
+ d (g_print (" (find_path)\n"));
return check_last;
}
@@ -263,7 +263,7 @@ find_path (ETreeSorted *ets,
}
g_free (sequence);
- d(g_print("Didn't find last access %p. Setting to %p. (find_path)\n", ets->priv->last_access, path));
+ d (g_print ("Didn't find last access %p. Setting to %p. (find_path)\n", ets->priv->last_access, path));
ets->priv->last_access = path;
return path;
@@ -305,7 +305,7 @@ find_or_create_path (ETreeSorted *ets,
check_last = check_last_access (ets, corresponding);
if (check_last) {
- d(g_print(" (find_or_create_path)\n"));
+ d (g_print (" (find_or_create_path)\n"));
return check_last;
}
@@ -341,7 +341,7 @@ find_or_create_path (ETreeSorted *ets,
}
g_free (sequence);
- d(g_print("Didn't find last access %p. Setting to %p. (find_or_create_path)\n", ets->priv->last_access, path));
+ d (g_print ("Didn't find last access %p. Setting to %p. (find_or_create_path)\n", ets->priv->last_access, path));
ets->priv->last_access = path;
return path;
@@ -508,20 +508,20 @@ resort_node (ETreeSorted *ets,
e_tree_model_pre_change (E_TREE_MODEL (ets));
if (needs_resort) {
gint i;
- d(g_print("Start sort of node %p\n", path));
+ d (g_print ("Start sort of node %p\n", path));
if (needs_regen)
regenerate_children (ets, path);
- d(g_print("Regened sort of node %p\n", path));
+ d (g_print ("Regened sort of node %p\n", path));
e_table_sorting_utils_tree_sort (E_TREE_MODEL (ets),
ets->priv->sort_info,
ets->priv->full_header,
(ETreePath *) path->children,
path->num_children);
- d(g_print("Renumbering sort of node %p\n", path));
+ d (g_print ("Renumbering sort of node %p\n", path));
for (i = 0; i < path->num_children; i++) {
path->children[i]->position = i;
}
- d(g_print("End sort of node %p\n", path));
+ d (g_print ("End sort of node %p\n", path));
}
if (path->resort_all_children)
resort_all_children = TRUE;
@@ -871,7 +871,7 @@ ets_get_save_id (ETreeModel *etm,
if (e_tree_model_has_save_id (ets->priv->source))
return e_tree_model_get_save_id (ets->priv->source, path->corresponding);
else
- return g_strdup_printf("%p", path->corresponding);
+ return g_strdup_printf ("%p", path->corresponding);
}
static gboolean
@@ -1007,7 +1007,7 @@ ets_proxy_node_changed (ETreeModel *etm,
ETreeSorted *ets)
{
ets->priv->last_access = NULL;
- d(g_print("Setting last access %p. (ets_proxy_node_changed)\n", ets->priv->last_access));
+ d (g_print ("Setting last access %p. (ets_proxy_node_changed)\n", ets->priv->last_access));
if (e_tree_model_node_is_root (ets->priv->source, node)) {
ets_stop_sort_idle (ets);
@@ -1156,7 +1156,7 @@ ets_proxy_node_removed (ETreeModel *etm,
else
path = find_path (ets, child);
- d(g_print("Setting last access %p. (ets_proxy_node_removed)\n ", ets->priv->last_access));
+ d (g_print ("Setting last access %p. (ets_proxy_node_removed)\n ", ets->priv->last_access));
ets->priv->last_access = NULL;
if (path && parent_path && parent_path->num_children != -1) {
@@ -1352,7 +1352,7 @@ e_tree_sorted_view_to_model_path (ETreeSorted *ets,
ETreeSortedPath *path = view_path;
if (path) {
ets->priv->last_access = path;
- d(g_print("Setting last access %p. (e_tree_sorted_view_to_model_path)\n", ets->priv->last_access));
+ d (g_print ("Setting last access %p. (e_tree_sorted_view_to_model_path)\n", ets->priv->last_access));
return path->corresponding;
} else
return NULL;
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 47209c4..4a668d1 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -1027,7 +1027,7 @@ save_expanded_state_func (gpointer keyp,
if (node->expanded != tar->expanded_default) {
gchar *save_id = e_tree_model_get_save_id (tar->model, path);
xmlnode = xmlNewChild (tar->root, NULL, (const guchar *)"node", NULL);
- e_xml_set_string_prop_by_name(xmlnode, (const guchar *)"id", save_id);
+ e_xml_set_string_prop_by_name (xmlnode, (const guchar *)"id", save_id);
g_free (save_id);
}
}
@@ -1098,7 +1098,7 @@ open_file (ETreeTableAdapter *etta,
return NULL;
root = xmlDocGetRootElement (doc);
- if (root == NULL || strcmp ((gchar *)root->name, "expanded_state")) {
+ if (root == NULL || strcmp ((gchar *) root->name, "expanded_state")) {
xmlFreeDoc (doc);
return NULL;
}
@@ -1145,7 +1145,7 @@ e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta,
model_default = e_tree_model_get_expanded_default (etta->priv->source);
- if (!strcmp ((gchar *)root->name, "expanded_state")) {
+ if (!strcmp ((gchar *) root->name, "expanded_state")) {
gchar *state;
state = e_xml_get_string_prop_by_name_with_default (root, (const guchar *)"default", "");
@@ -1169,14 +1169,14 @@ e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta,
gchar *id;
ETreePath path;
- if (strcmp ((gchar *)child->name, "node")) {
- d(g_warning ("unknown node '%s' in %s", child->name, filename));
+ if (strcmp ((gchar *) child->name, "node")) {
+ d (g_warning ("unknown node '%s' in %s", child->name, filename));
continue;
}
id = e_xml_get_string_prop_by_name_with_default (child, (const guchar *)"id", "");
- if (!strcmp(id, "")) {
+ if (!strcmp (id, "")) {
g_free (id);
continue;
}
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 4465dcb..d0922cf 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -391,7 +391,7 @@ connect_header (ETree *e_tree,
g_value_init (val, G_TYPE_OBJECT);
g_value_set_object (val, e_tree->priv->sort_info);
- g_object_set_property (G_OBJECT(e_tree->priv->header), "sort_info", val);
+ g_object_set_property (G_OBJECT (e_tree->priv->header), "sort_info", val);
g_free (val);
}
@@ -734,7 +734,7 @@ e_tree_setup_header (ETree *e_tree)
e_tree->priv->header_canvas = GNOME_CANVAS (widget);
gtk_widget_show (widget);
- pointer = g_strdup_printf("%p", (gpointer) e_tree);
+ pointer = g_strdup_printf ("%p", (gpointer) e_tree);
e_tree->priv->header_item = gnome_canvas_item_new (
gnome_canvas_root (e_tree->priv->header_canvas),
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index 68aef2b..32085fb 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -80,7 +80,7 @@ kill_view_cb (ECellView *subcell_view,
subcell = GAL_A11Y_E_CELL (node->data);
if (subcell && subcell->cell_view == subcell_view)
{
- d(fprintf(stderr, "subcell_view %p deleted before the a11y object %p\n", subcell_view, subcell));
+ d (fprintf (stderr, "subcell_view %p deleted before the a11y object %p\n", subcell_view, subcell));
subcell->cell_view = NULL;
}
}
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 7520c34..1806011 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -207,7 +207,7 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y,
if (view_col == -1)
view_col = 0;
- old_cell = (AtkObject *)g_object_get_data (G_OBJECT (a11y), "gail-focus-object");
+ old_cell = (AtkObject *) g_object_get_data (G_OBJECT (a11y), "gail-focus-object");
if (old_cell && GAL_A11Y_IS_E_CELL (old_cell))
gal_a11y_e_cell_remove_state (
GAL_A11Y_E_CELL (old_cell), ATK_STATE_FOCUSED, FALSE);
@@ -909,7 +909,7 @@ eti_header_structure_changed (ETableHeader *eth,
/* 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) {
for (i = 0; i < prev_n_cols; i ++ ) {
@@ -1184,10 +1184,10 @@ gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
priv = GET_PRIVATE (a11y);
priv->selection_change_id = g_signal_connect (
- G_OBJECT(selection), "selection_changed",
+ G_OBJECT (selection), "selection_changed",
G_CALLBACK (eti_a11y_selection_changed_cb), a11y);
priv->cursor_change_id = g_signal_connect (
- G_OBJECT(selection), "cursor_changed",
+ G_OBJECT (selection), "cursor_changed",
G_CALLBACK (eti_a11y_cursor_changed_cb), a11y);
priv->selection = selection;
diff --git a/widgets/text/e-reflow-model.c b/widgets/text/e-reflow-model.c
index 35d0eaf..1f7aa5e 100644
--- a/widgets/text/e-reflow-model.c
+++ b/widgets/text/e-reflow-model.c
@@ -284,7 +284,7 @@ print_tabs (void)
{
gint i;
for (i = 0; i < depth; i++)
- g_print("\t");
+ g_print ("\t");
}
#endif
@@ -308,7 +308,7 @@ e_reflow_model_changed (EReflowModel *e_reflow_model)
g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model));
d (print_tabs ());
- d(g_print("Emitting model_changed on model 0x%p.\n", e_reflow_model));
+ d (g_print ("Emitting model_changed on model 0x%p.\n", e_reflow_model));
d (depth++);
g_signal_emit (e_reflow_model, signals[MODEL_CHANGED], 0);
d (depth--);
@@ -404,7 +404,7 @@ e_reflow_model_item_changed (EReflowModel *e_reflow_model,
g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model));
d (print_tabs ());
- d(g_print("Emitting item_changed on model 0x%p, n=%d.\n", e_reflow_model, n));
+ d (g_print ("Emitting item_changed on model 0x%p, n=%d.\n", e_reflow_model, n));
d (depth++);
g_signal_emit (e_reflow_model, signals[MODEL_ITEM_CHANGED], 0, n);
d (depth--);
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 240227f..edfaadc 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -138,12 +138,12 @@ e_reflow_update_selection_row (EReflow *reflow,
{
if (reflow->items[row]) {
g_object_set (reflow->items[row],
- "selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(reflow->selection), row),
+ "selected", e_selection_model_is_row_selected (E_SELECTION_MODEL (reflow->selection), row),
NULL);
} else if (e_selection_model_is_row_selected (E_SELECTION_MODEL (reflow->selection), row)) {
reflow->items[row] = e_reflow_model_incarnate (reflow->model, row, GNOME_CANVAS_GROUP (reflow));
g_object_set (reflow->items[row],
- "selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(reflow->selection), row),
+ "selected", e_selection_model_is_row_selected (E_SELECTION_MODEL (reflow->selection), row),
"width", (gdouble) reflow->column_width,
NULL);
}
@@ -298,7 +298,7 @@ incarnate (EReflow *reflow)
if (reflow->model) {
reflow->items[unsorted] = e_reflow_model_incarnate (reflow->model, unsorted, GNOME_CANVAS_GROUP (reflow));
g_object_set (reflow->items[unsorted],
- "selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(reflow->selection), unsorted),
+ "selected", e_selection_model_is_row_selected (E_SELECTION_MODEL (reflow->selection), unsorted),
"width", (gdouble) reflow->column_width,
NULL);
}
diff --git a/widgets/text/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c
index 49274ae..5632665 100644
--- a/widgets/text/gal-a11y-e-text.c
+++ b/widgets/text/gal-a11y-e-text.c
@@ -744,7 +744,7 @@ et_remove_selection (AtkText *text,
if (selection_num == 0
&& etext->selection_start != etext->selection_end) {
etext->selection_end = etext->selection_start;
- g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
+ g_signal_emit_by_name (ATK_OBJECT (text), "text_selection_changed");
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
