diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-04-02 10:31:50 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-04-02 11:15:38 +0800 |
| commit | 299521f02c02278857dfd2561973dc0c94e44b57 (patch) | |
| tree | e89760fc89b6e185780d242e4817ff4047efd564 | |
| parent | ccb3616af1dda65cc09093649d5333b9e3e19e11 (diff) | |
| download | gsoc2013-evolution-299521f02c02278857dfd2561973dc0c94e44b57.tar gsoc2013-evolution-299521f02c02278857dfd2561973dc0c94e44b57.tar.gz gsoc2013-evolution-299521f02c02278857dfd2561973dc0c94e44b57.tar.bz2 gsoc2013-evolution-299521f02c02278857dfd2561973dc0c94e44b57.tar.lz gsoc2013-evolution-299521f02c02278857dfd2561973dc0c94e44b57.tar.xz gsoc2013-evolution-299521f02c02278857dfd2561973dc0c94e44b57.tar.zst gsoc2013-evolution-299521f02c02278857dfd2561973dc0c94e44b57.zip | |
Whitespace cleanup.
Replace 8-space indentation with tab characters, and various other
automated cleanups.
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, "<a href=\"http://maps.google.com?q="); - g_string_append_printf (link, "\">%s</a>", _("Open map")); + g_string_prepend (link, "<a href=\"http://maps.google.com?q="); + g_string_append_printf (link, "\">%s</a>", _("Open map")); } if (adr) @@ -186,7 +186,7 @@ accum_address (GString *buffer, { EContactAddress *adr; const gchar *label; - GString *map_link = g_string_new ("<br>"); + GString *map_link = g_string_new ("<br>"); render_address_link (map_link, contact, adr_field); @@ -265,7 +265,7 @@ accum_address (GString *buffer, "<td width=\"" IMAGE_COL_WIDTH "\"></td>" "</tr>", html_label, map_link->str); } else { - g_string_append_printf (buffer, "</td></tr>"); + g_string_append_printf (buffer, "</td></tr>"); } } @@ -293,27 +293,27 @@ render_table_row (GString *buffer, if (icon) { gchar *icon_uri = get_icon_uri (icon); - icon_html = g_strdup_printf ("<img src=\"%s\" width=\"16\" height=\"16\" />", icon_uri); + icon_html = g_strdup_printf ("<img src=\"%s\" width=\"16\" height=\"16\" />", icon_uri); g_free (icon_uri); } else { - icon_html = ""; + icon_html = ""; } if (TEXT_IS_RIGHT_TO_LEFT) { g_string_append_printf ( - buffer, "<tr>" - "<td valign=\"top\" align=\"right\">%s</td>" - "<th align=\"right\" valign=\"top\" width=\"100\" nowrap>:%s</th>" - "<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">%s</td>" - "</tr>", + buffer, "<tr>" + "<td valign=\"top\" align=\"right\">%s</td>" + "<th align=\"right\" valign=\"top\" width=\"100\" nowrap>:%s</th>" + "<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">%s</td>" + "</tr>", value, label, icon_html); } else { g_string_append_printf ( - buffer, "<tr>" - "<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">%s</td>" - "<th valign=\"top\" width=\"100\" nowrap>%s:</th>" - "<td valign=\"top\">%s</td>" - "</tr>", + buffer, "<tr>" + "<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">%s</td>" + "<th valign=\"top\" width=\"100\" nowrap>%s:</th>" + "<td valign=\"top\">%s</td>" + "</tr>", 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, "<br>"); + g_string_append (val, "<br>"); 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, "<table border=\"0\"><tr>" - "<td %s valign=\"middle\">", TEXT_IS_RIGHT_TO_LEFT ? - "align=\"right\"" : ""); + "<td %s valign=\"middle\">", 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, "<img src=\"%s\">", icon); + g_string_append_printf (buffer, "<img src=\"%s\">", icon); g_free (icon); } g_string_append_printf ( buffer, "</td><td width=\"20\"></td><td %s valign=\"top\">\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, "<h2><a href=\"internal-mailto:0\">%s</a></h2>", html); } else { - g_string_append_printf (buffer, "<h2>%s</h2>", html); + g_string_append_printf (buffer, "<h2>%s</h2>", html); } g_free (html); } - g_string_append (buffer, "</td></tr></table>"); + g_string_append (buffer, "</td></tr></table>"); } 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, "<tr>"); + g_string_append (buffer, "<tr>"); if (e_destination_is_evolution_list (destination)) { g_string_append_printf ( buffer, - "<td width=" IMAGE_COL_WIDTH " valign=\"top\">" + "<td width=" IMAGE_COL_WIDTH " valign=\"top\">" "<img src=\"%s/minus.png\" " "onClick=\"collapse_list(this, %s);\" " "class=\"navigable\">" @@ -513,10 +513,10 @@ render_contact_list_row (EABContactFormatter *formatter, formatter, dest->data, buffer); } - g_string_append (buffer, "</table>"); + g_string_append (buffer, "</table>"); } - g_string_append (buffer, "</td>"); + g_string_append (buffer, "</td>"); } else { if (name && *name) { @@ -536,7 +536,7 @@ render_contact_list_row (EABContactFormatter *formatter, } } - g_string_append (buffer, "</tr>"); + g_string_append (buffer, "</tr>"); g_free (evolution_imagesdir); g_free (name); @@ -564,13 +564,13 @@ render_contact_list (EABContactFormatter *formatter, "<table border=\"0\"><tr><th colspan=\"2\">%s</th></tr>" "<tr><td with=" IMAGE_COL_WIDTH "></td><td>", _("List Members:")); - g_string_append (buffer, "<table border=\"0\" cellspacing=\"1\">"); + g_string_append (buffer, "<table border=\"0\" cellspacing=\"1\">"); for (dest = dests; dest; dest = dest->next) render_contact_list_row (formatter, dest->data, buffer); - g_string_append (buffer, "</table>"); - g_string_append (buffer, "</td></tr></table>"); + g_string_append (buffer, "</table>"); + g_string_append (buffer, "</td></tr></table>"); 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<a href=\"internal-mailto:%d\">%s</a>%s " "<span class=\"header\">(%s)</span>", nl, - name ? name : "", - name ? " <" : "", + name ? name : "", + name ? " <" : "", email_num, mail, - name ? ">" : "", - attr_str ? attr_str : ""); + name ? ">" : "", + attr_str ? attr_str : ""); email_num++; - nl = "<br>"; + nl = "<br>"; 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, - "<div class=\"column\" id=\"contact-internet\">" - "<table border=\"0\" cellspacing=\"5\">%s</table>" - "</div>", accum->str); + "<div class=\"column\" id=\"contact-internet\">" + "<table border=\"0\" cellspacing=\"5\">%s</table>" + "</div>", 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, "<tr><td colspan=\"3\">"); + g_string_append (buffer, "<tr><td colspan=\"3\">"); if (map_type == E_CONTACT_ADDRESS_WORK) { g_string_append (buffer, - "<object type=\"application/x-work-map-widget\" " - "width=\"250\" height=\"250\"></object>"); + "<object type=\"application/x-work-map-widget\" " + "width=\"250\" height=\"250\"></object>"); } else { g_string_append (buffer, - "<object type=\"application/x-home-map-widget\" " - "width=\"250\" height=\"250\"></object>"); + "<object type=\"application/x-home-map-widget\" " + "width=\"250\" height=\"250\"></object>"); } - g_string_append (buffer, "</td></tr>"); + g_string_append (buffer, "</td></tr>"); #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, - "<div class=\"column\" id=\"contact-work\">" - "<h3>%s</h3>" - "<table border=\"0\" cellspacing=\"5\">%s</table>" - "</div>", _("Work"), accum->str); + "<div class=\"column\" id=\"contact-work\">" + "<h3>%s</h3>" + "<table border=\"0\" cellspacing=\"5\">%s</table>" + "</div>", _("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, - "<div class=\"column\" id=\"contact-personal\">" - "<h3>%s</h3>" - "<table border=\"0\" cellspacing=\"5\">%s</table>" - "</div>", _("Personal"), accum->str); + "<div class=\"column\" id=\"contact-personal\">" + "<h3>%s</h3>" + "<table border=\"0\" cellspacing=\"5\">%s</table>" + "</div>", _("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, "</table></div>"); + g_string_append (buffer, "</table></div>"); } static void @@ -769,11 +769,11 @@ render_contact (EABContactFormatter *formatter, { render_title_block (formatter, buffer); - g_string_append (buffer, "<div id=\"columns\">"); + g_string_append (buffer, "<div id=\"columns\">"); render_contact_column (formatter, buffer); render_work_column (formatter, buffer); render_personal_column (formatter, buffer); - g_string_append (buffer, "</div>"); + g_string_append (buffer, "</div>"); render_footer (formatter, buffer); } @@ -783,7 +783,7 @@ render_normal (EABContactFormatter *formatter, GString *buffer) { g_string_append (buffer, HTML_HEADER); - g_string_append (buffer, "<body>"); + g_string_append (buffer, "<body>"); if (formatter->priv->contact) { @@ -799,7 +799,7 @@ render_normal (EABContactFormatter *formatter, } - g_string_append (buffer, "</body></html>\n"); + g_string_append (buffer, "</body></html>\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, "<b>%s</b>: %s<br>", label, html); + buffer, "<b>%s</b>: %s<br>", label, html); else g_string_append_printf ( - buffer, "%s: %s<br>", label, html); + buffer, "%s: %s<br>", 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, "<br>\n"); + g_string_append (buffer, "<br>\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<br/>", emfq->priv->credits); + gchar *credits = g_strdup_printf ("%s<br/>", emfq->priv->credits); camel_stream_write_string (stream, credits, cancellable, NULL); g_free (credits); } else { - camel_stream_write_string (stream, "<br/>", cancellable, NULL); + camel_stream_write_string (stream, "<br/>", cancellable, NULL); } if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE) camel_stream_write_string (stream, - "<!--+GtkHTML:<DATA class=\"ClueFlow\" " - "key=\"orig\" value=\"1\">-->\n" - "<blockquote type=cite>\n", cancellable, NULL); + "<!--+GtkHTML:<DATA class=\"ClueFlow\" " + "key=\"orig\" value=\"1\">-->\n" + "<blockquote type=cite>\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, "</blockquote><!--+GtkHTML:" - "<DATA class=\"ClueFlow\" clear=\"orig\">-->", + stream, "</blockquote><!--+GtkHTML:" + "<DATA class=\"ClueFlow\" clear=\"orig\">-->", 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 <object> for '%s' - no ID set?", uri); + g_warning ("Failed to find parent <object> 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 <iframe> representing the attachment content */ - nodes = webkit_dom_element_get_elements_by_tag_name (attachment, "iframe"); + nodes = webkit_dom_element_get_elements_by_tag_name (attachment, "iframe"); length = webkit_dom_node_list_get_length (nodes); for (i = 0; i < length; i++) { @@ -805,8 +805,8 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, GtkWidget *widget; gchar *puri_uri; - puri_uri = g_hash_table_lookup (param, "data"); - if (!puri_uri || !g_str_has_prefix (uri, "mail://")) + puri_uri = g_hash_table_lookup (param, "data"); + if (!puri_uri || !g_str_has_prefix (uri, "mail://")) return NULL; display = E_MAIL_DISPLAY (web_view); @@ -828,11 +828,11 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, if (E_IS_ATTACHMENT_BUTTON (widget)) { /* Attachment button has URI different then the actual PURI because * that URI identifies the attachment itself */ - gchar *button_uri = g_strconcat (puri_uri, ".attachment_button", NULL); - g_object_set_data_full (G_OBJECT (widget), "uri", + gchar *button_uri = g_strconcat (puri_uri, ".attachment_button", NULL); + g_object_set_data_full (G_OBJECT (widget), "uri", button_uri, (GDestroyNotify) g_free); } else { - g_object_set_data_full (G_OBJECT (widget), "uri", + g_object_set_data_full (G_OBJECT (widget), "uri", g_strdup (puri_uri), (GDestroyNotify) g_free); } @@ -841,9 +841,9 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, /* Resizing a GtkWidget requires changing size of parent * <object> HTML element in DOM. */ - g_signal_connect (widget, "realize", + g_signal_connect (widget, "realize", G_CALLBACK (mail_display_plugin_widget_realize_cb), display); - g_signal_connect (widget, "size-allocate", + g_signal_connect (widget, "size-allocate", G_CALLBACK (mail_display_plugin_widget_resize), display); /* Embed the attachment bar into the GtkBox before we do anything @@ -859,9 +859,9 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (box), widget, FALSE, FALSE, 0); - g_signal_connect (widget, "notify::expanded", + g_signal_connect (widget, "notify::expanded", G_CALLBACK (mail_display_plugin_widget_resize), display); - g_signal_connect (widget, "notify::active-view", + g_signal_connect (widget, "notify::active-view", G_CALLBACK (mail_display_plugin_widget_resize), display); /* Show the EAttachmentBar but not the containing layout */ @@ -889,10 +889,10 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, /* Show/hide the attachment when the EAttachmentButton * is expanded/collapsed or shown/hidden */ - g_signal_connect_data (widget, "notify::expanded", + g_signal_connect_data (widget, "notify::expanded", G_CALLBACK (attachment_button_expanded), g_object_ref (attachment), (GClosureNotify) g_object_unref, 0); - g_signal_connect_data (widget, "notify::visible", + g_signal_connect_data (widget, "notify::visible", G_CALLBACK (attachment_button_expanded), g_object_ref (attachment), (GClosureNotify) g_object_unref, 0); /* Initial synchronization */ @@ -902,7 +902,7 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, /* Find all <iframes> within the attachment and bind * it's visiblity to expanded state of the attachment btn */ nodes = webkit_dom_element_get_elements_by_tag_name ( - attachment, "iframe"); + attachment, "iframe"); length = webkit_dom_node_list_get_length (nodes); for (i = 0; i < length; i++) { @@ -922,7 +922,7 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, camel_mime_part_get_content_disposition (puri->part); if (disposition && g_ascii_strncasecmp ( - disposition->disposition, "inline", 6) == 0) { + disposition->disposition, "inline", 6) == 0) { e_attachment_button_set_expanded ( E_ATTACHMENT_BUTTON (widget), TRUE); @@ -930,7 +930,7 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, } } - d(printf("Created widget %s (%p)\n", puri_uri, widget)); + d(printf("Created widget %s (%p)\n", puri_uri, widget)); return widget; } @@ -948,38 +948,38 @@ toggle_headers_visibility (WebKitDOMElement *button, document = webkit_web_view_get_dom_document (web_view); short_headers = webkit_dom_document_get_element_by_id ( - document, "__evo-short-headers"); + document, "__evo-short-headers"); if (!short_headers) return; css_short = webkit_dom_element_get_style (short_headers); full_headers = webkit_dom_document_get_element_by_id ( - document, "__evo-full-headers"); + document, "__evo-full-headers"); if (!full_headers) return; css_full = webkit_dom_element_get_style (full_headers); expanded = (g_strcmp0 (webkit_dom_css_style_declaration_get_property_value ( - css_full, "display"), "block") == 0); + css_full, "display"), "block") == 0); - webkit_dom_css_style_declaration_set_property (css_full, "display", - expanded ? "none" : "block", "", NULL); - webkit_dom_css_style_declaration_set_property (css_short, "display", - expanded ? "block" : "none", "", NULL); + webkit_dom_css_style_declaration_set_property (css_full, "display", + expanded ? "none" : "block", "", NULL); + webkit_dom_css_style_declaration_set_property (css_short, "display", + expanded ? "block" : "none", "", NULL); if (expanded) - path = "evo-file://" EVOLUTION_IMAGESDIR "/plus.png"; + path = "evo-file://" EVOLUTION_IMAGESDIR "/plus.png"; else - path = "evo-file://" EVOLUTION_IMAGESDIR "/minus.png"; + path = "evo-file://" EVOLUTION_IMAGESDIR "/minus.png"; webkit_dom_html_image_element_set_src ( WEBKIT_DOM_HTML_IMAGE_ELEMENT (button), path); e_mail_display_set_headers_collapsed (E_MAIL_DISPLAY (web_view), expanded); - d(printf("Headers %s!\n", expanded ? "collapsed" : "expanded")); + d(printf("Headers %s!\n", expanded ? "collapsed" : "expanded")); } static const gchar* addresses[] = { "to", "cc", "bcc" }; @@ -998,7 +998,7 @@ toggle_address_visibility (WebKitDOMElement *button, document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (button)); - id = g_strconcat ("__evo-moreaddr-", address, NULL); + id = g_strconcat ("__evo-moreaddr-", address, NULL); full_addr = webkit_dom_document_get_element_by_id (document, id); g_free (id); @@ -1007,7 +1007,7 @@ toggle_address_visibility (WebKitDOMElement *button, css_full = webkit_dom_element_get_style (full_addr); - id = g_strconcat ("__evo-moreaddr-ellipsis-", address, NULL); + id = g_strconcat ("__evo-moreaddr-ellipsis-", address, NULL); ellipsis = webkit_dom_document_get_element_by_id (document, id); g_free (id); @@ -1018,21 +1018,21 @@ toggle_address_visibility (WebKitDOMElement *button, expanded = (g_strcmp0 ( webkit_dom_css_style_declaration_get_property_value ( - css_full, "display"), "inline") == 0); + css_full, "display"), "inline") == 0); webkit_dom_css_style_declaration_set_property ( - css_full, "display", (expanded ? "none" : "inline"), "", NULL); + css_full, "display", (expanded ? "none" : "inline"), "", NULL); webkit_dom_css_style_declaration_set_property ( - css_ellipsis, "display", (expanded ? "inline" : "none"), "", NULL); + css_ellipsis, "display", (expanded ? "inline" : "none"), "", NULL); if (expanded) { - path = "evo-file://" EVOLUTION_IMAGESDIR "/plus.png"; + path = "evo-file://" EVOLUTION_IMAGESDIR "/plus.png"; } else { - path = "evo-file://" EVOLUTION_IMAGESDIR "/minus.png"; + path = "evo-file://" EVOLUTION_IMAGESDIR "/minus.png"; } if (!WEBKIT_DOM_IS_HTML_IMAGE_ELEMENT (button)) { - id = g_strconcat ("__evo-moreaddr-img-", address, NULL); + id = g_strconcat ("__evo-moreaddr-img-", address, NULL); button = webkit_dom_document_get_element_by_id (document, id); g_free (id); @@ -1066,19 +1066,19 @@ setup_DOM_bindings (GObject *object, document = webkit_web_view_get_dom_document (web_view); button = webkit_dom_document_get_element_by_id ( - document, "__evo-collapse-headers-img"); + document, "__evo-collapse-headers-img"); if (!button) return; - d(printf("Conntecting to __evo-collapsable-headers-img::click event\n")); + d(printf("Conntecting to __evo-collapsable-headers-img::click event\n")); webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (button), "click", + WEBKIT_DOM_EVENT_TARGET (button), "click", G_CALLBACK (toggle_headers_visibility), FALSE, web_view); for (i = 0; i < 3; i++) { gchar *id; - id = g_strconcat ("__evo-moreaddr-img-", addresses[i], NULL); + id = g_strconcat ("__evo-moreaddr-img-", addresses[i], NULL); button = webkit_dom_document_get_element_by_id (document, id); g_free (id); @@ -1086,11 +1086,11 @@ setup_DOM_bindings (GObject *object, continue; webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (button), "click", + WEBKIT_DOM_EVENT_TARGET (button), "click", G_CALLBACK (toggle_address_visibility), FALSE, (gpointer) addresses[i]); - id = g_strconcat ("__evo-moreaddr-ellipsis-", addresses[i], NULL); + id = g_strconcat ("__evo-moreaddr-ellipsis-", addresses[i], NULL); button = webkit_dom_document_get_element_by_id (document, id); g_free (id); @@ -1098,7 +1098,7 @@ setup_DOM_bindings (GObject *object, continue; webkit_dom_event_target_add_event_listener ( - WEBKIT_DOM_EVENT_TARGET (button), "click", + WEBKIT_DOM_EVENT_TARGET (button), "click", G_CALLBACK (toggle_address_visibility), FALSE, (gpointer) addresses[i]); } @@ -1152,7 +1152,7 @@ puri_bind_dom (GObject *object, if (puri->bind_func) { WebKitDOMElement *el = find_element_by_id (document, puri->uri); if (el) { - d(printf("bind_func for %s\n", puri->uri)); + d(printf("bind_func for %s\n", puri->uri)); puri->bind_func (el, puri); } } @@ -1166,12 +1166,12 @@ mail_display_frame_created (WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data) { - d(printf("Frame %s created!\n", webkit_web_frame_get_name (frame))); + d(printf("Frame %s created!\n", webkit_web_frame_get_name (frame))); /* Re-bind visibility of this newly created <iframe> with * related EAttachmentButton whenever content of this <iframe> is * (re)loaded */ - g_signal_connect (frame, "notify::load-status", + g_signal_connect (frame, "notify::load-status", G_CALLBACK (bind_attachment_iframe_visibility), NULL); /* Call bind_func of all PURIs written in this frame */ @@ -1258,30 +1258,30 @@ e_mail_display_init (EMailDisplay *display) gtk_action_group_add_actions (display->priv->mailto_actions, mailto_entries, G_N_ELEMENTS (mailto_entries), NULL); - display->priv->images_actions = gtk_action_group_new ("image"); + display->priv->images_actions = gtk_action_group_new ("image"); gtk_action_group_add_actions (display->priv->images_actions, image_entries, G_N_ELEMENTS (image_entries), NULL); webkit_web_view_set_full_content_zoom (WEBKIT_WEB_VIEW (display), TRUE); settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (display)); - g_object_set (settings, "enable-frame-flattening", TRUE, NULL); + g_object_set (settings, "enable-frame-flattening", TRUE, NULL); - g_signal_connect (display, "navigation-policy-decision-requested", + g_signal_connect (display, "navigation-policy-decision-requested", G_CALLBACK (mail_display_link_clicked), NULL); - g_signal_connect (display, "resource-request-starting", + g_signal_connect (display, "resource-request-starting", G_CALLBACK (mail_display_resource_requested), NULL); - g_signal_connect (display, "process-mailto", + g_signal_connect (display, "process-mailto", G_CALLBACK (mail_display_process_mailto), NULL); - g_signal_connect (display, "update-actions", + g_signal_connect (display, "update-actions", G_CALLBACK (mail_display_webview_update_actions), NULL); - g_signal_connect (display, "create-plugin-widget", + g_signal_connect (display, "create-plugin-widget", G_CALLBACK (mail_display_plugin_widget_requested), NULL); - g_signal_connect (display, "frame-created", + g_signal_connect (display, "frame-created", G_CALLBACK (mail_display_frame_created), NULL); main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display)); - g_signal_connect (main_frame, "notify::load-status", + g_signal_connect (main_frame, "notify::load-status", G_CALLBACK (setup_DOM_bindings), NULL); main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display)); g_signal_connect (main_frame, "notify::load-status", @@ -1295,7 +1295,7 @@ e_mail_display_init (EMailDisplay *display) gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error); if (error != NULL) { - g_error ("%s", error->message); + g_error ("%s", error->message); g_error_free (error); } @@ -1304,7 +1304,7 @@ e_mail_display_init (EMailDisplay *display) gtk_ui_manager_add_ui_from_string (ui_manager, image_ui, -1, &error); if (error != NULL) { - g_error ("%s", error->message); + g_error ("%s", error->message); g_error_free (error); } @@ -1353,11 +1353,11 @@ e_mail_display_set_formatter (EMailDisplay *display, mail_display_update_formatter_colors (display); - g_signal_connect (formatter, "notify::image-loading-policy", + g_signal_connect (formatter, "notify::image-loading-policy", G_CALLBACK (formatter_image_loading_policy_changed_cb), display); g_signal_connect_swapped (formatter, "redraw-requested", G_CALLBACK (e_mail_display_reload), display); - g_signal_connect_swapped (formatter, "notify::charset", + g_signal_connect_swapped (formatter, "notify::charset", G_CALLBACK (e_mail_display_reload), display); g_object_notify (G_OBJECT (display), "formatter"); @@ -1450,9 +1450,9 @@ e_mail_display_load (EMailDisplay *display, emf = EM_FORMAT (display->priv->formatter); uri = em_format_build_mail_uri (emf->folder, emf->message_uid, - "mode", G_TYPE_INT, display->priv->mode, - "headers_collapsable", G_TYPE_BOOLEAN, display->priv->headers_collapsable, - "headers_collapsed", G_TYPE_BOOLEAN, display->priv->headers_collapsed, + "mode", G_TYPE_INT, display->priv->mode, + "headers_collapsable", G_TYPE_BOOLEAN, display->priv->headers_collapsable, + "headers_collapsed", G_TYPE_BOOLEAN, display->priv->headers_collapsed, NULL); e_web_view_load_uri (E_WEB_VIEW (display), uri); @@ -1489,7 +1489,7 @@ e_mail_display_reload (EMailDisplay *display) new_uri = g_string_new (base); g_free (base); - table = soup_form_decode (strstr (uri, "?") + 1); + table = soup_form_decode (strstr (uri, "?") + 1); g_hash_table_insert (table, g_strdup ("mode"), g_strdup_printf ("%d", display->priv->mode)); g_hash_table_insert (table, g_strdup ("headers_collapsable"), g_strdup_printf ("%d", display->priv->headers_collapsable)); g_hash_table_insert (table, g_strdup ("headers_collapsed"), g_strdup_printf ("%d", display->priv->headers_collapsed)); @@ -1535,19 +1535,19 @@ e_mail_display_set_status (EMailDisplay *display, g_return_if_fail (E_IS_MAIL_DISPLAY (display)); str = g_strdup_printf ( - "<!DOCTYPE>" - "<html>" - "<head><title>Evolution Mail Display</title></head>" - "<body>" - "<table border=\"0\" width=\"100%%\" height=\"100%%\">" - "<tr height=\"100%%\" valign=\"middle\">" - "<td width=\"100%%\" align=\"center\">" - "<strong>%s</strong>" - "</td>" - "</tr>" - "</table>" - "</body>" - "</html>", status); + "<!DOCTYPE>" + "<html>" + "<head><title>Evolution Mail Display</title></head>" + "<body>" + "<table border=\"0\" width=\"100%%\" height=\"100%%\">" + "<tr height=\"100%%\" valign=\"middle\">" + "<td width=\"100%%\" align=\"center\">" + "<strong>%s</strong>" + "</td>" + "</tr>" + "</table>" + "</body>" + "</html>", status); e_web_view_load_string (E_WEB_VIEW (display), str); g_free (str); diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c index f0fb8412a5..0a52a0a5b2 100644 --- a/mail/e-mail-printer.c +++ b/mail/e-mail-printer.c @@ -204,7 +204,7 @@ emp_run_print_operation (EMailPrinter *emp) if (emp->priv->uri) g_free (emp->priv->uri); - emp->priv->uri = g_strconcat (mail_uri, "?part_id=print_layout&__evo-load-images=1", NULL); + emp->priv->uri = g_strconcat (mail_uri, "?part_id=print_layout&__evo-load-images=1", NULL); if (emp->priv->webview == NULL) { emp->priv->webview = g_object_new (E_TYPE_MAIL_DISPLAY, NULL); @@ -212,7 +212,7 @@ emp_run_print_operation (EMailPrinter *emp) e_mail_display_set_force_load_images ( E_MAIL_DISPLAY (emp->priv->webview), TRUE); g_object_ref_sink (emp->priv->webview); - g_signal_connect (emp->priv->webview, "notify::load-status", + g_signal_connect (emp->priv->webview, "notify::load-status", G_CALLBACK (emp_start_printing), emp); w ({ @@ -245,14 +245,14 @@ set_header_visible (EMailPrinter *emp, WebKitDOMCSSStyleDeclaration *style; document = webkit_web_view_get_dom_document (emp->priv->webview); - headers = webkit_dom_document_get_elements_by_class_name (document, "header-item"); + headers = webkit_dom_document_get_elements_by_class_name (document, "header-item"); g_return_if_fail (index < webkit_dom_node_list_get_length (headers)); element = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (headers, index)); style = webkit_dom_element_get_style (element); webkit_dom_css_style_declaration_set_property (style, - "display", (visible ? "table-row" : "none"), "", NULL); + "display", (visible ? "table-row" : "none"), "", NULL); } static void @@ -380,7 +380,7 @@ emp_headers_tab_move (GtkWidget *button, /* The order of header rows in the HMTL document should be in sync with order of headers in the listview and in efhp->headers_list */ document = webkit_web_view_get_dom_document (emp->priv->webview); - headers = webkit_dom_document_get_elements_by_class_name (document, "header-item"); + headers = webkit_dom_document_get_elements_by_class_name (document, "header-item"); l = g_list_nth (selected_rows, g_list_length (selected_rows) / 2); selection_middle = gtk_tree_row_reference_new (model, l->data); @@ -520,7 +520,7 @@ emp_create_headers_tab (GtkPrintOperation *operation, view = GTK_TREE_VIEW (emp->priv->treeview); selection = gtk_tree_view_get_selection (view); gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); - g_signal_connect (selection, "changed", + g_signal_connect (selection, "changed", G_CALLBACK (emp_headers_tab_selection_changed), emp); renderer = gtk_cell_renderer_toggle_new (); @@ -549,41 +549,41 @@ emp_create_headers_tab (GtkPrintOperation *operation, button = gtk_button_new_from_stock (GTK_STOCK_SELECT_ALL); emp->priv->buttons[BUTTON_SELECT_ALL] = button; - g_signal_connect (button, "clicked", + g_signal_connect (button, "clicked", G_CALLBACK (emp_headers_tab_toggle_selection), emp); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5); button = gtk_button_new_from_stock (GTK_STOCK_CLEAR); emp->priv->buttons[BUTTON_SELECT_NONE] = button; - g_signal_connect (button, "clicked", + g_signal_connect (button, "clicked", G_CALLBACK (emp_headers_tab_toggle_selection), emp); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5); button = gtk_button_new_from_stock (GTK_STOCK_GOTO_TOP); emp->priv->buttons[BUTTON_TOP] = button; gtk_widget_set_sensitive (button, FALSE); - g_signal_connect (button, "clicked", + g_signal_connect (button, "clicked", G_CALLBACK (emp_headers_tab_move), emp); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5); button = gtk_button_new_from_stock (GTK_STOCK_GO_UP); emp->priv->buttons[BUTTON_UP] = button; gtk_widget_set_sensitive (button, FALSE); - g_signal_connect (button, "clicked", + g_signal_connect (button, "clicked", G_CALLBACK (emp_headers_tab_move), emp); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5); button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN); emp->priv->buttons[BUTTON_DOWN] = button; gtk_widget_set_sensitive (button, FALSE); - g_signal_connect (button, "clicked", + g_signal_connect (button, "clicked", G_CALLBACK (emp_headers_tab_move), emp); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5); button = gtk_button_new_from_stock (GTK_STOCK_GOTO_BOTTOM); emp->priv->buttons[BUTTON_BOTTOM] = button; gtk_widget_set_sensitive (button, FALSE); - g_signal_connect (button, "clicked", + g_signal_connect (button, "clicked", G_CALLBACK (emp_headers_tab_move), emp); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5); @@ -781,7 +781,7 @@ e_mail_printer_init (EMailPrinter *emp) } EMailPrinter * -e_mail_printer_new (EMFormatHTML * source) +e_mail_printer_new (EMFormatHTML *source) { EMailPrinter *emp; EMFormatHTMLPrint *efhp; @@ -813,13 +813,13 @@ e_mail_printer_print (EMailPrinter *emp, G_CALLBACK (emp_create_headers_tab), emp); g_signal_connect (emp->priv->operation, "done", G_CALLBACK (emp_printing_done), emp); - g_signal_connect (emp->priv->operation, "draw-page", + g_signal_connect (emp->priv->operation, "draw-page", G_CALLBACK (emp_draw_footer), NULL); emp->priv->export_mode = export_mode; if (cancellable) - g_signal_connect_swapped (cancellable, "cancelled", + g_signal_connect_swapped (cancellable, "cancelled", G_CALLBACK (gtk_print_operation_cancel), emp->priv->operation); emp_run_print_operation (emp); diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 54c588b9c9..d43ef27dc3 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -234,7 +234,7 @@ e_mail_reader_delete_folder (EMailReader *reader, shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend)); - if(!store_is_local && !e_shell_get_online (shell)) + if (!store_is_local && !e_shell_get_online (shell)) { e_alert_submit ( alert_sink, "mail:online-operation", @@ -242,7 +242,6 @@ e_mail_reader_delete_folder (EMailReader *reader, return; } - have_flags = mail_folder_cache_get_folder_info_flags ( folder_cache, folder, &flags); diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 4940fbe321..da1fdb5905 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -301,7 +301,7 @@ action_mail_image_save_cb (GtkAction *action, g_return_if_fail (emf != NULL); g_return_if_fail (emf->message != NULL); - if (g_str_has_prefix (image_src, "cid:")) { + if (g_str_has_prefix (image_src, "cid:")) { part = camel_mime_message_get_part_by_content_id ( emf->message, image_src + 4); g_return_if_fail (part != NULL); @@ -317,7 +317,7 @@ action_mail_image_save_cb (GtkAction *action, /* Open cache and find the file there */ user_cache_dir = e_get_user_cache_dir (); cache = camel_data_cache_new (user_cache_dir, NULL); - image_stream = camel_data_cache_get (cache, "http", image_src, NULL); + image_stream = camel_data_cache_get (cache, "http", image_src, NULL); if (!image_stream) { g_object_unref (cache); return; @@ -335,7 +335,7 @@ action_mail_image_save_cb (GtkAction *action, dw = camel_data_wrapper_new (); camel_data_wrapper_set_mime_type ( - dw, "application/octet-stream"); + dw, "application/octet-stream"); camel_data_wrapper_construct_from_stream_sync ( dw, image_stream, NULL, NULL); camel_medium_set_content (CAMEL_MEDIUM (part), dw); @@ -350,7 +350,7 @@ action_mail_image_save_cb (GtkAction *action, file = e_shell_run_save_dialog ( e_shell_get_default (), - _("Save Image"), camel_mime_part_get_filename (part), + _("Save Image"), camel_mime_part_get_filename (part), NULL, NULL, NULL); if (file == NULL) { g_object_unref (part); @@ -2817,7 +2817,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader) g_free (string); activity = e_mail_reader_new_activity (reader); - e_activity_set_text (activity, _("Retrieving message")); + e_activity_set_text (activity, _("Retrieving message")); cancellable = e_activity_get_cancellable (activity); closure = g_slice_new0 (EMailReaderClosure); @@ -3040,7 +3040,7 @@ formatter_weak_ref_cb (struct _formatter_weak_ref_closure *data, g_hash_table_remove (data->formatters, data->mail_uri); - d(printf("Destroying formatter %p (%s)\n", formatter, data->mail_uri)); + d(printf("Destroying formatter %p (%s)\n", formatter, data->mail_uri)); /* Destroying the formatter will prevent this callback * being called, so we can remove the closure data as well */ @@ -3985,10 +3985,10 @@ e_mail_reader_init (EMailReader *reader, action, "activate", G_CALLBACK (action_search_folder_sender_cb), reader); - action_name = "image-save"; + action_name = "image-save"; action = e_mail_display_get_action (display, action_name); g_signal_connect ( - action, "activate", + action, "activate", G_CALLBACK (action_mail_image_save_cb), reader); #ifndef G_OS_WIN32 diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index acff5e9b4f..5bacb2e38a 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -962,7 +962,7 @@ em_utils_composer_print_cb (EMsgComposer *composer, /* Use EMailPrinter and WebKit to print the message */ emp = e_mail_printer_new ((EMFormatHTML *) efhd); - g_signal_connect (emp, "done", + g_signal_connect (emp, "done", G_CALLBACK (composer_print_done_cb), efhd); e_mail_printer_print (emp, FALSE, NULL); diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 2a42beb943..889d69fdb1 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -383,7 +383,7 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button, g_object_unref (builder); g_signal_connect ( - po->widget, "response", + po->widget, "response", G_CALLBACK (efhd_xpkcs7mime_info_response), po); gtk_widget_show (po->widget); @@ -529,8 +529,8 @@ efhd_parse_attachment (EMFormat *emf, * We have converted text/ * to text/html, other (binary) formats remained * untouched. */ ct = camel_content_type_decode (handler->mime_type); - if (g_strcmp0 (ct->type, "text") == 0) - puri->puri.mime_type = g_strdup ("text/html"); + if (g_strcmp0 (ct->type, "text") == 0) + puri->puri.mime_type = g_strdup ("text/html"); else puri->puri.mime_type = camel_content_type_simple (ct); camel_content_type_unref (ct); @@ -617,7 +617,7 @@ efhd_parse_optional (EMFormat *emf, gint len; len = part_id->len; - g_string_append (part_id, ".optional"); + g_string_append (part_id, ".optional"); puri = (EMFormatAttachmentPURI *) em_format_puri_new ( emf, sizeof (EMFormatAttachmentPURI), part, part_id->str); @@ -718,9 +718,9 @@ efhd_write_attachment_bar (EMFormat *emf, return; str = g_strdup_printf ( - "<object type=\"application/x-attachment-bar\" " + "<object type=\"application/x-attachment-bar\" " "height=\"20\" width=\"100%%\" " - "id=\"%s\"data=\"%s\"></object>", puri->uri, puri->uri); + "id=\"%s\"data=\"%s\"></object>", puri->uri, puri->uri); camel_stream_write_string (stream, str, cancellable, NULL); @@ -762,19 +762,19 @@ efhd_write_attachment (EMFormat *emf, else mime_type = efa->snoop_mime_type; - button_id = g_strconcat (puri->uri, ".attachment_button", NULL); + button_id = g_strconcat (puri->uri, ".attachment_button", NULL); desc = em_format_describe_part (puri->part, mime_type); str = g_strdup_printf ( - "<div class=\"attachment\">" - "<table width=\"100%%\" border=\"0\">" - "<tr valign=\"middle\">" - "<td align=\"left\" width=\"100\">" - "<object type=\"application/x-attachment-button\" " + "<div class=\"attachment\">" + "<table width=\"100%%\" border=\"0\">" + "<tr valign=\"middle\">" + "<td align=\"left\" width=\"100\">" + "<object type=\"application/x-attachment-button\" " "height=\"20\" width=\"100\" data=\"%s\" id=\"%s\"></object>" - "</td>" - "<td align=\"left\">%s</td>" - "</tr>", puri->uri, button_id, desc); + "</td>" + "<td align=\"left\">%s</td>" + "</tr>", puri->uri, button_id, desc); camel_stream_write_string (stream, str, cancellable, NULL); g_free (desc); @@ -786,8 +786,8 @@ efhd_write_attachment (EMFormat *emf, (efa->attachment_view_part_id)) { str = g_strdup_printf ( - "<tr><td colspan=\"2\">" - "<div class=\"attachment-wrapper\" id=\"%s\">", + "<tr><td colspan=\"2\">" + "<div class=\"attachment-wrapper\" id=\"%s\">", puri->uri); camel_stream_write_string (stream, str, cancellable, NULL); @@ -805,10 +805,10 @@ efhd_write_attachment (EMFormat *emf, p->write_func (emf, p, stream, info, cancellable); } - camel_stream_write_string (stream, "</div></td></tr>", cancellable, NULL); + camel_stream_write_string (stream, "</div></td></tr>", cancellable, NULL); } - camel_stream_write_string (stream, "</table></div>", cancellable, NULL); + camel_stream_write_string (stream, "</table></div>", cancellable, NULL); } static void @@ -825,9 +825,9 @@ efhd_write_secure_button (EMFormat *emf, return; str = g_strdup_printf ( - "<object type=\"application/x-secure-button\" " - "height=\"20\" width=\"100%%\" " - "data=\"%s\" id=\"%s\"></object>", puri->uri, puri->uri); + "<object type=\"application/x-secure-button\" " + "height=\"20\" width=\"100%%\" " + "data=\"%s\" id=\"%s\"></object>", puri->uri, puri->uri); camel_stream_write_string (stream, str, cancellable, NULL); @@ -1045,7 +1045,7 @@ efhd_attachment_button (EMFormat *emf, } widget = e_attachment_button_new (); - g_object_set_data (G_OBJECT (widget), "uri", puri->uri); + g_object_set_data (G_OBJECT (widget), "uri", puri->uri); e_attachment_button_set_attachment ( E_ATTACHMENT_BUTTON (widget), info->attachment); e_attachment_button_set_view ( diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index ed64a9ea07..150c16dbf5 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -75,12 +75,12 @@ efhp_write_attachments_list (EMFormatHTMLPrint *efhp, return; str = g_string_new ( - "<table border=\"0\" cellspacing=\"5\" cellpadding=\"0\" " - "class=\"attachments-list\" >\n"); + "<table border=\"0\" cellspacing=\"5\" cellpadding=\"0\" " + "class=\"attachments-list\" >\n"); g_string_append_printf (str, - "<tr><th colspan=\"2\"><h1>%s</h1></td></tr>\n" - "<tr><th>%s</th><th>%s</th></tr>\n", - _("Attachments"), _("Name"), _("Size")); + "<tr><th colspan=\"2\"><h1>%s</h1></td></tr>\n" + "<tr><th>%s</th><th>%s</th></tr>\n", + _("Attachments"), _("Name"), _("Size")); for (iter = efhp->priv->attachments; iter; iter = iter->next) { EMFormatPURI *puri = iter->data; @@ -97,7 +97,7 @@ efhp_write_attachments_list (EMFormatHTMLPrint *efhp, if (e_attachment_get_description (attachment) && *e_attachment_get_description (attachment)) { - name = g_strdup_printf ("%s (%s)", + name = g_strdup_printf ("%s (%s)", e_attachment_get_description (attachment), g_file_info_get_display_name (fi)); } else { @@ -108,14 +108,14 @@ efhp_write_attachments_list (EMFormatHTMLPrint *efhp, ba = camel_data_wrapper_get_byte_array (dw); size = g_format_size (ba->len); - g_string_append_printf (str, "<tr><td>%s</td><td>%s</td></tr>\n", + g_string_append_printf (str, "<tr><td>%s</td><td>%s</td></tr>\n", name, size); g_free (name); g_free (size); } - g_string_append (str, "</table>\n"); + g_string_append (str, "</table>\n"); camel_stream_write_string (stream, str->str, cancellable, NULL); g_string_free (str, TRUE); @@ -140,12 +140,12 @@ efhp_write_headers (EMFormat *emf, buf = camel_medium_get_header (CAMEL_MEDIUM (puri->part), "subject"); subject = camel_header_decode_string (buf, "UTF-8"); str = g_string_new ("<table border=\"0\" cellspacing=\"5\" " \ - "cellpadding=\"0\" class=\"printing-header\">\n"); + "cellpadding=\"0\" class=\"printing-header\">\n"); g_string_append_printf ( str, - "<tr class=\"header-item\">" - "<td colspan=\"2\"><h1>%s</h1></td>" - "</tr>\n", + "<tr class=\"header-item\">" + "<td colspan=\"2\"><h1>%s</h1></td>" + "</tr>\n", subject); g_free (subject); @@ -181,7 +181,7 @@ efhp_write_headers (EMFormat *emf, } /* Get prefix of this PURI */ - puri_prefix = g_strndup (puri->uri, g_strrstr (puri->uri, ".") - puri->uri); + puri_prefix = g_strndup (puri->uri, g_strrstr (puri->uri, ".") - puri->uri); /* Add encryption/signature header */ raw_header.name = _("Security"); @@ -282,11 +282,11 @@ efhp_write_inline_attachment (EMFormat *emf, if (e_attachment_get_description (attachment) && *e_attachment_get_description (attachment)) { - name = g_strdup_printf ("<h2>Attachment: %s (%s)</h2>\n", + name = g_strdup_printf ("<h2>Attachment: %s (%s)</h2>\n", e_attachment_get_description (attachment), g_file_info_get_display_name (fi)); } else { - name = g_strdup_printf ("<h2>Attachment: %s</h2>\n", + name = g_strdup_printf ("<h2>Attachment: %s</h2>\n", g_file_info_get_display_name (fi)); } @@ -314,7 +314,7 @@ efhp_write_print_layout (EMFormat *emf, "<head>\n<meta name=\"generator\" content=\"Evolution Mail Component\" />\n" "<title>Evolution Mail Display</title>\n" "<link type=\"text/css\" rel=\"stylesheet\" media=\"print\" " - "href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview-print.css\" />\n" + "href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview-print.css\" />\n" "</head>\n" "<body style=\"background: #FFF; color: #000;\">", cancellable, NULL); @@ -336,7 +336,7 @@ efhp_write_print_layout (EMFormat *emf, puri->write_func (emf, puri, stream, &print_info, cancellable); - while (iter && !g_str_has_suffix (puri->uri, ".rfc822.end")) { + while (iter && !g_str_has_suffix (puri->uri, ".rfc822.end")) { iter = iter->next; if (iter) @@ -355,15 +355,15 @@ efhp_write_print_layout (EMFormat *emf, CamelContentType *ct; gchar *mime_type; - if (puri->cid && g_ascii_strncasecmp (puri->cid, "cid:", 4) == 0) + if (puri->cid && g_ascii_strncasecmp (puri->cid, "cid:", 4) == 0) continue; ct = camel_mime_part_get_content_type (puri->part); mime_type = camel_content_type_simple (ct); handler = em_format_find_handler (puri->emf, mime_type); - d(printf("Handler for PURI %s (%s): %s\n", puri->uri, mime_type, - handler ? handler->mime_type : "(null)")); + d(printf("Handler for PURI %s (%s): %s\n", puri->uri, mime_type, + handler ? handler->mime_type : "(null)")); g_free (mime_type); efhp->priv->attachments = diff --git a/mail/em-format-html.c b/mail/em-format-html.c index ab3324d73a..0dd190eba9 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -149,7 +149,7 @@ efh_parse_image (EMFormat *emf, tmp = camel_mime_part_get_content_id (part); if (!tmp) { em_format_parse_part_as (emf, part, part_id, info, - "x-evolution/message/attachment", cancellable); + "x-evolution/message/attachment", cancellable); return; } @@ -522,7 +522,7 @@ efh_parse_message_rfc822 (EMFormat *emf, /* Create an empty PURI that will represent start of the RFC message */ puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str); puri->write_func = efh_write_message_rfc822; - puri->mime_type = g_strdup ("text/html"); + puri->mime_type = g_strdup ("text/html"); puri->is_attachment = info->is_attachment; em_format_add_puri (emf, puri); @@ -544,7 +544,7 @@ efh_parse_message_rfc822 (EMFormat *emf, /* Add another generic PURI that represents end of the RFC message. * The em_format_write() function will skip all PURIs between the ".rfc822" * PURI and ".rfc822.end" PURI as they will be rendered in an <iframe> */ - g_string_append (part_id, ".end"); + g_string_append (part_id, ".end"); puri = em_format_puri_new (emf, sizeof (EMFormatPURI), NULL, part_id->str); em_format_add_puri (emf, puri); @@ -901,11 +901,11 @@ efh_write_text_html (EMFormat *emf, } else if (g_ascii_strncasecmp (tag, "script", 6) == 0) { tags = g_list_append ( tags, - get_tag ("script", opening, closing)); + get_tag ("script", opening, closing)); } else if (g_ascii_strncasecmp (tag, "link", 4) == 0) { tags = g_list_append ( tags, - get_tag ("link", opening, closing)); + get_tag ("link", opening, closing)); } else if (g_ascii_strncasecmp (tag, "body", 4) == 0) { valid = TRUE; break; @@ -983,7 +983,7 @@ efh_write_text_html (EMFormat *emf, "<div class=\"part-container-inner-margin\">\n" "<iframe width=\"100%%\" height=\"auto\"" " frameborder=\"0\" src=\"%s\"></iframe>" - "</div></div>", + "</div></div>", 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, "<img src=\"evo-file://%s/%s\" class=\"navigable\" " "id=\"__evo-collapse-headers-img\" />" - "</td><td>", + "</td><td>", 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 ( - "<div class=\"part-container\" style=\"border-color: #%06x; " - "background-color: #%06x;\">" - "<div class=\"part-container-inner-margin\">\n" - "<iframe width=\"100%%\" height=\"auto\"" - " frameborder=\"0\" src=\"%s\" name=\"%s\"></iframe>" - "</div></div>", + "<div class=\"part-container\" style=\"border-color: #%06x; " + "background-color: #%06x;\">" + "<div class=\"part-container-inner-margin\">\n" + "<iframe width=\"100%%\" height=\"auto\"" + " frameborder=\"0\" src=\"%s\" name=\"%s\"></iframe>" + "</div></div>", 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 ( - "<!DOCTYPE HTML>\n<html>\n" - "<head>\n<meta name=\"generator\" content=\"Evolution Mail Component\" />\n" - "<title>Evolution Mail Display</title>\n" - "<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\" />\n" - "<style type=\"text/css\">\n" - " table th { color: #000; font-weight: bold; }\n" - "</style>\n" - "</head><body bgcolor=\"#%06x\">", + "<!DOCTYPE HTML>\n<html>\n" + "<head>\n<meta name=\"generator\" content=\"Evolution Mail Component\" />\n" + "<title>Evolution Mail Display</title>\n" + "<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\" />\n" + "<style type=\"text/css\">\n" + " table th { color: #000; font-weight: bold; }\n" + "</style>\n" + "</head><body bgcolor=\"#%06x\">", 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, "</body></html>", cancellable, NULL); + camel_stream_write_string (stream, "</body></html>", cancellable, NULL); return; } @@ -1617,7 +1617,7 @@ efh_write_message (EMFormat *emf, * These skipped PURIs contain entire RFC message which will * be written in <iframe> as attachment. */ - if (g_str_has_suffix (puri->uri, ".rfc822")) { + if (g_str_has_suffix (puri->uri, ".rfc822")) { /* If the PURI is not an attachment, then we must * inline it here otherwise it would not be displayed. */ @@ -1632,13 +1632,13 @@ efh_write_message (EMFormat *emf, puri->write_func (emf, p, stream, info, cancellable); } - while (iter && !g_str_has_suffix (puri->uri, ".rfc822.end")) { + while (iter && !g_str_has_suffix (puri->uri, ".rfc822.end")) { iter = iter->next; if (iter) puri = iter->data; - d(printf(".rfc822 - skipping %s\n", puri->uri)); + d(printf(".rfc822 - skipping %s\n", puri->uri)); } /* Skip the .rfc822.end PURI as well. */ @@ -1656,7 +1656,7 @@ efh_write_message (EMFormat *emf, } } - camel_stream_write_string (stream, "</body></html>", cancellable, NULL); + camel_stream_write_string (stream, "</body></html>", cancellable, NULL); } static void @@ -1811,8 +1811,8 @@ efh_class_init (EMFormatHTMLClass *klass) object_class, PROP_ANIMATE_IMAGES, g_param_spec_boolean ( - "animate-images", - "Animate images", + "animate-images", + "Animate images", NULL, FALSE, G_PARAM_READWRITE)); @@ -2077,7 +2077,7 @@ em_format_html_set_animate_images (EMFormatHTML *efh, efh->priv->animate_images = animate_images; - g_object_notify (G_OBJECT (efh), "animate-images"); + g_object_notify (G_OBJECT (efh), "animate-images"); } CamelMimePart * @@ -2193,29 +2193,29 @@ efh_format_text_header (EMFormatHTML *emfh, if (flags & EM_FORMAT_HEADER_BOLD) { fmt = "<tr class=\"header-item\" style=\"display: %s\"><td><b>%s:</b> %s</td></tr>"; } else { - fmt = "<tr class=\"header-item\" style=\"display: %s\"><td>%s: %s</td></tr>"; + fmt = "<tr class=\"header-item\" style=\"display: %s\"><td>%s: %s</td></tr>"; } } else if (flags & EM_FORMAT_HTML_HEADER_NODEC) { if (is_rtl) - fmt = "<tr class=\"header-item rtl\" style=\"display: %s\"><td align=\"right\" valign=\"top\" width=\"100%%\">%2$s</td><th valign=top align=\"left\" nowrap>%1$s<b> </b></th></tr>"; + fmt = "<tr class=\"header-item rtl\" style=\"display: %s\"><td align=\"right\" valign=\"top\" width=\"100%%\">%2$s</td><th valign=top align=\"left\" nowrap>%1$s<b> </b></th></tr>"; else - fmt = "<tr class=\"header-item\" style=\"display: %s\"><th align=\"right\" valign=\"top\" nowrap>%s<b> </b></th><td valign=top>%s</td></tr>"; + fmt = "<tr class=\"header-item\" style=\"display: %s\"><th align=\"right\" valign=\"top\" nowrap>%s<b> </b></th><td valign=top>%s</td></tr>"; } else { if (flags & EM_FORMAT_HEADER_BOLD) { if (is_rtl) - fmt = "<tr class=\"header-item rtl\" style=\"display: %s\"><td align=\"right\" valign=\"top\" width=\"100%%\">%2$s</td><th align=\"left\" nowrap>%1$s:<b> </b></th></tr>"; + fmt = "<tr class=\"header-item rtl\" style=\"display: %s\"><td align=\"right\" valign=\"top\" width=\"100%%\">%2$s</td><th align=\"left\" nowrap>%1$s:<b> </b></th></tr>"; else - fmt = "<tr class=\"header-item\" style=\"display: %s\"><th align=\"right\" valign=\"top\" nowrap>%s:<b> </b></th><td>%s</td></tr>"; + fmt = "<tr class=\"header-item\" style=\"display: %s\"><th align=\"right\" valign=\"top\" nowrap>%s:<b> </b></th><td>%s</td></tr>"; } else { if (is_rtl) - fmt = "<tr class=\"header-item rtl\" style=\"display: %s\"><td align=\"right\" valign=\"top\" width=\"100%\">%2$s</td><td align=\"left\" nowrap>%1$s:<b> </b></td></tr>"; + fmt = "<tr class=\"header-item rtl\" style=\"display: %s\"><td align=\"right\" valign=\"top\" width=\"100%\">%2$s</td><td align=\"left\" nowrap>%1$s:<b> </b></td></tr>"; else - fmt = "<tr class=\"header-item\" style=\"display: %s\"><td align=\"right\" valign=\"top\" nowrap>%s:<b> </b></td><td>%s</td></tr>"; + fmt = "<tr class=\"header-item\" style=\"display: %s\"><td align=\"right\" valign=\"top\" nowrap>%s:<b> </b></td><td>%s</td></tr>"; } } g_string_append_printf (buffer, fmt, - (flags & EM_FORMAT_HTML_HEADER_HIDDEN ? "none" : "table-row"), label, html); + (flags & EM_FORMAT_HTML_HEADER_HIDDEN ? "none" : "table-row"), label, html); g_free (mhtml); } @@ -2562,8 +2562,8 @@ efh_format_short_headers (EMFormatHTML *efh, from = g_string_new (""); g_string_append_printf (buffer, - "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" " - "id=\"__evo-short-headers\" style=\"display: %s\">", + "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" " + "id=\"__evo-short-headers\" style=\"display: %s\">", visible ? "block" : "none"); header = ((CamelMimePart *) part)->headers; @@ -2596,15 +2596,15 @@ efh_format_short_headers (EMFormatHTML *efh, if (is_rtl) { g_string_append_printf ( buffer, - "<tr><td width=\"100%%\" align=\"right\">%s%s%s <strong>%s</strong></td></tr>", - from->len ? "(" : "", from->str, from->len ? ")" : "", - subject ? subject : _("(no subject)")); + "<tr><td width=\"100%%\" align=\"right\">%s%s%s <strong>%s</strong></td></tr>", + from->len ? "(" : "", from->str, from->len ? ")" : "", + subject ? subject : _("(no subject)")); } else { g_string_append_printf ( buffer, - "<tr><td><strong>%s</strong> %s%s%s</td></tr>", - subject ? subject : _("(no subject)"), - from->len ? "(" : "", from->str, from->len ? ")" : ""); + "<tr><td><strong>%s</strong> %s%s%s</td></tr>", + subject ? subject : _("(no subject)"), + from->len ? "(" : "", from->str, from->len ? ")" : ""); } g_string_append (buffer, "</table>"); @@ -2652,8 +2652,8 @@ efh_format_full_headers (EMFormatHTML *efh, evolution_imagesdir = g_filename_to_uri (EVOLUTION_IMAGESDIR, NULL, NULL); g_string_append_printf (buffer, - "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" " - "id=\"__evo-full-headers\" style=\"display: %s\" width=\"100%%\">", + "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" " + "id=\"__evo-full-headers\" style=\"display: %s\" width=\"100%%\">", visible ? "block" : "none"); header = ((CamelMimePart *) part)->headers; @@ -2970,7 +2970,7 @@ em_format_html_animation_extract_frame (const GByteArray *anim, /* Unforunatelly, GdkPixbuf cannot save to GIF, but WebKit does not * have any trouble displaying PNG image despite the part having * image/gif mime-type */ - gdk_pixbuf_save_to_buffer (frame_buf, frame, len, "png", NULL, NULL); + gdk_pixbuf_save_to_buffer (frame_buf, frame, len, "png", NULL, NULL); g_object_unref (loader); } diff --git a/mail/em-utils.c b/mail/em-utils.c index 52856865b9..8a6383d755 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -984,7 +984,7 @@ em_utils_selection_set_urilist (GtkSelectionData *data, gchar *exporttype; gint exportname; - tmpdir = e_mkdtemp("drag-n-drop-XXXXXX"); + tmpdir = e_mkdtemp("drag-n-drop-XXXXXX"); if (tmpdir == NULL) return; diff --git a/mail/em-vfolder-editor-rule.c b/mail/em-vfolder-editor-rule.c index 1ee69dd12a..380031d876 100644 --- a/mail/em-vfolder-editor-rule.c +++ b/mail/em-vfolder-editor-rule.c @@ -433,7 +433,7 @@ get_widget (EFilterRule *fr, builder = gtk_builder_new (); e_load_ui_builder_definition (builder, "mail-dialogs.ui"); - frame = e_builder_get_widget(builder, "vfolder_source_frame"); + frame = e_builder_get_widget(builder, "vfolder_source_frame"); g_object_set_data_full((GObject *)frame, "data", data, g_free); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index bee7e2119f..7bbb85bda6 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -844,7 +844,8 @@ receive_status (CamelFilterDriver *driver, /* when receive/send is complete */ static void -receive_done (int still_more, gpointer data) +receive_done (gint still_more, + gpointer data) { struct _send_info *info = data; const gchar *uid; @@ -1472,7 +1473,7 @@ mail_receive_service (CamelService *service) case SEND_RECEIVE: mail_fetch_mail ( CAMEL_STORE (service), - info->keep_on_server, 0, -1, + info->keep_on_server, 0, -1, E_FILTER_SOURCE_INCOMING, NULL, NULL, NULL, info->cancellable, diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c index c1278cb46e..74d042e193 100644 --- a/modules/calendar/e-memo-shell-view-private.c +++ b/modules/calendar/e-memo-shell-view-private.c @@ -116,7 +116,7 @@ memo_shell_view_load_view_collection (EShellViewClass *shell_view_class) filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL); if (!e_table_specification_load_from_file (spec, filename)) g_critical ("Unable to load ETable specification file " - "for memos"); + "for memos"); g_free (filename); factory = gal_view_factory_etable_new (spec); diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 324007d615..f6db2c2a35 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -455,7 +455,7 @@ epech_custom_header_options_commit (EMsgComposer *comp, if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data)) return; - new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow"); + new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow"); if (new_email_custom_header_window) { current_dialog = new_email_custom_header_window->epech_dialog; @@ -520,7 +520,7 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp new_email_custom_header_window = g_new0 (EmailCustomHeaderWindow, 1); new_email_custom_header_window->epech_window = window; new_email_custom_header_window->epech_dialog = dialog; - g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data); + g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data); } } @@ -581,7 +581,7 @@ commit_changes (ConfigData *cd) /* Check if the keyword is not empty */ if ((keyword) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)) { if ((value) && (g_utf8_strlen (g_strstrip (value), -1) > 0)) { - keyword = g_strconcat (keyword, "=", value, NULL); + keyword = g_strconcat (keyword, "=", value, NULL); } header_config_list = g_slist_append (header_config_list, g_strdup (keyword)); } diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index b59b6f76b8..cf17295292 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -687,7 +687,7 @@ find_cal_update_ui (FormatItipFindData *fd, /* FIXME Check read only state of calendar? */ itip_view_add_lower_info_item_printf (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, - _("Found the appointment in the calendar '%s'"), e_source_peek_name (source)); + _("Found the appointment in the calendar '%s'"), e_source_peek_name (source)); set_buttons_sensitive (pitip, view); } else if (!pitip->current_client) @@ -1499,7 +1499,7 @@ receive_objects_ready_cb (GObject *ecalclient, pitip->update_item_error_info_id = itip_view_add_lower_info_item_printf ( view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, - _("Unable to send item to calendar '%s'. %s"), + _("Unable to send item to calendar '%s'. %s"), e_source_peek_name (source), error ? error->message : _("Unknown error")); } g_clear_error (&error); @@ -1531,7 +1531,7 @@ receive_objects_ready_cb (GObject *ecalclient, /* FIXME some calendars just might not save it at all, is this accurate? */ itip_view_add_lower_info_item_printf ( view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, - _("Sent to calendar '%s' as canceled"), e_source_peek_name (source)); + _("Sent to calendar '%s' as canceled"), e_source_peek_name (source)); break; default: g_assert_not_reached (); @@ -1839,11 +1839,11 @@ remove_delegate (ItipPURI *pitip, if (status) { itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, - _("Sent a cancelation notice to the delegate")); + _("Sent a cancelation notice to the delegate")); } else itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, - _("Could not send the cancelation notice to the delegate")); + _("Could not send the cancelation notice to the delegate")); g_free (comment); @@ -1892,8 +1892,8 @@ modify_object_cb (GObject *ecalclient, itip_view_add_lower_info_item_printf ( view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR, - _("Unable to update attendee. %s"), - error ? error->message : _("Unknown error")); + _("Unable to update attendee. %s"), + error ? error->message : _("Unknown error")); g_clear_error (&error); } else { @@ -1922,7 +1922,7 @@ update_attendee_status_icalcomp (ItipPURI *pitip, itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR, - _("The meeting is invalid and cannot be updated")); + _("The meeting is invalid and cannot be updated")); } else { icalcomponent *org_icalcomp; const gchar *delegate; @@ -2154,17 +2154,17 @@ send_item (ItipPURI *pitip, case E_CAL_CLIENT_SOURCE_TYPE_EVENTS: itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, - _("Meeting information sent")); + _("Meeting information sent")); break; case E_CAL_CLIENT_SOURCE_TYPE_TASKS: itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, - _("Task information sent")); + _("Task information sent")); break; case E_CAL_CLIENT_SOURCE_TYPE_MEMOS: itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, - _("Memo information sent")); + _("Memo information sent")); break; default: g_assert_not_reached (); @@ -2175,17 +2175,17 @@ send_item (ItipPURI *pitip, case E_CAL_CLIENT_SOURCE_TYPE_EVENTS: itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR, - _("Unable to send meeting information, the meeting does not exist")); + _("Unable to send meeting information, the meeting does not exist")); break; case E_CAL_CLIENT_SOURCE_TYPE_TASKS: itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR, - _("Unable to send task information, the task does not exist")); + _("Unable to send task information, the task does not exist")); break; case E_CAL_CLIENT_SOURCE_TYPE_MEMOS: itip_view_add_lower_info_item ( view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR, - _("Unable to send memo information, the memo does not exist")); + _("Unable to send memo information, the memo does not exist")); break; default: g_assert_not_reached (); @@ -2276,9 +2276,9 @@ set_itip_error (ItipView *view, gchar *error; error = g_strdup_printf ( - "<div class=\"error\">" - "<p><b>%s</b></p>" - "<p>%s</p>", + "<div class=\"error\">" + "<p><b>%s</b></p>" + "<p>%s</p>", primary, secondary); itip_view_set_error (view, error, save_btn); @@ -2307,7 +2307,7 @@ extract_itip_data (ItipPURI *pitip, if (!pitip->vcalendar) { set_itip_error (view, - _("The calendar attached is not valid"), + _("The calendar attached is not valid"), _("The message claims to contain a calendar, but the calendar is not a valid iCalendar."), FALSE); @@ -2319,7 +2319,7 @@ extract_itip_data (ItipPURI *pitip, pitip->main_comp = icalparser_parse_string (pitip->vcalendar); if (pitip->main_comp == NULL || !is_icalcomp_valid (pitip->main_comp)) { set_itip_error (view, - _("The calendar attached is not valid"), + _("The calendar attached is not valid"), _("The message claims to contain a calendar, but the calendar is not a valid iCalendar."), FALSE); @@ -2361,7 +2361,7 @@ extract_itip_data (ItipPURI *pitip, if (pitip->ical_comp == NULL) { set_itip_error (view, - _("The item in the calendar is not valid"), + _("The item in the calendar is not valid"), _("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"), FALSE); @@ -2390,7 +2390,7 @@ extract_itip_data (ItipPURI *pitip, break; default: set_itip_error (view, - _("The item in the calendar is not valid"), + _("The item in the calendar is not valid"), _("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"), FALSE); @@ -2405,7 +2405,7 @@ extract_itip_data (ItipPURI *pitip, if (pitip->total > 1) { set_itip_error (view, - _("The calendar attached contains multiple items"), + _("The calendar attached contains multiple items"), _("To process all of these items, the file should be saved and the calendar imported"), TRUE); @@ -2488,7 +2488,7 @@ extract_itip_data (ItipPURI *pitip, pitip->comp = NULL; set_itip_error (view, - _("The item in the calendar is not valid"), + _("The item in the calendar is not valid"), _("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"), FALSE); @@ -2921,7 +2921,7 @@ init_itip_view (ItipPURI *info, } e_cal_component_get_summary (info->comp, &text); - itip_view_set_summary (view, text.value ? text.value : C_("cal-itip", "None")); + itip_view_set_summary (view, text.value ? text.value : C_("cal-itip", "None")); e_cal_component_get_location (info->comp, &string); itip_view_set_location (view, string); @@ -2934,19 +2934,19 @@ init_itip_view (ItipPURI *info, switch (a->status) { case ICAL_PARTSTAT_ACCEPTED: - itip_view_set_status (view, _("Accepted")); + itip_view_set_status (view, _("Accepted")); break; case ICAL_PARTSTAT_TENTATIVE: - itip_view_set_status (view, _("Tentatively Accepted")); + itip_view_set_status (view, _("Tentatively Accepted")); break; case ICAL_PARTSTAT_DECLINED: - itip_view_set_status (view, _("Declined")); + itip_view_set_status (view, _("Declined")); break; case ICAL_PARTSTAT_DELEGATED: - itip_view_set_status (view, _("Delegated")); + itip_view_set_status (view, _("Delegated")); break; default: - itip_view_set_status (view, _("Unknown")); + itip_view_set_status (view, _("Unknown")); } } e_cal_component_free_attendee_list (list); @@ -2986,7 +2986,7 @@ init_itip_view (ItipPURI *info, if (!gstring && text->value) gstring = g_string_new (text->value); else if (text->value) - g_string_append_printf (gstring, "\n\n%s", text->value); + g_string_append_printf (gstring, "\n\n%s", text->value); } e_cal_component_free_text_list (list); @@ -3008,7 +3008,7 @@ init_itip_view (ItipPURI *info, g_free (html); } - to_zone = e_shell_settings_get_pointer (shell_settings, "cal-timezone"); + to_zone = e_shell_settings_get_pointer (shell_settings, "cal-timezone"); e_cal_component_get_dtstart (info->comp, &datetime); info->start_time = 0; @@ -3080,13 +3080,13 @@ init_itip_view (ItipPURI *info, /* FIXME Tell the user we don't support recurring tasks */ switch (info->type) { case E_CAL_CLIENT_SOURCE_TYPE_EVENTS: - itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This meeting recurs")); + itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This meeting recurs")); break; case E_CAL_CLIENT_SOURCE_TYPE_TASKS: - itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This task recurs")); + itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This task recurs")); break; case E_CAL_CLIENT_SOURCE_TYPE_MEMOS: - itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This memo recurs")); + itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This memo recurs")); break; default: g_assert_not_reached (); @@ -3096,7 +3096,7 @@ init_itip_view (ItipPURI *info, if (response_enabled) { g_signal_connect ( - view, "response", + view, "response", G_CALLBACK (view_response_cb), info); itip_view_set_show_free_time_check (view, info->type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST)); @@ -3202,17 +3202,17 @@ write_itip_view (EMFormat *emf, uri = em_format_build_mail_uri ( emf->folder, emf->message_uid, - "part_id", G_TYPE_STRING, puri->uri, - "mode", G_TYPE_INT, EM_FORMAT_WRITE_MODE_RAW, + "part_id", G_TYPE_STRING, puri->uri, + "mode", G_TYPE_INT, EM_FORMAT_WRITE_MODE_RAW, NULL); buffer = g_string_sized_new (256); g_string_append_printf (buffer, - "<div class=\"part-container\" " - "style=\"border: none; background: none;\">" - "<iframe width=\"100%%\" height=\"auto\"" - " frameborder=\"0\" src=\"%s\" name=\"%s\" id=\"%s\"></iframe>" - "</div>", + "<div class=\"part-container\" " + "style=\"border: none; background: none;\">" + "<iframe width=\"100%%\" height=\"auto\"" + " frameborder=\"0\" src=\"%s\" name=\"%s\" id=\"%s\"></iframe>" + "</div>", 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, - "<tr id=\"table_row_%s\" hidden=\"\"><td colspan=\"2\">" - "<input type=\"checkbox\" name=\"%s\" id=\"%s\" value=\"%s\" >" - "<label for=\"%s\">%s</label>" - "</td></tr>\n", + "<tr id=\"table_row_%s\" hidden=\"\"><td colspan=\"2\">" + "<input type=\"checkbox\" name=\"%s\" id=\"%s\" value=\"%s\" >" + "<label for=\"%s\">%s</label>" + "</td></tr>\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, - "<tr id=\"%s\" %s><th>%s</th><td>%s</td></tr>\n", - id, (value && *value) ? "" : "hidden=\"\"", label, value); + "<tr id=\"%s\" %s><th>%s</th><td>%s</td></tr>\n", + id, (value && *value) ? "" : "hidden=\"\"", label, value); } else { g_string_append_printf ( buffer, - "<tr id=\"%s\" hidden=\"\"><td colspan=\"2\"></td></tr>\n", + "<tr id=\"%s\" hidden=\"\"><td colspan=\"2\"></td></tr>\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, - "<td><button type=\"button\" name=\"%s\" value=\"%d\" id=\"%s\" hidden>" - "<div><img src=\"gtk-stock://%s?size=%d\"> <span>%s</span></div>" - "</button></td>\n", + "<td><button type=\"button\" name=\"%s\" value=\"%d\" id=\"%s\" hidden>" + "<div><img src=\"gtk-stock://%s?size=%d\"> <span>%s</span></div>" + "</button></td>\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, - "<table class=\"itip buttons\" border=\"0\" " - "id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" " - "cellpadding=\"0\" >" - "<tr id=\"" TABLE_ROW_BUTTONS "\">"); + "<table class=\"itip buttons\" border=\"0\" " + "id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" " + "cellpadding=\"0\" >" + "<tr id=\"" TABLE_ROW_BUTTONS "\">"); /* Everything gets the open button */ buttons_table_write_button ( - 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, "</tr></table>"); + g_string_append (buffer, "</tr></table>"); } void itip_view_write (GString *buffer) { g_string_append (buffer, - "<html>\n" - "<head>\n" - "<title>ITIP</title>\n" - "<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\" />\n" - "</head>\n" - "<body>\n"); + "<html>\n" + "<head>\n" + "<title>ITIP</title>\n" + "<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\" />\n" + "</head>\n" + "<body>\n"); g_string_append_printf (buffer, - "<img src=\"gtk-stock://%s?size=%d\" class=\"itip icon\" />\n", + "<img src=\"gtk-stock://%s?size=%d\" class=\"itip icon\" />\n", MEETING_ICON, GTK_ICON_SIZE_BUTTON); g_string_append (buffer, - "<div class=\"itip content\" id=\"" DIV_ITIP_CONTENT "\">\n"); + "<div class=\"itip content\" id=\"" DIV_ITIP_CONTENT "\">\n"); /* The first section listing the sender */ /* FIXME What to do if the send and organizer do not match */ g_string_append (buffer, - "<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\"></div>\n"); + "<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\"></div>\n"); - g_string_append (buffer, "<hr>\n"); + g_string_append (buffer, "<hr>\n"); /* Elementary event information */ g_string_append (buffer, - "<table class=\"itip table\" border=\"0\" " - "cellspacing=\"5\" cellpadding=\"0\">\n"); + "<table class=\"itip table\" border=\"0\" " + "cellspacing=\"5\" cellpadding=\"0\">\n"); append_text_table_row (buffer, TABLE_ROW_SUMMARY, NULL, NULL); - append_text_table_row (buffer, TABLE_ROW_LOCATION, _("Location:"), NULL); - 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, "</table>\n"); + g_string_append (buffer, "</table>\n"); /* Upper Info items */ g_string_append (buffer, - "<table class=\"itip info\" id=\"" TABLE_UPPER_ITIP_INFO "\" border=\"0\" " - "cellspacing=\"5\" cellpadding=\"0\">"); + "<table class=\"itip info\" id=\"" TABLE_UPPER_ITIP_INFO "\" border=\"0\" " + "cellspacing=\"5\" cellpadding=\"0\">"); /* Description */ g_string_append (buffer, - "<div id=\"" TABLE_ROW_DESCRIPTION "\" class=\"itip description\" hidden=\"\"></div>\n"); + "<div id=\"" TABLE_ROW_DESCRIPTION "\" class=\"itip description\" hidden=\"\"></div>\n"); g_string_append (buffer, "<hr>\n"); /* Lower Info items */ g_string_append (buffer, - "<table class=\"itip info\" id=\"" TABLE_LOWER_ITIP_INFO "\" border=\"0\" " - "cellspacing=\"5\" cellpadding=\"0\">"); + "<table class=\"itip info\" id=\"" TABLE_LOWER_ITIP_INFO "\" border=\"0\" " + "cellspacing=\"5\" cellpadding=\"0\">"); g_string_append (buffer, - "<table class=\"itip table\" border=\"0\" " - "cellspacing=\"5\" cellpadding=\"0\">\n"); + "<table class=\"itip table\" border=\"0\" " + "cellspacing=\"5\" cellpadding=\"0\">\n"); g_string_append (buffer, - "<tr id=\"" TABLE_ROW_ESCB "\" hidden=\"\""">" - "<th></th>" - "<td><select name=\"" SELECT_ESOURCE "\" id=\"" SELECT_ESOURCE "\"></select></td>" - "</tr>\n"); + "<tr id=\"" TABLE_ROW_ESCB "\" hidden=\"\""">" + "<th></th>" + "<td><select name=\"" SELECT_ESOURCE "\" id=\"" SELECT_ESOURCE "\"></select></td>" + "</tr>\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, - "<tr id=\"" TABLE_ROW_RSVP_COMMENT "\" hidden=\"\">" - "<th>%s</th>" - "<td><textarea name=\"" TEXTAREA_RSVP_COMMENT "\" " - "id=\"" TEXTAREA_RSVP_COMMENT "\" " - "rows=\"3\" cols=\"40\" disabled=\"\">" - "</textarea></td>\n" - "</tr>\n", - _("Comment:")); + "<tr id=\"" TABLE_ROW_RSVP_COMMENT "\" hidden=\"\">" + "<th>%s</th>" + "<td><textarea name=\"" TEXTAREA_RSVP_COMMENT "\" " + "id=\"" TEXTAREA_RSVP_COMMENT "\" " + "rows=\"3\" cols=\"40\" disabled=\"\">" + "</textarea></td>\n" + "</tr>\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, "</table>\n"); + g_string_append (buffer, "</table>\n"); /* Buttons table */ append_buttons_table (buffer); /* <div class="itip content" > */ - g_string_append (buffer, "</div>\n"); + g_string_append (buffer, "</div>\n"); - g_string_append (buffer, "<div class=\"itip error\" id=\"" DIV_ITIP_ERROR "\"></div>"); + g_string_append (buffer, "<div class=\"itip error\" id=\"" DIV_ITIP_ERROR "\"></div>"); - g_string_append (buffer, "</body></html>"); + g_string_append (buffer, "</body></html>"); } void @@ -1240,27 +1240,27 @@ itip_view_write_for_printing (ItipView *view, } g_string_append (buffer, - "<div class=\"itip print_content\" id=\"" DIV_ITIP_CONTENT "\">\n"); + "<div class=\"itip print_content\" id=\"" DIV_ITIP_CONTENT "\">\n"); /* The first section listing the sender */ /* FIXME What to do if the send and organizer do not match */ g_string_append_printf (buffer, - "<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\">%s</div>\n", - view->priv->sender ? view->priv->sender : ""); + "<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\">%s</div>\n", + view->priv->sender ? view->priv->sender : ""); - g_string_append (buffer, "<hr>\n"); + g_string_append (buffer, "<hr>\n"); /* Elementary event information */ g_string_append (buffer, - "<table class=\"itip table\" border=\"0\" " - "cellspacing=\"5\" cellpadding=\"0\">\n"); + "<table class=\"itip table\" border=\"0\" " + "cellspacing=\"5\" cellpadding=\"0\">\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, "</table>\n"); + g_string_append (buffer, "</table>\n"); /* Description */ g_string_append_printf ( buffer, - "<div id=\"" TABLE_ROW_DESCRIPTION "\" " - "class=\"itip description\" %s>%s</div>\n", - view->priv->description ? "" : "hidden=\"\"", view->priv->description); + "<div id=\"" TABLE_ROW_DESCRIPTION "\" " + "class=\"itip description\" %s>%s</div>\n", + view->priv->description ? "" : "hidden=\"\"", view->priv->description); - g_string_append (buffer, "</div>"); + g_string_append (buffer, "</div>"); } 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, - "<table border=\"0\" width=\"100%\">" - "<tr width=\"100%\" id=\"" TABLE_ROW_BUTTONS "\">"); + "<table border=\"0\" width=\"100%\">" + "<tr width=\"100%\" id=\"" TABLE_ROW_BUTTONS "\">"); buttons_table_write_button ( - str, BUTTON_SAVE, _("Save"), + str, BUTTON_SAVE, _("Save"), GTK_STOCK_SAVE, ITIP_VIEW_RESPONSE_SAVE); - g_string_append (str, "</tr></table>"); + g_string_append (str, "</tr></table>"); } 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; |