From 299521f02c02278857dfd2561973dc0c94e44b57 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 1 Apr 2012 22:31:50 -0400 Subject: Whitespace cleanup. Replace 8-space indentation with tab characters, and various other automated cleanups. --- addressbook/gui/widgets/eab-contact-display.c | 4 +- addressbook/gui/widgets/eab-contact-formatter.c | 216 ++++++++--------- addressbook/gui/widgets/eab-gui-util.c | 4 +- calendar/alarm-notify/alarm-notify-dialog.c | 2 +- calendar/gui/dialogs/select-source-dialog.c | 4 +- calendar/gui/e-calendar-view.c | 18 +- calendar/gui/e-meeting-list-view.c | 8 +- calendar/gui/e-meeting-time-sel.c | 2 +- calendar/gui/itip-utils.c | 8 +- composer/e-msg-composer.c | 2 +- e-util/e-config.c | 2 +- em-format/em-format-quote.c | 128 +++++----- em-format/em-format.c | 30 +-- libemail-engine/e-mail-utils.c | 2 +- libemail-engine/mail-ops.c | 21 +- libemail-engine/mail-ops.h | 8 +- libgnomecanvas/gailcanvas.c | 2 +- libgnomecanvas/gailcanvasgroupfactory.c | 2 +- libgnomecanvas/gnome-canvas-pixbuf.c | 2 +- libgnomecanvas/gnome-canvas-text.c | 34 +-- libgnomecanvas/gnome-canvas-widget.c | 12 +- mail/e-mail-display.c | 222 ++++++++--------- mail/e-mail-printer.c | 30 +-- mail/e-mail-reader-utils.c | 3 +- mail/e-mail-reader.c | 16 +- mail/em-composer-utils.c | 2 +- mail/em-format-html-display.c | 46 ++-- mail/em-format-html-print.c | 40 ++-- mail/em-format-html.c | 110 ++++----- mail/em-utils.c | 2 +- mail/em-vfolder-editor-rule.c | 2 +- mail/mail-send-recv.c | 5 +- modules/calendar/e-memo-shell-view-private.c | 2 +- plugins/email-custom-header/email-custom-header.c | 6 +- plugins/itip-formatter/itip-formatter.c | 90 +++---- plugins/itip-formatter/itip-view.c | 280 +++++++++++----------- plugins/tnef-attachments/tnef-plugin.c | 198 +++++++-------- shell/main.c | 4 +- smclient/eggdesktopfile.c | 4 +- widgets/misc/e-web-view.c | 38 +-- widgets/table/e-table-item.c | 2 +- widgets/table/gal-a11y-e-cell-toggle.c | 2 +- widgets/table/gal-a11y-e-cell-tree.c | 2 +- widgets/table/gal-a11y-e-table-item.c | 2 +- 44 files changed, 810 insertions(+), 809 deletions(-) diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index fe1728c3b1..6d83966844 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -501,8 +501,8 @@ eab_contact_display_init (EABContactDisplay *display) display->priv->formatter = g_object_new ( EAB_TYPE_CONTACT_FORMATTER, - "display-mode", EAB_CONTACT_DISPLAY_RENDER_NORMAL, - "render-maps", FALSE, NULL); + "display-mode", EAB_CONTACT_DISPLAY_RENDER_NORMAL, + "render-maps", FALSE, NULL); web_view = E_WEB_VIEW (display); ui_manager = e_web_view_get_ui_manager (web_view); diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c index c0ca4ed524..0531087295 100644 --- a/addressbook/gui/widgets/eab-contact-formatter.c +++ b/addressbook/gui/widgets/eab-contact-formatter.c @@ -143,7 +143,7 @@ render_address_link (GString *buffer, gint map_type) { EContactAddress *adr; - GString *link = g_string_new (""); + GString *link = g_string_new (""); adr = e_contact_get (contact, map_type); if (adr && @@ -166,8 +166,8 @@ render_address_link (GString *buffer, g_string_assign (link, escaped); g_free (escaped); - g_string_prepend (link, "%s", _("Open map")); + g_string_prepend (link, "%s", _("Open map")); } if (adr) @@ -186,7 +186,7 @@ accum_address (GString *buffer, { EContactAddress *adr; const gchar *label; - GString *map_link = g_string_new ("
"); + GString *map_link = g_string_new ("
"); render_address_link (map_link, contact, adr_field); @@ -265,7 +265,7 @@ accum_address (GString *buffer, "" "", html_label, map_link->str); } else { - g_string_append_printf (buffer, ""); + g_string_append_printf (buffer, ""); } } @@ -293,27 +293,27 @@ render_table_row (GString *buffer, if (icon) { gchar *icon_uri = get_icon_uri (icon); - icon_html = g_strdup_printf ("", icon_uri); + icon_html = g_strdup_printf ("", icon_uri); g_free (icon_uri); } else { - icon_html = ""; + icon_html = ""; } if (TEXT_IS_RIGHT_TO_LEFT) { g_string_append_printf ( - buffer, "" - "%s" - ":%s" - "%s" - "", + buffer, "" + "%s" + ":%s" + "%s" + "", value, label, icon_html); } else { g_string_append_printf ( - buffer, "" - "%s" - "%s:" - "%s" - "", + buffer, "" + "%s" + "%s:" + "%s" + "", icon_html, label, value); } @@ -354,7 +354,7 @@ accum_time_attribute (GString *buffer, gdate = g_date_new_dmy ( date->day, date->month, date->year ); - g_date_strftime (sdate, 100, "%x", gdate); + g_date_strftime (sdate, 100, "%x", gdate); g_date_free (gdate); render_table_row (buffer, html_label, sdate, icon, html_flags); e_contact_date_free (date); @@ -370,13 +370,13 @@ accum_attribute_multival (GString *buffer, guint html_flags) { GList *val_list, *l; - GString *val = g_string_new (""); + GString *val = g_string_new (""); val_list = e_contact_get (contact, field); for (l = val_list; l; l = l->next) { if (l != val_list) - g_string_append (val, "
"); + g_string_append (val, "
"); g_string_append (val, l->data); } @@ -399,7 +399,7 @@ get_email_location (EVCardAttribute *attr) return _(common_location[i].pretty_name); } - return _("Other"); + return _("Other"); } static void @@ -416,8 +416,8 @@ render_title_block (EABContactFormatter *formatter, g_string_append_printf ( buffer, "" - "
", TEXT_IS_RIGHT_TO_LEFT ? - "align=\"right\"" : ""); + "", TEXT_IS_RIGHT_TO_LEFT ? + "align=\"right\"" : ""); photo = e_contact_get (contact, E_CONTACT_PHOTO); if (!photo) @@ -442,14 +442,14 @@ render_title_block (EABContactFormatter *formatter, if (e_contact_get (contact, E_CONTACT_IS_LIST)) { gchar *icon = get_icon_uri (CONTACT_LIST_ICON); - g_string_append_printf (buffer, "", icon); + g_string_append_printf (buffer, "", icon); g_free (icon); } g_string_append_printf ( buffer, "\n", - TEXT_IS_RIGHT_TO_LEFT ? "align=\"right\"" : ""); + TEXT_IS_RIGHT_TO_LEFT ? "align=\"right\"" : ""); str = e_contact_get_const (contact, E_CONTACT_FILE_AS); if (!str) @@ -463,12 +463,12 @@ render_title_block (EABContactFormatter *formatter, "

%s

", html); } else { - g_string_append_printf (buffer, "

%s

", html); + g_string_append_printf (buffer, "

%s

", html); } g_free (html); } - g_string_append (buffer, "
"); + g_string_append (buffer, ""); } static void @@ -487,11 +487,11 @@ render_contact_list_row (EABContactFormatter *formatter, if (!eab_parse_qp_email (textrep, &name, &email_addr)) email_addr = g_strdup (textrep); - g_string_append (buffer, ""); + g_string_append (buffer, ""); if (e_destination_is_evolution_list (destination)) { g_string_append_printf ( buffer, - "" + "" "" @@ -513,10 +513,10 @@ render_contact_list_row (EABContactFormatter *formatter, formatter, dest->data, buffer); } - g_string_append (buffer, ""); + g_string_append (buffer, ""); } - g_string_append (buffer, ""); + g_string_append (buffer, ""); } else { if (name && *name) { @@ -536,7 +536,7 @@ render_contact_list_row (EABContactFormatter *formatter, } } - g_string_append (buffer, ""); + g_string_append (buffer, ""); g_free (evolution_imagesdir); g_free (name); @@ -564,13 +564,13 @@ render_contact_list (EABContactFormatter *formatter, "" "
%s
", _("List Members:")); - g_string_append (buffer, ""); + g_string_append (buffer, "
"); for (dest = dests; dest; dest = dest->next) render_contact_list_row (formatter, dest->data, buffer); - g_string_append (buffer, "
"); - g_string_append (buffer, "
"); + g_string_append (buffer, ""); + g_string_append (buffer, ""); g_object_unref (destination); } @@ -586,8 +586,8 @@ render_contact_column (EABContactFormatter *formatter, const gchar *nl; contact = formatter->priv->contact; - email = g_string_new (""); - nl = ""; + email = g_string_new (""); + nl = ""; email_list = e_contact_get (contact, E_CONTACT_EMAIL); email_attr_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL); @@ -604,14 +604,14 @@ render_contact_column (EABContactFormatter *formatter, "%s%s%s%s%s " "(%s)", nl, - name ? name : "", - name ? " <" : "", + name ? name : "", + name ? " <" : "", email_num, mail, - name ? ">" : "", - attr_str ? attr_str : ""); + name ? ">" : "", + attr_str ? attr_str : ""); email_num++; - nl = "
"; + nl = "
"; g_free (name); g_free (mail); @@ -621,27 +621,27 @@ render_contact_column (EABContactFormatter *formatter, g_list_free (email_list); g_list_free (email_attr_list); - accum = g_string_new (""); + accum = g_string_new (""); if (email->len) - render_table_row (accum, _("Email"), email->str, NULL, 0); - - accum_attribute (accum, contact, _("Nickname"), E_CONTACT_NICKNAME, NULL, 0); - accum_attribute_multival (accum, contact, _("AIM"), E_CONTACT_IM_AIM, AIM_ICON, 0); - accum_attribute_multival (accum, contact, _("GroupWise"), E_CONTACT_IM_GROUPWISE, GROUPWISE_ICON, 0); - accum_attribute_multival (accum, contact, _("ICQ"), E_CONTACT_IM_ICQ, ICQ_ICON, 0); - accum_attribute_multival (accum, contact, _("Jabber"), E_CONTACT_IM_JABBER, JABBER_ICON, 0); - accum_attribute_multival (accum, contact, _("MSN"), E_CONTACT_IM_MSN, MSN_ICON, 0); - accum_attribute_multival (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0); - accum_attribute_multival (accum, contact, _("Gadu-Gadu"), E_CONTACT_IM_GADUGADU, GADUGADU_ICON, 0); - accum_attribute_multival (accum, contact, _("Skype"), E_CONTACT_IM_SKYPE, SKYPE_ICON, 0); + render_table_row (accum, _("Email"), email->str, NULL, 0); + + accum_attribute (accum, contact, _("Nickname"), E_CONTACT_NICKNAME, NULL, 0); + accum_attribute_multival (accum, contact, _("AIM"), E_CONTACT_IM_AIM, AIM_ICON, 0); + accum_attribute_multival (accum, contact, _("GroupWise"), E_CONTACT_IM_GROUPWISE, GROUPWISE_ICON, 0); + accum_attribute_multival (accum, contact, _("ICQ"), E_CONTACT_IM_ICQ, ICQ_ICON, 0); + accum_attribute_multival (accum, contact, _("Jabber"), E_CONTACT_IM_JABBER, JABBER_ICON, 0); + accum_attribute_multival (accum, contact, _("MSN"), E_CONTACT_IM_MSN, MSN_ICON, 0); + accum_attribute_multival (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0); + accum_attribute_multival (accum, contact, _("Gadu-Gadu"), E_CONTACT_IM_GADUGADU, GADUGADU_ICON, 0); + accum_attribute_multival (accum, contact, _("Skype"), E_CONTACT_IM_SKYPE, SKYPE_ICON, 0); if (accum->len) g_string_append_printf ( buffer, - "
" - "%s
" - "
", accum->str); + "
" + "%s
" + "
", accum->str); g_string_free (accum, TRUE); g_string_free (email, TRUE); @@ -654,19 +654,19 @@ accum_address_map (GString *buffer, { #ifdef WITH_CONTACT_MAPS - g_string_append (buffer, ""); + g_string_append (buffer, ""); if (map_type == E_CONTACT_ADDRESS_WORK) { g_string_append (buffer, - ""); + ""); } else { g_string_append (buffer, - ""); + ""); } - g_string_append (buffer, ""); + g_string_append (buffer, ""); #endif } @@ -676,30 +676,30 @@ render_work_column (EABContactFormatter *formatter, GString *buffer) { EContact *contact = formatter->priv->contact; - GString *accum = g_string_new (""); - - accum_attribute (accum, contact, _("Company"), E_CONTACT_ORG, NULL, 0); - accum_attribute (accum, contact, _("Department"), E_CONTACT_ORG_UNIT, NULL, 0); - accum_attribute (accum, contact, _("Profession"), E_CONTACT_ROLE, NULL, 0); - accum_attribute (accum, contact, _("Position"), E_CONTACT_TITLE, NULL, 0); - accum_attribute (accum, contact, _("Manager"), E_CONTACT_MANAGER, NULL, 0); - accum_attribute (accum, contact, _("Assistant"), E_CONTACT_ASSISTANT, NULL, 0); - accum_attribute (accum, contact, _("Video Chat"), E_CONTACT_VIDEO_URL, VIDEOCONF_ICON, E_TEXT_TO_HTML_CONVERT_URLS); - accum_attribute (accum, contact, _("Calendar"), E_CONTACT_CALENDAR_URI, NULL, E_TEXT_TO_HTML_CONVERT_URLS); - accum_attribute (accum, contact, _("Free/Busy"), E_CONTACT_FREEBUSY_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS); - accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_BUSINESS, NULL, 0); - accum_attribute (accum, contact, _("Fax"), E_CONTACT_PHONE_BUSINESS_FAX, NULL, 0); - accum_address (accum, contact, _("Address"), E_CONTACT_ADDRESS_WORK, E_CONTACT_ADDRESS_LABEL_WORK); + GString *accum = g_string_new (""); + + accum_attribute (accum, contact, _("Company"), E_CONTACT_ORG, NULL, 0); + accum_attribute (accum, contact, _("Department"), E_CONTACT_ORG_UNIT, NULL, 0); + accum_attribute (accum, contact, _("Profession"), E_CONTACT_ROLE, NULL, 0); + accum_attribute (accum, contact, _("Position"), E_CONTACT_TITLE, NULL, 0); + accum_attribute (accum, contact, _("Manager"), E_CONTACT_MANAGER, NULL, 0); + accum_attribute (accum, contact, _("Assistant"), E_CONTACT_ASSISTANT, NULL, 0); + accum_attribute (accum, contact, _("Video Chat"), E_CONTACT_VIDEO_URL, VIDEOCONF_ICON, E_TEXT_TO_HTML_CONVERT_URLS); + accum_attribute (accum, contact, _("Calendar"), E_CONTACT_CALENDAR_URI, NULL, E_TEXT_TO_HTML_CONVERT_URLS); + accum_attribute (accum, contact, _("Free/Busy"), E_CONTACT_FREEBUSY_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS); + accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_BUSINESS, NULL, 0); + accum_attribute (accum, contact, _("Fax"), E_CONTACT_PHONE_BUSINESS_FAX, NULL, 0); + accum_address (accum, contact, _("Address"), E_CONTACT_ADDRESS_WORK, E_CONTACT_ADDRESS_LABEL_WORK); if (formatter->priv->render_maps) accum_address_map (accum, contact, E_CONTACT_ADDRESS_WORK); if (accum->len > 0) { g_string_append_printf ( buffer, - "
" - "

%s

" - "%s
" - "
", _("Work"), accum->str); + "
" + "

%s

" + "%s
" + "
", _("Work"), accum->str); } g_string_free (accum, TRUE); @@ -710,26 +710,26 @@ render_personal_column (EABContactFormatter *formatter, GString *buffer) { EContact *contact = formatter->priv->contact; - GString *accum = g_string_new (""); - - accum_attribute (accum, contact, _("Home Page"), E_CONTACT_HOMEPAGE_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS); - accum_attribute (accum, contact, _("Web Log"), E_CONTACT_BLOG_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS); - accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_HOME, NULL, 0); - accum_attribute (accum, contact, _("Mobile Phone"), E_CONTACT_PHONE_MOBILE, NULL, 0); - accum_address (accum, contact, _("Address"), E_CONTACT_ADDRESS_HOME, E_CONTACT_ADDRESS_LABEL_HOME); - accum_time_attribute (accum, contact, _("Birthday"), E_CONTACT_BIRTH_DATE, NULL, 0); - accum_time_attribute (accum, contact, _("Anniversary"), E_CONTACT_ANNIVERSARY, NULL, 0); - accum_attribute (accum, contact, _("Spouse"), E_CONTACT_SPOUSE, NULL, 0); + GString *accum = g_string_new (""); + + accum_attribute (accum, contact, _("Home Page"), E_CONTACT_HOMEPAGE_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS); + accum_attribute (accum, contact, _("Web Log"), E_CONTACT_BLOG_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS); + accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_HOME, NULL, 0); + accum_attribute (accum, contact, _("Mobile Phone"), E_CONTACT_PHONE_MOBILE, NULL, 0); + accum_address (accum, contact, _("Address"), E_CONTACT_ADDRESS_HOME, E_CONTACT_ADDRESS_LABEL_HOME); + accum_time_attribute (accum, contact, _("Birthday"), E_CONTACT_BIRTH_DATE, NULL, 0); + accum_time_attribute (accum, contact, _("Anniversary"), E_CONTACT_ANNIVERSARY, NULL, 0); + accum_attribute (accum, contact, _("Spouse"), E_CONTACT_SPOUSE, NULL, 0); if (formatter->priv->render_maps) accum_address_map (accum, contact, E_CONTACT_ADDRESS_HOME); if (accum->len > 0) { g_string_append_printf ( buffer, - "
" - "

%s

" - "%s
" - "
", _("Personal"), accum->str); + "
" + "

%s

" + "%s
" + "
", _("Personal"), accum->str); } g_string_free (accum, TRUE); @@ -760,7 +760,7 @@ render_footer (EABContactFormatter *formatter, E_TEXT_TO_HTML_CONVERT_URLS | E_TEXT_TO_HTML_CONVERT_NL); - g_string_append (buffer, ""); + g_string_append (buffer, ""); } static void @@ -769,11 +769,11 @@ render_contact (EABContactFormatter *formatter, { render_title_block (formatter, buffer); - g_string_append (buffer, "
"); + g_string_append (buffer, "
"); render_contact_column (formatter, buffer); render_work_column (formatter, buffer); render_personal_column (formatter, buffer); - g_string_append (buffer, "
"); + g_string_append (buffer, "
"); render_footer (formatter, buffer); } @@ -783,7 +783,7 @@ render_normal (EABContactFormatter *formatter, GString *buffer) { g_string_append (buffer, HTML_HEADER); - g_string_append (buffer, ""); + g_string_append (buffer, ""); if (formatter->priv->contact) { @@ -799,7 +799,7 @@ render_normal (EABContactFormatter *formatter, } - g_string_append (buffer, "\n"); + g_string_append (buffer, "\n"); } static void @@ -1137,9 +1137,9 @@ eab_contact_formatter_class_init (EABContactFormatterClass *klass) object_class, PROP_DISPLAY_MODE, g_param_spec_int ( - "display-mode", - "", - "", + "display-mode", + "", + "", EAB_CONTACT_DISPLAY_RENDER_NORMAL, EAB_CONTACT_DISPLAY_RENDER_COMPACT, EAB_CONTACT_DISPLAY_RENDER_NORMAL, @@ -1149,9 +1149,9 @@ eab_contact_formatter_class_init (EABContactFormatterClass *klass) object_class, PROP_RENDER_MAPS, g_param_spec_boolean ( - "render-maps", - "", - "", + "render-maps", + "", + "", FALSE, G_PARAM_READWRITE)); } @@ -1177,7 +1177,7 @@ eab_contact_formatter_set_display_mode (EABContactFormatter *formatter, formatter->priv->mode = mode; - g_object_notify (G_OBJECT (formatter), "display-mode"); + g_object_notify (G_OBJECT (formatter), "display-mode"); } EABContactDisplayMode @@ -1200,7 +1200,7 @@ eab_contact_formatter_set_render_maps (EABContactFormatter *formatter, formatter->priv->render_maps = render_maps; - g_object_notify (G_OBJECT (formatter), "render-maps"); + g_object_notify (G_OBJECT (formatter), "render-maps"); } gboolean diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index b1c8cdc898..887ffc845c 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -1037,14 +1037,14 @@ parse_address_template_section (const gchar *format, if (ret && (pos >= format + 2) && /* If there's something before %, */ (g_ascii_strcasecmp (pos - 2, "\n") != 0) && /* And if it is not a newline */ (g_ascii_strcasecmp (pos - 2, "%w") != 0)) /* Nor whitespace */ - g_string_append (res, ", "); + g_string_append (res, ", "); pos += 2; break; case 'w': if (ret && (pos >= format + 2) && (g_ascii_strcasecmp (pos - 2, "\n") != 0) && (g_ascii_strcasecmp (pos - 1, " ") != 0)) - g_string_append (res, " "); + g_string_append (res, " "); pos += 2; break; case '0': { diff --git a/calendar/alarm-notify/alarm-notify-dialog.c b/calendar/alarm-notify/alarm-notify-dialog.c index eec926cf94..fc37d881a8 100644 --- a/calendar/alarm-notify/alarm-notify-dialog.c +++ b/calendar/alarm-notify/alarm-notify-dialog.c @@ -332,7 +332,7 @@ notified_alarms_dialog_new (void) renderer, "text", ALARM_DISPLAY_COLUMN, NULL); gtk_tree_view_column_set_attributes (column, renderer, - "markup", ALARM_DISPLAY_COLUMN, NULL); + "markup", ALARM_DISPLAY_COLUMN, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (an->treeview), column); diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index 12bceb2ca8..740428ae49 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -51,7 +51,7 @@ select_source_dialog (GtkWindow *parent, else if (obj_type == E_CAL_CLIENT_SOURCE_TYPE_TASKS) gconf_key = "/apps/evolution/tasks/sources"; else if (obj_type == E_CAL_CLIENT_SOURCE_TYPE_MEMOS) - gconf_key = "/apps/evolution/memos/sources"; + gconf_key = "/apps/evolution/memos/sources"; else return NULL; @@ -66,7 +66,7 @@ select_source_dialog (GtkWindow *parent, else if (obj_type == E_CAL_CLIENT_SOURCE_TYPE_TASKS) icon_name = "stock_todo"; else if (obj_type == E_CAL_CLIENT_SOURCE_TYPE_MEMOS) - icon_name = "stock_journal"; + icon_name = "stock_journal"; if (icon_name) gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 413e54a3b3..17d5a43965 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -345,7 +345,7 @@ calendar_view_dispose (GObject *object) gtk_target_list_unref (priv->paste_target_list); priv->paste_target_list = NULL; } - + if (priv->selected_cut_list) { g_slist_foreach (priv->selected_cut_list, (GFunc) g_object_unref, NULL); g_slist_free (priv->selected_cut_list); @@ -473,13 +473,13 @@ calendar_view_cut_clipboard (ESelectable *selectable) #endif e_selectable_copy_clipboard (selectable); - + for (l = selected; l != NULL; l = g_list_next (l)) { ECalendarViewEvent *event = (ECalendarViewEvent *) l->data; priv->selected_cut_list = g_slist_prepend (priv->selected_cut_list, g_object_ref (event->comp_data)); } - + #if 0 /* KILL-BONOBO */ e_calendar_view_set_status_message (cal_view, NULL, -1); #endif @@ -553,7 +553,7 @@ calendar_view_copy_clipboard (ESelectable *selectable) selected = e_calendar_view_get_selected_events (cal_view); if (!selected) return; - + if (priv->selected_cut_list) { g_slist_foreach (priv->selected_cut_list, (GFunc) g_object_unref, NULL); g_slist_free (priv->selected_cut_list); @@ -607,7 +607,7 @@ calendar_view_copy_clipboard (ESelectable *selectable) static gboolean clipboard_get_calendar_data (ECalendarView *cal_view, const gchar *text, - GSList **copied_list) + GSList **copied_list) { icalcomponent *icalcomp; icalcomponent_kind kind; @@ -725,12 +725,12 @@ calendar_view_paste_clipboard (ESelectable *selectable) GSList *copied_list = NULL, *l; calendar_source = e_clipboard_wait_for_calendar (clipboard); - + if (priv->selected_cut_list) clipboard_get_calendar_data (cal_view, calendar_source, &copied_list); else clipboard_get_calendar_data (cal_view, calendar_source, NULL); - + if (copied_list && priv->selected_cut_list) { for (l = priv->selected_cut_list; l != NULL; l = l->next) { ECalComponent *comp; @@ -780,13 +780,13 @@ calendar_view_paste_clipboard (ESelectable *selectable) g_object_unref (comp); } } - + if (priv->selected_cut_list) { g_slist_foreach (priv->selected_cut_list, (GFunc) g_object_unref, NULL); g_slist_free (priv->selected_cut_list); } priv->selected_cut_list = NULL; - + g_free (calendar_source); } diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 08ff03f86f..76d20d2f64 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -176,10 +176,10 @@ get_type_strings (void) GList *strings = NULL; strings = g_list_append (strings, (gchar *) _("Individual")); - strings = g_list_append (strings, (gchar *) _("Group")); - strings = g_list_append (strings, (gchar *) _("Resource")); - strings = g_list_append (strings, (gchar *) _("Room")); - strings = g_list_append (strings, (gchar *) _("Unknown")); + strings = g_list_append (strings, (gchar *) _("Group")); + strings = g_list_append (strings, (gchar *) _("Resource")); + strings = g_list_append (strings, (gchar *) _("Room")); + strings = g_list_append (strings, (gchar *) _("Unknown")); return strings; } diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index cfbff11d2b..7e9c59c895 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -1073,7 +1073,7 @@ e_meeting_time_selector_create_no_info_pattern (EMeetingTimeSelector *mts) CAIRO_CONTENT_COLOR, 8, 8); cr = cairo_create (surface); - gdk_color_parse ("white", &color); + gdk_color_parse ("white", &color); gdk_cairo_set_source_color (cr, &color); cairo_paint (cr); diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index e58f2f9c7e..ba2c174528 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -928,13 +928,13 @@ comp_description (ECalComponent *comp, switch (e_cal_component_get_vtype (comp)) { case E_CAL_COMPONENT_EVENT: - description = g_strdup (_("Event information")); + description = g_strdup (_("Event information")); break; case E_CAL_COMPONENT_TODO: - description = g_strdup (_("Task information")); + description = g_strdup (_("Task information")); break; case E_CAL_COMPONENT_JOURNAL: - description = g_strdup (_("Memo information")); + description = g_strdup (_("Memo information")); break; case E_CAL_COMPONENT_FREEBUSY: e_cal_component_get_dtstart (comp, &dt); @@ -957,7 +957,7 @@ comp_description (ECalComponent *comp, g_free (end); break; default: - description = g_strdup (_("iCalendar information")); + description = g_strdup (_("iCalendar information")); break; } diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 94ec464db2..39edcdba43 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -4047,7 +4047,7 @@ handle_mailto (EMsgComposer *composer, if (file_is_blacklisted (content)) e_alert_submit ( E_ALERT_SINK (composer), - "mail:blacklisted-file", + "mail:blacklisted-file", content, NULL); if (g_ascii_strncasecmp (content, "file:", 5) == 0) attachment = e_attachment_new_for_uri (content); diff --git a/e-util/e-config.c b/e-util/e-config.c index 7bb6038dbd..7da480ab56 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -844,7 +844,7 @@ ec_rebuild (EConfig *emp) if (page) { const gchar *empty_xpm_img[] = { "75 1 2 1", - " c None", + " c None", ". c #FFFFFF", " "}; diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c index e21762bb95..2ee8ddb2e9 100644 --- a/em-format/em-format-quote.c +++ b/em-format/em-format-quote.c @@ -132,10 +132,10 @@ emfq_format_text_header (EMFormatQuote *emfq, if (flags & EM_FORMAT_HEADER_BOLD) g_string_append_printf ( - buffer, "%s: %s
", label, html); + buffer, "%s: %s
", label, html); else g_string_append_printf ( - buffer, "%s: %s
", label, html); + buffer, "%s: %s
", label, html); g_free (mhtml); } @@ -173,18 +173,18 @@ emfq_format_address (GString *out, if (name && *name) { gchar *real, *mailaddr; - g_string_append_printf (out, "%s <", name); + g_string_append_printf (out, "%s <", name); /* 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, "?=&()"); + mailto = camel_url_encode (mailaddr, "?=&()"); g_free (mailaddr); } else { - mailto = camel_url_encode (a->v.addr, "?=&()"); + mailto = camel_url_encode (a->v.addr, "?=&()"); } } else { - mailto = camel_url_encode (a->v.addr, "?=&()"); + mailto = camel_url_encode (a->v.addr, "?=&()"); } addr = camel_text_to_html (a->v.addr, flags, 0); g_string_append_printf ( @@ -194,15 +194,15 @@ emfq_format_address (GString *out, g_free (addr); if (name && *name) - g_string_append (out, ">"); + g_string_append (out, ">"); break; case CAMEL_HEADER_ADDRESS_GROUP: - g_string_append_printf (out, "%s: ", name); + g_string_append_printf (out, "%s: ", name); emfq_format_address (out, a->v.members); - g_string_append_printf (out, ";"); + g_string_append_printf (out, ";"); break; default: - g_warning ("Invalid address type"); + g_warning ("Invalid address type"); break; } @@ -210,7 +210,7 @@ emfq_format_address (GString *out, a = a->next; if (a) - g_string_append (out, ", "); + g_string_append (out, ", "); } } @@ -259,7 +259,7 @@ emfq_format_header (EMFormat *emf, canon_header_name (name); /* Never quote Bcc headers */ - if (g_str_equal (name, "Bcc") || g_str_equal (name, "Resent-Bcc")) + if (g_str_equal (name, "Bcc") || g_str_equal (name, "Resent-Bcc")) return; for (i = 0; addrspec_hdrs[i]; i++) { @@ -289,29 +289,29 @@ emfq_format_header (EMFormat *emf, g_free (buf); - html = g_string_new (""); + html = g_string_new (""); emfq_format_address (html, addrs); camel_header_address_unref (addrs); txt = value = html->str; g_string_free (html, FALSE); flags |= EM_FORMAT_HEADER_BOLD; is_html = TRUE; - } else if (!strcmp (name, "Subject")) { + } else if (!strcmp (name, "Subject")) { txt = camel_mime_message_get_subject (msg); - label = _("Subject"); + label = _("Subject"); flags |= EM_FORMAT_HEADER_BOLD; - } else if (!strcmp (name, "X-Evolution-Mailer")) { /* pseudo-header */ - if (!(txt = camel_medium_get_header (part, "x-mailer"))) - if (!(txt = camel_medium_get_header (part, "user-agent"))) - if (!(txt = camel_medium_get_header (part, "x-newsreader"))) - if (!(txt = camel_medium_get_header (part, "x-mimeole"))) + } else if (!strcmp (name, "X-Evolution-Mailer")) { /* pseudo-header */ + if (!(txt = camel_medium_get_header (part, "x-mailer"))) + if (!(txt = camel_medium_get_header (part, "user-agent"))) + if (!(txt = camel_medium_get_header (part, "x-newsreader"))) + if (!(txt = camel_medium_get_header (part, "x-mimeole"))) return; txt = value = camel_header_format_ctext (txt, charset); - label = _("Mailer"); + label = _("Mailer"); flags |= EM_FORMAT_HEADER_BOLD; - } else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) { + } else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) { if (!(txt = camel_medium_get_header (part, name))) return; @@ -342,7 +342,7 @@ emfq_format_headers (EMFormatQuote *emfq, return; ct = camel_mime_part_get_content_type ((CamelMimePart *) part); - charset = camel_content_type_param (ct, "charset"); + charset = camel_content_type_param (ct, "charset"); charset = camel_iconv_charset_name (charset); /* dump selected headers */ @@ -354,7 +354,7 @@ emfq_format_headers (EMFormatQuote *emfq, link = g_list_next (link); } - g_string_append (buffer, "
\n"); + g_string_append (buffer, "
\n"); } static void @@ -379,18 +379,18 @@ emfq_finalize (GObject *object) /******************************************************************************/ static void -emfq_parse_text_plain (EMFormat * emf, - CamelMimePart * part, - GString * part_id, - EMFormatParserInfo * info, - GCancellable * cancellable) +emfq_parse_text_plain (EMFormat *emf, + CamelMimePart *part, + GString *part_id, + EMFormatParserInfo *info, + GCancellable *cancellable) { EMFormatPURI *puri; CamelMimePart *mp; gint len; len = part_id->len; - g_string_append (part_id, ".text_plain"); + g_string_append (part_id, ".text_plain"); mp = decode_inline_parts (part, cancellable); if (mp) { @@ -404,70 +404,70 @@ emfq_parse_text_plain (EMFormat * emf, puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str); puri->write_func = emfq_write_text_plain; - puri->mime_type = g_strdup ("text/html"); + puri->mime_type = g_strdup ("text/html"); em_format_add_puri (emf, puri); g_string_truncate (part_id, len); } static void -emfq_parse_text_html (EMFormat * emf, - CamelMimePart * part, - GString * part_id, - EMFormatParserInfo * info, - GCancellable * cancellable) +emfq_parse_text_html (EMFormat *emf, + CamelMimePart *part, + GString *part_id, + EMFormatParserInfo *info, + GCancellable *cancellable) { EMFormatPURI *puri; gint len; len = part_id->len; - g_string_append (part_id, ".text_html"); + g_string_append (part_id, ".text_html"); puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str); puri->write_func = emfq_write_text_html; - puri->mime_type = g_strdup ("text/html"); + puri->mime_type = g_strdup ("text/html"); em_format_add_puri (emf, puri); g_string_truncate (part_id, len); } static void -emfq_parse_text_enriched (EMFormat * emf, - CamelMimePart * part, - GString * part_id, - EMFormatParserInfo * info, - GCancellable * cancellable) +emfq_parse_text_enriched (EMFormat *emf, + CamelMimePart *part, + GString *part_id, + EMFormatParserInfo *info, + GCancellable *cancellable) { EMFormatPURI *puri; gint len; len = part_id->len; - g_string_append (part_id, ".text_enriched"); + g_string_append (part_id, ".text_enriched"); puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str); puri->write_func = emfq_write_text_enriched; - puri->mime_type = g_strdup ("text/html"); + puri->mime_type = g_strdup ("text/html"); em_format_add_puri (emf, puri); g_string_truncate (part_id, len); } static void -emfq_parse_attachment (EMFormat * emf, - CamelMimePart * part, - GString * part_id, - EMFormatParserInfo * info, - GCancellable * cancellable) +emfq_parse_attachment (EMFormat *emf, + CamelMimePart *part, + GString *part_id, + EMFormatParserInfo *info, + GCancellable *cancellable) { EMFormatPURI *puri; gint len; len = part_id->len; - g_string_append (part_id, ".attachment"); + g_string_append (part_id, ".attachment"); puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str); puri->write_func = emfq_write_text_html; - puri->mime_type = g_strdup ("text/html"); + puri->mime_type = g_strdup ("text/html"); puri->is_attachment = TRUE; em_format_add_puri (emf, puri); @@ -604,9 +604,9 @@ em_format_quote_new (CamelSession *session, } void -em_format_quote_write (EMFormatQuote * emfq, - CamelStream * stream, - GCancellable * cancellable) +em_format_quote_write (EMFormatQuote *emfq, + CamelStream *stream, + GCancellable *cancellable) { EMFormat *emf; GSettings *settings; @@ -627,18 +627,18 @@ em_format_quote_write (EMFormatQuote * emfq, g_object_unref (settings); if (emfq->priv->credits && *emfq->priv->credits) { - gchar *credits = g_strdup_printf ("%s
", emfq->priv->credits); + gchar *credits = g_strdup_printf ("%s
", emfq->priv->credits); camel_stream_write_string (stream, credits, cancellable, NULL); g_free (credits); } else { - camel_stream_write_string (stream, "
", cancellable, NULL); + camel_stream_write_string (stream, "
", cancellable, NULL); } if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE) camel_stream_write_string (stream, - "\n" - "
\n", cancellable, NULL); + "\n" + "
\n", cancellable, NULL); for (iter = emf->mail_part_list; iter; iter = iter->next) { EMFormatPURI *puri = iter->data; @@ -649,7 +649,7 @@ em_format_quote_write (EMFormatQuote * emfq, puri = iter->data; if (emfq->priv->flags & EM_FORMAT_QUOTE_HEADERS) { - GString *buffer = g_string_new (""); + GString *buffer = g_string_new (""); emfq_format_headers (emfq, buffer, (CamelMedium *) puri->part); camel_stream_write_string (stream, buffer->str, cancellable, NULL); g_string_free (buffer, TRUE); @@ -660,8 +660,8 @@ em_format_quote_write (EMFormatQuote * emfq, if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE) camel_stream_write_string ( - stream, "
", + stream, "
", cancellable, NULL); } diff --git a/em-format/em-format.c b/em-format/em-format.c index 6dfca51d61..071403d785 100644 --- a/em-format/em-format.c +++ b/em-format/em-format.c @@ -1107,11 +1107,11 @@ em_format_empty_writer (EMFormat *emf, } static void -emf_write_error (EMFormat * emf, - EMFormatPURI * puri, - CamelStream * stream, - EMFormatWriterInfo * info, - GCancellable * cancellable) +emf_write_error (EMFormat *emf, + EMFormatPURI *puri, + CamelStream *stream, + EMFormatWriterInfo *info, + GCancellable *cancellable) { camel_data_wrapper_decode_to_stream_sync ((CamelDataWrapper *) puri->part, stream, cancellable, NULL); @@ -1720,7 +1720,7 @@ em_format_add_header_struct (EMFormat *emf, } void -em_format_remove_header (EMFormat * emf, +em_format_remove_header (EMFormat *emf, const gchar *name, const gchar *value) { @@ -1761,8 +1761,8 @@ em_format_remove_header (EMFormat * emf, } void -em_format_remove_header_struct (EMFormat * emf, - const EMFormatHeader * header) +em_format_remove_header_struct (EMFormat *emf, + const EMFormatHeader *header) { g_return_if_fail (header); @@ -1784,7 +1784,7 @@ em_format_add_puri (EMFormat *emf, g_hash_table_insert (emf->mail_part_table, puri->uri, item); - d(printf("Added PURI %s\n", puri->uri)); + d(printf("Added PURI %s\n", puri->uri)); } EMFormatPURI * @@ -2045,9 +2045,9 @@ em_format_parse_part_as (EMFormat *emf, * as an attachment. The parser will decide how to display it. */ disposition = camel_mime_part_get_content_disposition (part); if (!info->force_handler && disposition && - (g_strcmp0 (disposition->disposition, "attachment") == 0)) { + (g_strcmp0 (disposition->disposition, "attachment") == 0)) { ninfo.is_attachment = TRUE; - handler = em_format_find_handler (emf, "x-evolution/message/attachment"); + handler = em_format_find_handler (emf, "x-evolution/message/attachment"); ninfo.handler = handler; if (handler && handler->parse_func) @@ -2478,15 +2478,15 @@ em_format_build_mail_uri (CamelFolder *folder, g_return_val_if_fail (message_uid && *message_uid, NULL); if (!folder) { - folder_name = "generic"; - service_uid = "generic"; + folder_name = "generic"; + service_uid = "generic"; } else { folder_name = camel_folder_get_full_name (folder); store = camel_folder_get_parent_store (folder); if (store) service_uid = camel_service_get_uid (CAMEL_SERVICE (store)); else - service_uid = "generic"; + service_uid = "generic"; } tmp = g_strdup_printf ("mail://%s/%s/%s", @@ -2667,7 +2667,7 @@ em_format_header_new (const gchar *name, } void -em_format_header_free (EMFormatHeader * header) +em_format_header_free (EMFormatHeader *header) { g_return_if_fail (header != NULL); diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c index af861ca98c..e60e08aa3f 100644 --- a/libemail-engine/e-mail-utils.c +++ b/libemail-engine/e-mail-utils.c @@ -1059,7 +1059,7 @@ em_utils_is_local_delivery_mbox_file (CamelURL *url) { g_return_val_if_fail (url != NULL, FALSE); - return g_str_equal (url->protocol, "mbox") && + return g_str_equal (url->protocol, "mbox") && (url->path != NULL) && g_file_test (url->path, G_FILE_TEST_EXISTS) && !g_file_test (url->path, G_FILE_TEST_IS_DIR); diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c index 5e26c6c2f5..67b40c372b 100644 --- a/libemail-engine/mail-ops.c +++ b/libemail-engine/mail-ops.c @@ -83,7 +83,7 @@ struct _fetch_mail_msg { MailProviderFetchLockFunc provider_lock; MailProviderFetchUnlockFunc provider_unlock; MailProviderFetchInboxFunc provider_fetch_inbox; - + void (*done)(gint still_more, gpointer data); gpointer data; }; @@ -291,8 +291,8 @@ fetch_mail_exec (struct _fetch_mail_msg *m, if (m->fetch_count > 0) { /* We probably should fetch some old messages first. */ printf("Fetching %d %s messages\n", m->fetch_count, (m->fetch_type == CAMEL_FETCH_NEW_MESSAGES) ? "new" : "old"); - 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); data_dir = camel_service_get_user_data_dir (service); @@ -323,7 +323,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m, /* Reverse it so that we fetch the latest as first, while fetching POP */ for (i = 0; i < cache_uids->len; i++) - uids->pdata[cache_uids->len-i-1] = g_strdup (cache_uids->pdata[i]); + uids->pdata[cache_uids->len - i - 1] = g_strdup (cache_uids->pdata[i]); camel_uid_cache_free_uids (cache_uids); @@ -417,18 +417,19 @@ static MailMsgInfo fetch_mail_info = { void mail_fetch_mail (CamelStore *store, gint keep, - CamelFetchType fetch_type, - gint fetch_count, + CamelFetchType fetch_type, + gint fetch_count, const gchar *type, - MailProviderFetchLockFunc lock_func, - MailProviderFetchUnlockFunc unlock_func, - MailProviderFetchInboxFunc fetch_inbox_func, + MailProviderFetchLockFunc lock_func, + MailProviderFetchUnlockFunc unlock_func, + MailProviderFetchInboxFunc fetch_inbox_func, GCancellable *cancellable, CamelFilterGetFolderFunc get_folder, gpointer get_data, CamelFilterStatusFunc *status, gpointer status_data, - void (*done)(int still_more, gpointer data), + void (*done)(gint still_more, + gpointer data), gpointer data) { struct _fetch_mail_msg *m; diff --git a/libemail-engine/mail-ops.h b/libemail-engine/mail-ops.h index e4c2002a0b..d42268d8ad 100644 --- a/libemail-engine/mail-ops.h +++ b/libemail-engine/mail-ops.h @@ -71,10 +71,10 @@ void mail_send_queue (EMailSession *session, void (*done)(gpointer data), gpointer data); -typedef void (*MailProviderFetchLockFunc) (const char *source); -typedef void (*MailProviderFetchUnlockFunc) (const char *source); +typedef void (*MailProviderFetchLockFunc) (const gchar *source); +typedef void (*MailProviderFetchUnlockFunc) (const gchar *source); typedef CamelFolder * - (*MailProviderFetchInboxFunc) (const char *source, + (*MailProviderFetchInboxFunc) (const gchar *source, GCancellable *cancellable, GError **error); @@ -91,7 +91,7 @@ void mail_fetch_mail (CamelStore *store, gpointer get_data, CamelFilterStatusFunc *status, gpointer status_data, - void (*done)(int still_more, gpointer data), + void (*done)(gint still_more, gpointer data), gpointer data); void mail_filter_folder (EMailSession *session, diff --git a/libgnomecanvas/gailcanvas.c b/libgnomecanvas/gailcanvas.c index 5ca87a6cbe..2768dd16ec 100644 --- a/libgnomecanvas/gailcanvas.c +++ b/libgnomecanvas/gailcanvas.c @@ -111,7 +111,7 @@ gail_canvas_get_type (void) /* use the size obtained from the parent type factory */ type = g_type_register_static (atkobject_parent_type, - "GailCanvas", &tinfo, 0); + "GailCanvas", &tinfo, 0); } return type; diff --git a/libgnomecanvas/gailcanvasgroupfactory.c b/libgnomecanvas/gailcanvasgroupfactory.c index ed36c916e7..62bdac891c 100644 --- a/libgnomecanvas/gailcanvasgroupfactory.c +++ b/libgnomecanvas/gailcanvasgroupfactory.c @@ -53,7 +53,7 @@ gail_canvas_group_factory_get_type (void) }; type = g_type_register_static ( ATK_TYPE_OBJECT_FACTORY, - "GailCanvasGroupFactory" , &tinfo, 0); + "GailCanvasGroupFactory" , &tinfo, 0); } return type; diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c index a3f30600de..875012302e 100644 --- a/libgnomecanvas/gnome-canvas-pixbuf.c +++ b/libgnomecanvas/gnome-canvas-pixbuf.c @@ -87,7 +87,7 @@ gnome_canvas_pixbuf_class_init (GnomeCanvasPixbufClass *class) g_object_class_install_property (gobject_class, PROP_PIXBUF, - g_param_spec_object ("pixbuf", NULL, NULL, + g_param_spec_object ("pixbuf", NULL, NULL, GDK_TYPE_PIXBUF, (G_PARAM_READABLE | G_PARAM_WRITABLE))); diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index 1558640d8d..5a7e9c8136 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -155,7 +155,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_TEXT, - g_param_spec_string ("text", + g_param_spec_string ("text", "Text", "Text to render", NULL, @@ -164,7 +164,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_MARKUP, - g_param_spec_string ("markup", + g_param_spec_string ("markup", "Markup", "Marked up text to render", NULL, @@ -174,14 +174,14 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_X, - g_param_spec_double ("x", NULL, NULL, + g_param_spec_double ("x", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_Y, - g_param_spec_double ("y", NULL, NULL, + g_param_spec_double ("y", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); @@ -189,7 +189,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_FONT, - g_param_spec_string ("font", + g_param_spec_string ("font", "Font", "Font description as a string", NULL, @@ -218,7 +218,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_ATTRIBUTES, - g_param_spec_boxed ("attributes", NULL, NULL, + g_param_spec_boxed ("attributes", NULL, NULL, PANGO_TYPE_ATTR_LIST, (G_PARAM_READABLE | G_PARAM_WRITABLE))); @@ -331,44 +331,44 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_JUSTIFICATION, - g_param_spec_enum ("justification", NULL, NULL, + g_param_spec_enum ("justification", NULL, NULL, GTK_TYPE_JUSTIFICATION, GTK_JUSTIFY_LEFT, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_CLIP_WIDTH, - g_param_spec_double ("clip_width", NULL, NULL, + g_param_spec_double ("clip_width", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_CLIP_HEIGHT, - g_param_spec_double ("clip_height", NULL, NULL, + g_param_spec_double ("clip_height", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_CLIP, - g_param_spec_boolean ("clip", NULL, NULL, + g_param_spec_boolean ("clip", NULL, NULL, FALSE, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_X_OFFSET, - g_param_spec_double ("x_offset", NULL, NULL, + g_param_spec_double ("x_offset", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_Y_OFFSET, - g_param_spec_double ("y_offset", NULL, NULL, + g_param_spec_double ("y_offset", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_FILL_COLOR, - g_param_spec_string ("fill_color", + g_param_spec_string ("fill_color", "Color", "Text color, as string", NULL, @@ -376,7 +376,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_FILL_COLOR_GDK, - g_param_spec_boxed ("fill_color_gdk", + g_param_spec_boxed ("fill_color_gdk", "Color", "Text color, as a GdkColor", GDK_TYPE_COLOR, @@ -384,7 +384,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_FILL_COLOR_RGBA, - g_param_spec_uint ("fill_color_rgba", + g_param_spec_uint ("fill_color_rgba", "Color", "Text color, as an R/G/B/A combined integer", 0, G_MAXUINT, 0, @@ -392,7 +392,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_TEXT_WIDTH, - g_param_spec_double ("text_width", + g_param_spec_double ("text_width", "Text width", "Width of the rendered text", 0.0, G_MAXDOUBLE, 0.0, @@ -400,7 +400,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) g_object_class_install_property (gobject_class, PROP_TEXT_HEIGHT, - g_param_spec_double ("text_height", + g_param_spec_double ("text_height", "Text height", "Height of the rendered text", 0.0, G_MAXDOUBLE, 0.0, diff --git a/libgnomecanvas/gnome-canvas-widget.c b/libgnomecanvas/gnome-canvas-widget.c index 82077af291..84ffa80fe2 100644 --- a/libgnomecanvas/gnome-canvas-widget.c +++ b/libgnomecanvas/gnome-canvas-widget.c @@ -104,37 +104,37 @@ gnome_canvas_widget_class_init (GnomeCanvasWidgetClass *class) g_object_class_install_property (gobject_class, PROP_WIDGET, - g_param_spec_object ("widget", NULL, NULL, + g_param_spec_object ("widget", NULL, NULL, GTK_TYPE_WIDGET, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_X, - g_param_spec_double ("x", NULL, NULL, + g_param_spec_double ("x", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_Y, - g_param_spec_double ("y", NULL, NULL, + g_param_spec_double ("y", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_WIDTH, - g_param_spec_double ("width", NULL, NULL, + g_param_spec_double ("width", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_HEIGHT, - g_param_spec_double ("height", NULL, NULL, + g_param_spec_double ("height", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_SIZE_PIXELS, - g_param_spec_boolean ("size_pixels", NULL, NULL, + g_param_spec_boolean ("size_pixels", NULL, NULL, FALSE, (G_PARAM_READABLE | G_PARAM_WRITABLE))); diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 07f45ad461..a1d95bdaaa 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -167,11 +167,11 @@ mail_display_webview_update_actions (EWebView *web_view, g_return_if_fail (web_view != NULL); image_src = e_web_view_get_cursor_image_src (web_view); - visible = image_src && g_str_has_prefix (image_src, "cid:"); + visible = image_src && g_str_has_prefix (image_src, "cid:"); if (!visible && image_src) { CamelStream *image_stream; - image_stream = camel_data_cache_get (emd_global_http_cache, "http", image_src, NULL); + image_stream = camel_data_cache_get (emd_global_http_cache, "http", image_src, NULL); visible = image_stream != NULL; @@ -179,7 +179,7 @@ mail_display_webview_update_actions (EWebView *web_view, g_object_unref (image_stream); } - action = e_web_view_get_action (web_view, "image-save"); + action = e_web_view_get_action (web_view, "image-save"); if (action) gtk_action_set_visible (action, visible); } @@ -442,12 +442,12 @@ mail_display_resource_requested (WebKitWebView *web_view, const gchar *uri = webkit_network_request_get_uri (request); if (!formatter) { - webkit_network_request_set_uri (request, "invalid://uri"); + webkit_network_request_set_uri (request, "invalid://uri"); return; } /* Redirect cid:part_id to mail://mail_id/cid:part_id */ - if (g_str_has_prefix (uri, "cid:")) { + if (g_str_has_prefix (uri, "cid:")) { /* Always write raw content of CID object */ gchar *new_uri = em_format_build_mail_uri (formatter->folder, @@ -461,7 +461,7 @@ mail_display_resource_requested (WebKitWebView *web_view, /* WebKit won't allow to load a local file when displaing "remote" mail://, protocol, so we need to handle this manually */ - } else if (g_str_has_prefix (uri, "file:")) { + } else if (g_str_has_prefix (uri, "file:")) { gchar *path; path = g_filename_from_uri (uri, NULL, NULL); @@ -474,7 +474,7 @@ mail_display_resource_requested (WebKitWebView *web_view, /* Redirect http(s) request to evo-http(s) protocol. See EMailRequest for * further details about this. */ - } else if (g_str_has_prefix (uri, "http:") || g_str_has_prefix (uri, "https")) { + } else if (g_str_has_prefix (uri, "http:") || g_str_has_prefix (uri, "https")) { gchar *new_uri, *mail_uri, *enc; SoupURI *soup_uri; @@ -485,7 +485,7 @@ mail_display_resource_requested (WebKitWebView *web_view, /* Open Evolution's cache */ uri_md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); stream = camel_data_cache_get ( - emd_global_http_cache, "http", uri_md5, NULL); + emd_global_http_cache, "http", uri_md5, NULL); g_free (uri_md5); /* If the URI is not cached and we are not allowed to load it @@ -493,11 +493,11 @@ mail_display_resource_requested (WebKitWebView *web_view, * a native placeholder for it. */ if (!stream && !display->priv->force_image_load && !em_format_html_can_load_images (display->priv->formatter)) { - webkit_network_request_set_uri (request, "invalid://protocol"); + webkit_network_request_set_uri (request, "invalid://protocol"); return; } - new_uri = g_strconcat ("evo-", uri, NULL); + new_uri = g_strconcat ("evo-", uri, NULL); mail_uri = em_format_build_mail_uri (formatter->folder, formatter->message_uid, NULL, NULL); @@ -509,12 +509,12 @@ mail_display_resource_requested (WebKitWebView *web_view, g_free, g_free); } enc = soup_uri_encode (mail_uri, NULL); - g_hash_table_insert (query, g_strdup ("__evo-mail"), enc); + g_hash_table_insert (query, g_strdup ("__evo-mail"), enc); if (display->priv->force_image_load) { g_hash_table_insert (query, - g_strdup ("__evo-load-images"), - g_strdup ("true")); + g_strdup ("__evo-load-images"), + g_strdup ("true")); } g_free (mail_uri); @@ -545,7 +545,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++) { @@ -578,11 +578,11 @@ mail_display_plugin_widget_resize (GObject *object, widget = GTK_WIDGET (object); gtk_widget_get_preferred_height (widget, &height, NULL); - parent_element = g_object_get_data (object, "parent_element"); + 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", - G_STRFUNC, (gchar *) g_object_get_data (object, "uri"))); + d(printf("%s: %s does not have (valid) parent element!\n", + G_STRFUNC, (gchar *) g_object_get_data (object, "uri"))); return; } @@ -613,7 +613,7 @@ plugin_widget_set_parent_element (GtkWidget *widget, WebKitDOMDocument *document; WebKitDOMElement *element; - uri = g_object_get_data (G_OBJECT (widget), "uri"); + uri = g_object_get_data (G_OBJECT (widget), "uri"); if (!uri || !*uri) return; @@ -621,14 +621,14 @@ plugin_widget_set_parent_element (GtkWidget *widget, element = find_element_by_id (document, uri); if (!element || !WEBKIT_DOM_IS_ELEMENT (element)) { - g_warning ("Failed to find parent for '%s' - no ID set?", uri); + g_warning ("Failed to find parent for '%s' - no ID set?", uri); return; } /* Assign the WebKitDOMElement to "parent_element" data of the GtkWidget * and the GtkWidget to "widget" data of the DOM Element */ - g_object_set_data (G_OBJECT (widget), "parent_element", element); - g_object_set_data (G_OBJECT (element), "widget", widget); + g_object_set_data (G_OBJECT (widget), "parent_element", element); + g_object_set_data (G_OBJECT (element), "widget", widget); } static void @@ -641,22 +641,22 @@ attachment_button_expanded (GObject *object, WebKitDOMCSSStyleDeclaration *css; gboolean expanded; - d(printf("Attachment button %s (%p) expansion state toggled!\n", - (gchar *) g_object_get_data (object, "uri"), object)); + d(printf("Attachment button %s (%p) expansion state toggled!\n", + (gchar *) g_object_get_data (object, "uri"), object)); expanded = e_attachment_button_get_expanded (button) && gtk_widget_get_visible (GTK_WIDGET (button)); if (!WEBKIT_DOM_IS_ELEMENT (attachment)) { - d(printf("%s: Parent element for button %s does not exist!\n", - G_STRFUNC, (gchar *) g_object_get_data (object, "uri"))); + d(printf("%s: Parent element for button %s does not exist!\n", + G_STRFUNC, (gchar *) g_object_get_data (object, "uri"))); return; } /* Show or hide the DIV which contains the attachment (iframe, image...) */ css = webkit_dom_element_get_style (attachment); webkit_dom_css_style_declaration_set_property ( - css, "display", expanded ? "block" : "none", "", NULL); + css, "display", expanded ? "block" : "none", "", NULL); } static void @@ -691,10 +691,10 @@ bind_iframe_content_visibility (EAttachmentButton *button, document = webkit_dom_html_iframe_element_get_content_document ( WEBKIT_DOM_HTML_IFRAME_ELEMENT (iframe)); - nodes = webkit_dom_document_get_elements_by_tag_name (document, "object"); + nodes = webkit_dom_document_get_elements_by_tag_name (document, "object"); length = webkit_dom_node_list_get_length (nodes); - d(printf("Found %ld objects within iframe %s\n", length, + d(printf("Found %ld objects within iframe %s\n", length, webkit_dom_html_iframe_element_get_name ( WEBKIT_DOM_HTML_IFRAME_ELEMENT (iframe)))); @@ -705,22 +705,22 @@ bind_iframe_content_visibility (EAttachmentButton *button, WebKitDOMNode *node = webkit_dom_node_list_item (nodes, i); GtkWidget *widget; - widget = g_object_get_data (G_OBJECT (node), "widget"); + widget = g_object_get_data (G_OBJECT (node), "widget"); if (!widget) continue; - d(printf("Binding visibility of widget %s (%p) with button %s (%p)\n", - (gchar *) g_object_get_data (G_OBJECT (widget), "uri"), widget, - (gchar *) g_object_get_data (G_OBJECT (button), "uri"), button)); + d(printf("Binding visibility of widget %s (%p) with button %s (%p)\n", + (gchar *) g_object_get_data (G_OBJECT (widget), "uri"), widget, + (gchar *) g_object_get_data (G_OBJECT (button), "uri"), button)); g_object_bind_property ( - button, "expanded", - widget, "visible", + button, "expanded", + widget, "visible", G_BINDING_SYNC_CREATE); /* Ensure that someone won't attempt to _show() the widget when * it is supposed to be hidden and vice versa. */ - g_signal_connect (widget, "notify::visible", + g_signal_connect (widget, "notify::visible", G_CALLBACK (constraint_widget_visibility), button); } } @@ -750,7 +750,7 @@ bind_attachment_iframe_visibility (GObject *object, frame_name = webkit_web_frame_get_name (webframe); - d(printf("Rebinding visibility of frame %s because it's URL changed\n", + d(printf("Rebinding visibility of frame %s because it's URL changed\n", frame_name)); /* Get DOMDocument of the main document */ @@ -765,16 +765,16 @@ bind_attachment_iframe_visibility (GObject *object, if (!attachment) return; - button_uri = g_strconcat (frame_name, ".attachment_button", NULL); + button_uri = g_strconcat (frame_name, ".attachment_button", NULL); button_element = find_element_by_id (document, button_uri); g_free (button_uri); if (!button_element) return; - button = g_object_get_data (G_OBJECT (button_element), "widget"); + button = g_object_get_data (G_OBJECT (button_element), "widget"); /* Get " - "", + "", e_color_to_value (&efh->priv->colors[EM_FORMAT_HTML_COLOR_FRAME]), e_color_to_value (&efh->priv->colors[EM_FORMAT_HTML_COLOR_CONTENT]), uri); @@ -1077,7 +1077,7 @@ efh_write_headers (EMFormat *emf, g_string_append_printf (buffer, "" - "", + "", EVOLUTION_IMAGESDIR, (info->headers_collapsed) ? "plus.png" : "minus.png"); @@ -1151,7 +1151,7 @@ efh_write_message_rfc822 (EMFormat *emf, EMFormatPURI *p; p = iter->data; - if (g_str_has_suffix (p->uri, ".rfc822.end")) + if (g_str_has_suffix (p->uri, ".rfc822.end")) break; puris = g_list_append (puris, p); @@ -1180,12 +1180,12 @@ efh_write_message_rfc822 (EMFormat *emf, /* EMFormatHTMLPrint has registered a special writer * for headers, try to find it and use it. */ - if (g_str_has_suffix (p->uri, ".headers")) { + if (g_str_has_suffix (p->uri, ".headers")) { const EMFormatHandler *handler; handler = em_format_find_handler ( - emf, "x-evolution/message/headers"); + emf, "x-evolution/message/headers"); if (handler && handler->write_func) handler->write_func (emf, p, stream, info, cancellable); @@ -1193,10 +1193,10 @@ efh_write_message_rfc822 (EMFormat *emf, continue; } - if (g_str_has_suffix (p->uri, ".rfc822.end")) + if (g_str_has_suffix (p->uri, ".rfc822.end")) break; - if (g_str_has_suffix (p->uri, ".attachment-bar")) + if (g_str_has_suffix (p->uri, ".attachment-bar")) can_write = TRUE; if (can_write && p->write_func) { @@ -1223,17 +1223,17 @@ efh_write_message_rfc822 (EMFormat *emf, p = iter->data; uri = em_format_build_mail_uri (emf->folder, emf->message_uid, - "part_id", G_TYPE_STRING, p->uri, - "mode", G_TYPE_INT, EM_FORMAT_WRITE_MODE_RAW, + "part_id", G_TYPE_STRING, p->uri, + "mode", G_TYPE_INT, EM_FORMAT_WRITE_MODE_RAW, NULL); str = g_strdup_printf ( - "
" - "
\n" - "" - "
", + "
" + "
\n" + "" + "
", e_color_to_value (&efh->priv->colors[EM_FORMAT_HTML_COLOR_FRAME]), e_color_to_value (&efh->priv->colors[EM_FORMAT_HTML_COLOR_CONTENT]), uri, puri->uri); @@ -1582,14 +1582,14 @@ efh_write_message (EMFormat *emf, efh = (EMFormatHTML *) emf; header = g_strdup_printf ( - "\n\n" - "\n\n" - "Evolution Mail Display\n" - "\n" - "\n" - "", + "\n\n" + "\n\n" + "Evolution Mail Display\n" + "\n" + "\n" + "", e_color_to_value (&efh->priv->colors[ EM_FORMAT_HTML_COLOR_BODY])); @@ -1601,7 +1601,7 @@ efh_write_message (EMFormat *emf, efh_write_source (emf, emf->mail_part_list->data, stream, info, cancellable); - camel_stream_write_string (stream, "", cancellable, NULL); + camel_stream_write_string (stream, "", cancellable, NULL); return; } @@ -1617,7 +1617,7 @@ efh_write_message (EMFormat *emf, * These skipped PURIs contain entire RFC message which will * be written in " - "", + "
" + "" + "
", uri, puri->uri, puri->uri); g_free (uri); @@ -3228,7 +3228,7 @@ bind_itip_view (WebKitDOMElement *element, EMFormatPURI *puri) { if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) { - GString *buffer = g_string_new (""); + GString *buffer = g_string_new (""); WebKitDOMDocument *document; ItipView *view; @@ -3236,7 +3236,7 @@ bind_itip_view (WebKitDOMElement *element, WEBKIT_DOM_HTML_IFRAME_ELEMENT (element)); view = itip_view_new ((ItipPURI *) puri); - g_object_set_data_full (G_OBJECT (element), "view", view, + g_object_set_data_full (G_OBJECT (element), "view", view, (GDestroyNotify) g_object_unref); itip_view_create_dom_bindings (view, @@ -3275,7 +3275,7 @@ format_itip (EPlugin *ep, puri->puri.bind_func = bind_itip_view; puri->puri.free = puri_free; puri->puri.is_attachment = target->info->is_attachment; - puri->puri.mime_type = g_strdup ("text/html"); + puri->puri.mime_type = g_strdup ("text/html"); puri->delete_message = g_settings_get_boolean (settings, CONF_KEY_DELETE); puri->has_organizer = FALSE; puri->no_reply_wanted = FALSE; diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 53bba25100..018ae98f00 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -649,13 +649,13 @@ update_start_end_times (ItipView *view) /* it's an all day event in one particular day */ format_date_and_time_x (priv->start_tm, now_tm, FALSE, TRUE, FALSE, priv->start_tm_is_date, buffer, 256); priv->start_label = g_strdup (buffer); - priv->start_header = _("All day:"); + priv->start_header = _("All day:"); priv->end_header = NULL; priv->end_label = NULL; } else { if (priv->start_tm) { format_date_and_time_x (priv->start_tm, now_tm, FALSE, TRUE, FALSE, priv->start_tm_is_date, buffer, 256); - priv->start_header = priv->start_tm_is_date ? _("Start day:") : _("Start time:"); + priv->start_header = priv->start_tm_is_date ? _("Start day:") : _("Start time:"); priv->start_label = g_strdup (buffer); } else { priv->start_header = NULL; @@ -664,7 +664,7 @@ update_start_end_times (ItipView *view) if (priv->end_tm) { format_date_and_time_x (priv->end_tm, now_tm, FALSE, TRUE, FALSE, priv->end_tm_is_date, buffer, 256); - priv->end_header = priv->end_tm_is_date ? _("End day:") : _("End time:"); + priv->end_header = priv->end_tm_is_date ? _("End day:") : _("End time:"); priv->end_label = g_strdup (buffer); } else { priv->end_header = NULL; @@ -725,7 +725,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); } @@ -737,7 +737,7 @@ itip_view_finalize (GObject *object) priv = ITIP_VIEW_GET_PRIVATE (object); - d(printf("Itip view finalized!\n")); + d(printf("Itip view finalized!\n")); if (priv->sender) { g_free (priv->sender); @@ -943,7 +943,7 @@ source_changed_cb (WebKitDOMElement *select, source = itip_view_get_source (view); - d(printf("Source changed to '%s'\n", e_source_peek_name (source))); + d(printf("Source changed to '%s'\n", e_source_peek_name (source))); g_signal_emit (view, signals[SOURCE_SELECTED], 0, source); } @@ -954,10 +954,10 @@ append_checkbox_table_row (GString *buffer, { g_string_append_printf ( buffer, - "" - "" - "" - "\n", + "" + "" + "" + "\n", name, name, name, name, name, label); } @@ -970,14 +970,14 @@ append_text_table_row (GString *buffer, if (label && *label) { g_string_append_printf (buffer, - "%s%s\n", - id, (value && *value) ? "" : "hidden=\"\"", label, value); + "%s%s\n", + id, (value && *value) ? "" : "hidden=\"\"", label, value); } else { g_string_append_printf ( buffer, - "\n", + "\n", id); } @@ -998,7 +998,7 @@ append_info_item_row (ItipView *view, row = webkit_dom_html_table_element_insert_row ( WEBKIT_DOM_HTML_TABLE_ELEMENT (table), -1, NULL); - id = g_strdup_printf ("%s_row_%d", table_id, item->id); + id = g_strdup_printf ("%s_row_%d", table_id, item->id); webkit_dom_html_element_set_id (row, id); g_free (id); @@ -1028,9 +1028,9 @@ append_info_item_row (ItipView *view, gchar *icon_uri; image = webkit_dom_document_create_element ( - view->priv->dom_document, "IMG", NULL); + view->priv->dom_document, "IMG", NULL); - icon_uri = g_strdup_printf ("gtk-stock://%s", icon_name); + icon_uri = g_strdup_printf ("gtk-stock://%s", icon_name); webkit_dom_html_image_element_set_src ( WEBKIT_DOM_HTML_IMAGE_ELEMENT (image), icon_uri); g_free (icon_uri); @@ -1046,7 +1046,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 @@ -1057,7 +1057,7 @@ remove_info_item_row (ItipView *view, WebKitDOMElement *row; gchar *row_id; - row_id = g_strdup_printf ("%s_row_%d", table_id, id); + row_id = g_strdup_printf ("%s_row_%d", table_id, id); row = webkit_dom_document_get_element_by_id ( view->priv->dom_document, row_id); g_free (row_id); @@ -1067,7 +1067,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 @@ -1079,9 +1079,9 @@ buttons_table_write_button (GString *buffer, { g_string_append_printf ( buffer, - "\n", + "\n", name, response, name, icon, GTK_ICON_SIZE_BUTTON, label); } @@ -1089,145 +1089,145 @@ static void append_buttons_table (GString *buffer) { g_string_append (buffer, - "" - ""); + "
" + ""); /* Everything gets the open button */ buttons_table_write_button ( - buffer, BUTTON_OPEN_CALENDAR, _("Open Calendar"), + buffer, BUTTON_OPEN_CALENDAR, _("Open Calendar"), GTK_STOCK_JUMP_TO, ITIP_VIEW_RESPONSE_OPEN); buttons_table_write_button ( - buffer, BUTTON_DECLINE_ALL, _("Decline all"), + buffer, BUTTON_DECLINE_ALL, _("Decline all"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE); buttons_table_write_button ( - buffer, BUTTON_DECLINE, _("Decline"), + buffer, BUTTON_DECLINE, _("Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE); buttons_table_write_button ( - buffer, BUTTON_TENTATIVE_ALL, _("Tentative all"), + buffer, BUTTON_TENTATIVE_ALL, _("Tentative all"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE); buttons_table_write_button ( - buffer, BUTTON_TENTATIVE, _("Tentative"), + buffer, BUTTON_TENTATIVE, _("Tentative"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE); buttons_table_write_button ( - buffer, BUTTON_ACCEPT_ALL, _("Accept all"), + buffer, BUTTON_ACCEPT_ALL, _("Accept all"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); buttons_table_write_button ( - buffer, BUTTON_ACCEPT, _("Accept"), + buffer, BUTTON_ACCEPT, _("Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); buttons_table_write_button ( - buffer, BUTTON_SEND_INFORMATION, _("Send Information"), + buffer, BUTTON_SEND_INFORMATION, _("Send Information"), GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_REFRESH); buttons_table_write_button ( - buffer, BUTTON_UPDATE_ATTENDEE_STATUS, _("Update Attendee Status"), + buffer, BUTTON_UPDATE_ATTENDEE_STATUS, _("Update Attendee Status"), GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_UPDATE); buttons_table_write_button ( - buffer, BUTTON_UPDATE, _("Update"), + buffer, BUTTON_UPDATE, _("Update"), GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_CANCEL); - g_string_append (buffer, "
"); + g_string_append (buffer, ""); } void itip_view_write (GString *buffer) { g_string_append (buffer, - "\n" - "\n" - "ITIP\n" - "\n" - "\n" - "\n"); + "\n" + "\n" + "ITIP\n" + "\n" + "\n" + "\n"); g_string_append_printf (buffer, - "\n", + "\n", MEETING_ICON, GTK_ICON_SIZE_BUTTON); g_string_append (buffer, - "
\n"); + "
\n"); /* The first section listing the sender */ /* FIXME What to do if the send and organizer do not match */ g_string_append (buffer, - "
\n"); + "
\n"); - g_string_append (buffer, "
\n"); + g_string_append (buffer, "
\n"); /* Elementary event information */ g_string_append (buffer, - "\n"); + "
\n"); append_text_table_row (buffer, TABLE_ROW_SUMMARY, NULL, NULL); - append_text_table_row (buffer, TABLE_ROW_LOCATION, _("Location:"), NULL); - append_text_table_row (buffer, TABLE_ROW_START_DATE, _("Start time:"), NULL); - append_text_table_row (buffer, TABLE_ROW_END_DATE, _("End time:"), NULL); - append_text_table_row (buffer, TABLE_ROW_STATUS, _("Status:"), NULL); - append_text_table_row (buffer, TABLE_ROW_COMMENT, _("Comment:"), NULL); + append_text_table_row (buffer, TABLE_ROW_LOCATION, _("Location:"), NULL); + append_text_table_row (buffer, TABLE_ROW_START_DATE, _("Start time:"), NULL); + append_text_table_row (buffer, TABLE_ROW_END_DATE, _("End time:"), NULL); + append_text_table_row (buffer, TABLE_ROW_STATUS, _("Status:"), NULL); + append_text_table_row (buffer, TABLE_ROW_COMMENT, _("Comment:"), NULL); - g_string_append (buffer, "
\n"); + g_string_append (buffer, "\n"); /* Upper Info items */ g_string_append (buffer, - ""); + "
"); /* Description */ g_string_append (buffer, - "\n"); + "\n"); g_string_append (buffer, "
\n"); /* Lower Info items */ g_string_append (buffer, - "
"); + "
"); g_string_append (buffer, - "
\n"); + "
\n"); g_string_append (buffer, - "" - "" - "" - "\n"); + "" + "" + "" + "\n"); /* RSVP area */ - append_checkbox_table_row (buffer, CHECKBOX_RSVP, _("Send reply to sender")); + append_checkbox_table_row (buffer, CHECKBOX_RSVP, _("Send reply to sender")); /* Comments */ g_string_append_printf (buffer, - "" - "" - "\n" - "\n", - _("Comment:")); + "" + "" + "\n" + "\n", + _("Comment:")); /* Updates */ - append_checkbox_table_row (buffer, CHECKBOX_UPDATE, _("Send updates to attendees")); + append_checkbox_table_row (buffer, CHECKBOX_UPDATE, _("Send updates to attendees")); /* The recurrence check button */ - append_checkbox_table_row (buffer, CHECKBOX_RECUR, _("Apply to all instances")); - append_checkbox_table_row (buffer, CHECKBOX_FREE_TIME, _("Show time as free")); - append_checkbox_table_row (buffer, CHECKBOX_KEEP_ALARM, _("Preserve my reminder")); - append_checkbox_table_row (buffer, CHECKBOX_INHERIT_ALARM, _("Inherit reminder")); + append_checkbox_table_row (buffer, CHECKBOX_RECUR, _("Apply to all instances")); + append_checkbox_table_row (buffer, CHECKBOX_FREE_TIME, _("Show time as free")); + append_checkbox_table_row (buffer, CHECKBOX_KEEP_ALARM, _("Preserve my reminder")); + append_checkbox_table_row (buffer, CHECKBOX_INHERIT_ALARM, _("Inherit reminder")); - g_string_append (buffer, "
\n"); + g_string_append (buffer, "\n"); /* Buttons table */ append_buttons_table (buffer); /*
*/ - g_string_append (buffer, "
\n"); + g_string_append (buffer, "
\n"); - g_string_append (buffer, "
"); + g_string_append (buffer, "
"); - g_string_append (buffer, ""); + g_string_append (buffer, ""); } void @@ -1240,27 +1240,27 @@ itip_view_write_for_printing (ItipView *view, } g_string_append (buffer, - "
\n"); + "
\n"); /* The first section listing the sender */ /* FIXME What to do if the send and organizer do not match */ g_string_append_printf (buffer, - "
%s
\n", - view->priv->sender ? view->priv->sender : ""); + "
%s
\n", + view->priv->sender ? view->priv->sender : ""); - g_string_append (buffer, "
\n"); + g_string_append (buffer, "
\n"); /* Elementary event information */ g_string_append (buffer, - "\n"); + "
\n"); append_text_table_row ( buffer, TABLE_ROW_SUMMARY, NULL, view->priv->summary); append_text_table_row ( buffer, TABLE_ROW_LOCATION, - _("Location:"), view->priv->location); + _("Location:"), view->priv->location); append_text_table_row ( buffer, TABLE_ROW_START_DATE, view->priv->start_header, view->priv->start_label); @@ -1269,21 +1269,21 @@ itip_view_write_for_printing (ItipView *view, view->priv->end_header, view->priv->end_label); append_text_table_row ( buffer, TABLE_ROW_STATUS, - _("Status:"), view->priv->status); + _("Status:"), view->priv->status); append_text_table_row ( buffer, TABLE_ROW_COMMENT, - _("Comment:"), view->priv->comment); + _("Comment:"), view->priv->comment); - g_string_append (buffer, "
\n"); + g_string_append (buffer, "\n"); /* Description */ g_string_append_printf ( buffer, - "
%s
\n", - view->priv->description ? "" : "hidden=\"\"", view->priv->description); + "
%s
\n", + view->priv->description ? "" : "hidden=\"\"", view->priv->description); - g_string_append (buffer, "
"); + g_string_append (buffer, "
"); } void @@ -1299,105 +1299,105 @@ itip_view_create_dom_bindings (ItipView *view, el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_RECUR); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (recur_toggled_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_RSVP); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (rsvp_toggled_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_INHERIT_ALARM); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (alarm_check_toggled_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_KEEP_ALARM); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (alarm_check_toggled_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_OPEN_CALENDAR); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_ACCEPT); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_ACCEPT_ALL); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_TENTATIVE); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_TENTATIVE_ALL); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_DECLINE); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_DECLINE_ALL); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_UPDATE); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_UPDATE_ATTENDEE_STATUS); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, BUTTON_SEND_INFORMATION); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } el = webkit_dom_document_get_element_by_id (doc, SELECT_ESOURCE); if (el) { webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "change", + WEBKIT_DOM_EVENT_TARGET (el), "change", G_CALLBACK (source_changed_cb), FALSE, view); } } @@ -1536,13 +1536,13 @@ itip_view_set_item_type (ItipView *view, switch (view->priv->type) { case E_CAL_CLIENT_SOURCE_TYPE_EVENTS: - header = _("Calendar:"); + header = _("Calendar:"); break; case E_CAL_CLIENT_SOURCE_TYPE_TASKS: - header = _("Tasks:"); + header = _("Tasks:"); break; case E_CAL_CLIENT_SOURCE_TYPE_MEMOS: - header = _("Memos:"); + header = _("Memos:"); break; default: header = NULL; @@ -1550,7 +1550,7 @@ itip_view_set_item_type (ItipView *view, } webkit_dom_html_element_set_inner_html ( - WEBKIT_DOM_HTML_ELEMENT (cell), header ? header : "", NULL); + WEBKIT_DOM_HTML_ELEMENT (cell), header ? header : "", NULL); set_sender_text (view); } @@ -1719,7 +1719,7 @@ itip_view_set_summary (ItipView *view, col = webkit_dom_element_get_last_element_child (row); webkit_dom_html_element_set_inner_html ( WEBKIT_DOM_HTML_ELEMENT (col), - view->priv->summary ? view->priv->summary : "", + view->priv->summary ? view->priv->summary : "", NULL); } @@ -1755,7 +1755,7 @@ itip_view_set_location (ItipView *view, col = webkit_dom_element_get_last_element_child (row); webkit_dom_html_element_set_inner_html ( WEBKIT_DOM_HTML_ELEMENT (col), - view->priv->location ? view->priv->location : "", + view->priv->location ? view->priv->location : "", NULL); } @@ -1791,7 +1791,7 @@ itip_view_set_status (ItipView *view, col = webkit_dom_element_get_last_element_child (row); webkit_dom_html_element_set_inner_html ( WEBKIT_DOM_HTML_ELEMENT (col), - view->priv->status ? view->priv->status : "", + view->priv->status ? view->priv->status : "", NULL); } @@ -1827,7 +1827,7 @@ itip_view_set_comment (ItipView *view, col = webkit_dom_element_get_last_element_child (row); webkit_dom_html_element_set_inner_html ( WEBKIT_DOM_HTML_ELEMENT (col), - view->priv->comment ? view->priv->comment : "", + view->priv->comment ? view->priv->comment : "", NULL); } @@ -1862,7 +1862,7 @@ itip_view_set_description (ItipView *view, webkit_dom_html_element_set_inner_html ( WEBKIT_DOM_HTML_ELEMENT (div), - view->priv->description ? view->priv->description : "", + view->priv->description ? view->priv->description : "", NULL); } @@ -2161,7 +2161,7 @@ source_list_changed_cb (ESourceList *source_list, GSList *groups, *iter; WebKitDOMElement *select; - d(printf("Assigning a new source list!\n")); + d(printf("Assigning a new source list!\n")); if (!view->priv->dom_document) return; @@ -2188,7 +2188,7 @@ source_list_changed_cb (ESourceList *source_list, continue; optgroup = webkit_dom_document_create_element ( - view->priv->dom_document, "OPTGROUP", NULL); + view->priv->dom_document, "OPTGROUP", NULL); webkit_dom_html_opt_group_element_set_label ( WEBKIT_DOM_HTML_OPT_GROUP_ELEMENT (optgroup), e_source_group_peek_name (group)); @@ -2204,7 +2204,7 @@ source_list_changed_cb (ESourceList *source_list, ESource *source = iter2->data; option = webkit_dom_document_create_element ( - view->priv->dom_document, "OPTION", NULL); + view->priv->dom_document, "OPTION", NULL); webkit_dom_html_option_element_set_value ( WEBKIT_DOM_HTML_OPTION_ELEMENT (option), e_source_peek_uid (source)); @@ -2215,7 +2215,7 @@ source_list_changed_cb (ESourceList *source_list, WEBKIT_DOM_HTML_ELEMENT (option), e_source_peek_name (source), NULL); webkit_dom_html_element_set_class_name ( - WEBKIT_DOM_HTML_ELEMENT (option), "calendar"); + WEBKIT_DOM_HTML_ELEMENT (option), "calendar"); webkit_dom_node_append_child ( WEBKIT_DOM_NODE (optgroup), @@ -2249,7 +2249,7 @@ itip_view_set_source_list (ItipView *view, source_list_changed_cb (source_list, view); - g_signal_connect (source_list, "changed", + g_signal_connect (source_list, "changed", G_CALLBACK (source_list_changed_cb), view); } @@ -2271,7 +2271,7 @@ itip_view_set_source (ItipView *view, g_return_if_fail (ITIP_IS_VIEW (view)); - d(printf("Settings default source '%s'\n", e_source_peek_name (source))); + d(printf("Settings default source '%s'\n", e_source_peek_name (source))); if (!view->priv->dom_document) return; @@ -2411,7 +2411,7 @@ itip_view_set_show_rsvp_check (ItipView *view, return; el = webkit_dom_document_get_element_by_id ( - view->priv->dom_document, "table_row_" CHECKBOX_RSVP); + view->priv->dom_document, "table_row_" CHECKBOX_RSVP); webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show); el = webkit_dom_document_get_element_by_id ( @@ -2490,7 +2490,7 @@ itip_view_set_show_update_check (ItipView *view, return; el = webkit_dom_document_get_element_by_id ( - view->priv->dom_document, "table_row_" CHECKBOX_UPDATE); + view->priv->dom_document, "table_row_" CHECKBOX_UPDATE); webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show); el = webkit_dom_document_get_element_by_id ( @@ -2579,7 +2579,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; @@ -2677,7 +2677,7 @@ itip_view_set_show_recur_check (ItipView *view, return; el = webkit_dom_document_get_element_by_id ( - view->priv->dom_document, "table_row_" CHECKBOX_RECUR); + view->priv->dom_document, "table_row_" CHECKBOX_RECUR); webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show); el = webkit_dom_document_get_element_by_id ( @@ -2709,7 +2709,7 @@ itip_view_set_show_free_time_check (ItipView *view, return; el = webkit_dom_document_get_element_by_id ( - view->priv->dom_document, "table_row_" CHECKBOX_FREE_TIME); + view->priv->dom_document, "table_row_" CHECKBOX_FREE_TIME); webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show); el = webkit_dom_document_get_element_by_id ( @@ -2757,7 +2757,7 @@ itip_view_set_show_keep_alarm_check (ItipView *view, return; el = webkit_dom_document_get_element_by_id ( - view->priv->dom_document, "table_row_" CHECKBOX_KEEP_ALARM); + view->priv->dom_document, "table_row_" CHECKBOX_KEEP_ALARM); webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show); el = webkit_dom_document_get_element_by_id ( @@ -2805,7 +2805,7 @@ itip_view_set_show_inherit_alarm_check (ItipView *view, return; el = webkit_dom_document_get_element_by_id ( - view->priv->dom_document, "table_row_" CHECKBOX_INHERIT_ALARM); + view->priv->dom_document, "table_row_" CHECKBOX_INHERIT_ALARM); webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show); el = webkit_dom_document_get_element_by_id ( @@ -2855,14 +2855,14 @@ itip_view_set_error (ItipView *view, if (show_save_btn) { g_string_append (str, - "" - ""); + "
" + ""); buttons_table_write_button ( - str, BUTTON_SAVE, _("Save"), + str, BUTTON_SAVE, _("Save"), GTK_STOCK_SAVE, ITIP_VIEW_RESPONSE_SAVE); - g_string_append (str, "
"); + g_string_append (str, ""); } view->priv->error = str->str; @@ -2892,7 +2892,7 @@ itip_view_set_error (ItipView *view, el = webkit_dom_document_get_element_by_id ( view->priv->dom_document, BUTTON_SAVE); webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (el), "click", + WEBKIT_DOM_EVENT_TARGET (el), "click", G_CALLBACK (button_clicked_cb), FALSE, view); } } diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 0621c12dd3..52cd68664f 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -125,7 +125,7 @@ org_gnome_format_tnef (gpointer ep, TNEFInitialize (&tnef); tnef.Debug = verbose; if (TNEFParseFile (name, &tnef) == -1) { - printf("ERROR processing file\n"); + printf("ERROR processing file\n"); } processTnef (&tnef, tmpdir); @@ -191,7 +191,7 @@ org_gnome_format_tnef (gpointer ep, g_string_append_printf(t->part_id, ".tnef"); if (camel_multipart_get_number (mp) > 0) { - handler = em_format_find_handler (t->format, "multiplart/mixed"); + handler = em_format_find_handler (t->format, "multiplart/mixed"); /* FIXME Not passing a GCancellable here. */ if (handler && handler->parse_func) { CamelMimePart *part = camel_mime_part_new (); @@ -244,13 +244,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; } @@ -258,7 +258,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); @@ -277,13 +277,13 @@ processTnef (TNEFStruct *tnef, file = sanitize_filename (tnef->subject.data); if (!file) return; - absfilename = g_strconcat (file, ".rtf", NULL); + absfilename = g_strconcat (file, ".rtf", NULL); ifilename = g_build_filename (tmpdir, file, NULL); 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, sizeof (BYTE), @@ -369,7 +369,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); @@ -421,7 +421,7 @@ saveVCard (TNEFStruct *tnef, return; absfilename = g_strconcat (file, ".vcard", NULL); } else - absfilename = g_strdup ("unknown.vcard"); + absfilename = g_strdup ("unknown.vcard"); } else { file = sanitize_filename (vl->data); if (!file) @@ -440,41 +440,41 @@ saveVCard (TNEFStruct *tnef, g_free (absfilename); if ((fptr = fopen(ifilename, "wb"))==NULL) { - printf("Error writing file to disk!"); + 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 */ @@ -498,35 +498,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"); } } @@ -551,35 +551,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"); } } @@ -604,52 +604,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) { @@ -657,40 +657,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); @@ -815,63 +815,63 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) 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", + 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", + fprintf(fptr, ";COUNT=%d", getRruleCount (recur_data[0x1F], recur_data[0x1E])); } } } else if (recur_data[0x04] == 0x0B) { - fprintf(fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s", + 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], + 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], + 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])); } } diff --git a/shell/main.c b/shell/main.c index 4aa6425b86..6db7947ea5 100644 --- a/shell/main.c +++ b/shell/main.c @@ -197,9 +197,9 @@ show_development_warning (void) "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" + "This product comes with no warranty and is not intended for\n" "individuals prone to violent fits of anger.\n" - "\n" + "\n" "We hope that you enjoy the results of our hard work, and we\n" "eagerly await your contributions!\n"), STABLE_VERSION); diff --git a/smclient/eggdesktopfile.c b/smclient/eggdesktopfile.c index 19dc355273..08c595b447 100644 --- a/smclient/eggdesktopfile.c +++ b/smclient/eggdesktopfile.c @@ -1040,8 +1040,8 @@ array_putenv (GPtrArray *env, const gchar *value; value = g_getenv (envp[i]); - g_ptr_array_add (env, g_strdup_printf ("%s=%s", envp[i], - value ? value : "")); + g_ptr_array_add (env, g_strdup_printf ("%s=%s", envp[i], + value ? value : "")); } g_strfreev (envp); } diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index 1fdc5559d9..582187558e 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -461,9 +461,9 @@ web_view_update_document_highlights (EWebView *web_view) WebKitDOMDocumentFragment *frag; WebKitDOMElement *span; - span = webkit_dom_document_create_element (document, "span", NULL); + span = webkit_dom_document_create_element (document, "span", NULL); webkit_dom_html_element_set_class_name ( - WEBKIT_DOM_HTML_ELEMENT (span), "__evo-highlight"); + WEBKIT_DOM_HTML_ELEMENT (span), "__evo-highlight"); webkit_dom_html_element_set_inner_text ( WEBKIT_DOM_HTML_ELEMENT (span), iter->data, NULL); @@ -868,13 +868,13 @@ web_view_button_press_event (GtkWidget *widget, if (!test) goto chainup; - g_object_get (G_OBJECT (test), "context", &context, NULL); + g_object_get (G_OBJECT (test), "context", &context, NULL); if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE) { WebKitWebDataSource *data_source; WebKitWebFrame *frame; GList *subresources, *res; - g_object_get (G_OBJECT (test), "image-uri", &uri, NULL); + g_object_get (G_OBJECT (test), "image-uri", &uri, NULL); if (!uri) goto chainup; @@ -1679,7 +1679,7 @@ e_web_view_init (EWebView *web_view) NULL); g_signal_connect ( - web_view, "notify::load-status", + web_view, "notify::load-status", G_CALLBACK (web_view_load_status_changed_cb), NULL); ui_manager = gtk_ui_manager_new (); @@ -2197,7 +2197,7 @@ e_web_view_set_disable_save_to_disk (EWebView *web_view, } gboolean -e_web_view_get_enable_frame_flattening (EWebView * web_view) +e_web_view_get_enable_frame_flattening (EWebView *web_view) { WebKitWebSettings *settings; gboolean flattening; @@ -2208,13 +2208,13 @@ e_web_view_get_enable_frame_flattening (EWebView * web_view) settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (web_view)); g_return_val_if_fail (settings != NULL, TRUE); - g_object_get (G_OBJECT (settings), "enable-frame-flattening", &flattening, NULL); + g_object_get (G_OBJECT (settings), "enable-frame-flattening", &flattening, NULL); return flattening; } void -e_web_view_set_enable_frame_flattening (EWebView * web_view, +e_web_view_set_enable_frame_flattening (EWebView *web_view, gboolean enable_frame_flattening) { WebKitWebSettings *settings; @@ -2224,7 +2224,7 @@ e_web_view_set_enable_frame_flattening (EWebView * web_view, settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (web_view)); g_return_if_fail (settings != NULL); - g_object_set (G_OBJECT (settings), "enable-frame-flattening", + g_object_set (G_OBJECT (settings), "enable-frame-flattening", enable_frame_flattening, NULL); } @@ -2769,7 +2769,7 @@ e_web_view_get_selection_html (EWebView *web_view) if (!fragment) return NULL; - element = WEBKIT_DOM_HTML_ELEMENT (webkit_dom_document_create_element (document, "div", NULL)); + element = WEBKIT_DOM_HTML_ELEMENT (webkit_dom_document_create_element (document, "div", NULL)); webkit_dom_node_append_child (WEBKIT_DOM_NODE (element), WEBKIT_DOM_NODE (fragment), NULL); @@ -2807,15 +2807,15 @@ e_web_view_get_default_settings (GtkWidget *parent_widget) font = gtk_style_context_get_font (context, GTK_STATE_FLAG_NORMAL); g_object_set (G_OBJECT (settings), - "default-font-size", (pango_font_description_get_size (font) / PANGO_SCALE), - "default-monospace-font-size", (pango_font_description_get_size (font) / PANGO_SCALE), - "enable-frame-flattening", TRUE, - "enable-java-applet", FALSE, - "enable-html5-database", FALSE, - "enable-html5-local-storage", FALSE, - "enable-offline-web-application-cache", FALSE, - "enable-site-specific-quirks", TRUE, - "enable-scripts", FALSE, + "default-font-size", (pango_font_description_get_size (font) / PANGO_SCALE), + "default-monospace-font-size", (pango_font_description_get_size (font) / PANGO_SCALE), + "enable-frame-flattening", TRUE, + "enable-java-applet", FALSE, + "enable-html5-database", FALSE, + "enable-html5-local-storage", FALSE, + "enable-offline-web-application-cache", FALSE, + "enable-site-specific-quirks", TRUE, + "enable-scripts", FALSE, NULL); return settings; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 7fb6bec9e1..616da4be80 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -1430,7 +1430,7 @@ eti_add_selection_model (ETableItem *eti, eti_selection_change (selection, eti); g_signal_emit_by_name (G_OBJECT (eti), - "selection_model_added", eti->selection); + "selection_model_added", eti->selection); } static void diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c index ca6fdfc14d..046f3f52d1 100644 --- a/widgets/table/gal-a11y-e-cell-toggle.c +++ b/widgets/table/gal-a11y-e-cell-toggle.c @@ -74,7 +74,7 @@ gal_a11y_e_cell_toggle_get_type (void) }; type = g_type_register_static (GAL_A11Y_TYPE_E_CELL, - "GalA11yECellToggle", &tinfo, 0); + "GalA11yECellToggle", &tinfo, 0); gal_a11y_e_cell_type_add_action_interface (type); } diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c index a1653698a2..68aef2b227 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 ea9c12b1d7..7520c344b0 100644 --- a/widgets/table/gal-a11y-e-table-item.c +++ b/widgets/table/gal-a11y-e-table-item.c @@ -1187,7 +1187,7 @@ gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y, 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; -- cgit v1.2.3