[evolution/webkit: 196/196] Coding style and whitespace cleanup.
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit: 196/196] Coding style and whitespace cleanup.
- Date: Tue, 27 Mar 2012 16:17:12 +0000 (UTC)
commit 760c7fda485dca3849acd0f18f84a837fd1a6799
Author: Dan VrÃtil <dvratil redhat com>
Date: Tue Mar 27 17:59:25 2012 +0200
Coding style and whitespace cleanup.
addressbook/gui/widgets/eab-contact-display.c | 82 +-
addressbook/gui/widgets/eab-contact-formatter.c | 666 ++++----
em-format/em-format-quote.c | 452 +++---
em-format/em-format-quote.h | 1 -
em-format/em-format.c | 470 +++---
em-format/em-format.h | 82 +-
mail/e-mail-attachment-bar.c | 4 +-
mail/e-mail-attachment-bar.h | 2 +-
mail/e-mail-browser.c | 13 +-
mail/e-mail-display.c | 869 +++++------
mail/e-mail-display.h | 6 +-
mail/e-mail-paned-view.c | 16 +-
mail/e-mail-printer.c | 666 ++++----
mail/e-mail-printer.h | 11 +-
mail/e-mail-reader-utils.c | 20 +-
mail/e-mail-reader.c | 222 ++--
mail/e-mail-request.c | 564 ++++----
mail/em-account-editor.c | 6 +-
mail/em-composer-utils.c | 20 +-
mail/em-format-hook.c | 8 +-
mail/em-format-html-display.c | 259 ++--
mail/em-format-html-display.h | 3 +-
mail/em-format-html-print.c | 265 ++--
mail/em-format-html.c | 694 ++++-----
mail/em-format-html.h | 4 +-
mail/em-utils.c | 10 +-
modules/mail/e-mail-shell-backend.c | 46 +-
modules/mail/e-mail-shell-content.c | 2 +-
modules/mail/e-mail-shell-view-actions.c | 120 +-
plugins/audio-inline/audio-inline.c | 24 +-
plugins/itip-formatter/itip-formatter.c | 744 +++++-----
plugins/itip-formatter/itip-view.c | 1908 +++++++++++------------
plugins/itip-formatter/itip-view.h | 36 +-
plugins/prefer-plain/prefer-plain.c | 14 +-
plugins/tnef-attachments/tnef-plugin.c | 39 +-
plugins/vcard-inline/vcard-inline.c | 25 +-
widgets/misc/e-attachment-button.c | 2 +-
widgets/misc/e-port-entry.c | 2 +-
widgets/misc/e-search-bar.c | 1 -
widgets/misc/e-web-view-gtkhtml.h | 18 +-
widgets/misc/e-web-view.c | 481 +++---
widgets/misc/e-web-view.h | 12 +-
42 files changed, 4414 insertions(+), 4475 deletions(-)
---
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index d28f657..fe1728c 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -170,19 +170,19 @@ contact_formatting_finished (GObject *object,
GSimpleAsyncResult *result,
gpointer user_data)
{
- EABContactDisplay *display = user_data;
- CamelStreamMem *stream;
- gchar *html;
- GByteArray *ba;
+ EABContactDisplay *display = user_data;
+ CamelStreamMem *stream;
+ gchar *html;
+ GByteArray *ba;
- stream = g_simple_async_result_get_op_res_gpointer (result);
- ba = camel_stream_mem_get_byte_array (stream);
+ stream = g_simple_async_result_get_op_res_gpointer (result);
+ ba = camel_stream_mem_get_byte_array (stream);
- html = g_strndup ((gchar *) ba->data, ba->len);
- e_web_view_load_string (E_WEB_VIEW (display), html);
+ html = g_strndup ((gchar *) ba->data, ba->len);
+ e_web_view_load_string (E_WEB_VIEW (display), html);
- g_free (html);
- g_object_unref (stream);
+ g_free (html);
+ g_object_unref (stream);
}
static void
@@ -191,12 +191,12 @@ load_contact (EABContactDisplay *display)
if (!display->priv->contact)
return;
- eab_contact_formatter_format_contact_async (
- display->priv->formatter,
- display->priv->contact,
- NULL,
- (GAsyncReadyCallback) contact_formatting_finished,
- display);
+ eab_contact_formatter_format_contact_async (
+ display->priv->formatter,
+ display->priv->contact,
+ NULL,
+ (GAsyncReadyCallback) contact_formatting_finished,
+ display);
}
static void
@@ -344,11 +344,11 @@ handle_map_scroll_event (GtkWidget *widget,
return TRUE;
}
-static GtkWidget*
+static GtkWidget *
contact_display_object_requested (WebKitWebView *web_view,
- gchar *mime_type,
- gchar *uri,
- GHashTable *param,
+ gchar *mime_type,
+ gchar *uri,
+ GHashTable *param,
EABContactDisplay *display)
{
EContact *contact = display->priv->contact;
@@ -368,7 +368,7 @@ contact_display_object_requested (WebKitWebView *web_view,
if (address) {
map = e_contact_map_new ();
- gtk_widget_set_size_request (map, 250, 250);
+ gtk_widget_set_size_request (map, 250, 250);
g_signal_connect (
E_CONTACT_MAP (map), "contact-added",
G_CALLBACK (e_contact_map_zoom_on_marker), NULL);
@@ -384,14 +384,14 @@ contact_display_object_requested (WebKitWebView *web_view,
E_CONTACT_MAP (map), full_name,
contact_uid, address, NULL);
- gtk_widget_show_all (map);
+ gtk_widget_show_all (map);
e_contact_address_free (address);
- }
+ }
g_free (full_name);
- return map;
+ return map;
}
#endif
@@ -499,8 +499,8 @@ eab_contact_display_init (EABContactDisplay *display)
display->priv = EAB_CONTACT_DISPLAY_GET_PRIVATE (display);
- display->priv->formatter = g_object_new (
- EAB_TYPE_CONTACT_FORMATTER,
+ display->priv->formatter = g_object_new (
+ EAB_TYPE_CONTACT_FORMATTER,
"display-mode", EAB_CONTACT_DISPLAY_RENDER_NORMAL,
"render-maps", FALSE, NULL);
@@ -557,7 +557,7 @@ eab_contact_display_set_contact (EABContactDisplay *display,
display->priv->contact = contact;
- load_contact (display);
+ load_contact (display);
g_object_notify (G_OBJECT (display), "contact");
}
@@ -576,16 +576,16 @@ eab_contact_display_set_mode (EABContactDisplay *display,
{
g_return_if_fail (EAB_IS_CONTACT_DISPLAY (display));
- if (eab_contact_formatter_get_display_mode (
- display->priv->formatter) == mode) {
+ if (eab_contact_formatter_get_display_mode (
+ display->priv->formatter) == mode) {
- return;
- };
+ return;
+ };
- eab_contact_formatter_set_display_mode (
- display->priv->formatter, mode);
+ eab_contact_formatter_set_display_mode (
+ display->priv->formatter, mode);
- load_contact (display);
+ load_contact (display);
g_object_notify (G_OBJECT (display), "mode");
}
@@ -604,16 +604,16 @@ eab_contact_display_set_show_maps (EABContactDisplay *display,
{
g_return_if_fail (EAB_IS_CONTACT_DISPLAY (display));
- if (eab_contact_formatter_get_render_maps (
- display->priv->formatter) == show_maps) {
+ if (eab_contact_formatter_get_render_maps (
+ display->priv->formatter) == show_maps) {
- return;
- }
+ return;
+ }
- eab_contact_formatter_set_render_maps (
- display->priv->formatter, show_maps);
+ eab_contact_formatter_set_render_maps (
+ display->priv->formatter, show_maps);
- load_contact (display);
+ load_contact (display);
g_object_notify (G_OBJECT (display), "show-maps");
}
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index 3111df0..c0ca4ed 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -87,7 +87,6 @@ common_location[] =
#define MAX_COMPACT_IMAGE_DIMENSION 48
-
#define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n" \
"<head>\n<meta name=\"generator\" content=\"Evolution Addressbook Component\">\n" \
"<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\">" \
@@ -111,8 +110,7 @@ common_location[] =
"</script>\n" \
"</head>\n"
-
-static gchar*
+static gchar *
get_icon_uri (const gchar *icon_name)
{
GtkIconTheme *icon_theme;
@@ -120,22 +118,22 @@ get_icon_uri (const gchar *icon_name)
const gchar *filename;
gchar *icon_uri;
GError *error = NULL;
-
+
icon_theme = gtk_icon_theme_get_default ();
icon_info = gtk_icon_theme_lookup_icon (
icon_theme, icon_name, GTK_ICON_SIZE_MENU, 0);
g_return_val_if_fail (icon_info != NULL, NULL);
-
+
filename = gtk_icon_info_get_filename (icon_info);
icon_uri = g_filename_to_uri (filename, NULL, &error);
-
+
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
-
+
gtk_icon_info_free (icon_info);
-
+
return icon_uri;
}
@@ -144,39 +142,39 @@ render_address_link (GString *buffer,
EContact *contact,
gint map_type)
{
- EContactAddress *adr;
+ EContactAddress *adr;
GString *link = g_string_new ("");
- adr = e_contact_get (contact, map_type);
- if (adr &&
+ adr = e_contact_get (contact, map_type);
+ if (adr &&
(adr->street || adr->locality || adr->region || adr->country)) {
gchar *escaped;
- if (adr->street && *adr->street)
+ if (adr->street && *adr->street)
g_string_append_printf (link, "%s, ", adr->street);
- if (adr->locality && *adr->locality)
+ if (adr->locality && *adr->locality)
g_string_append_printf (link, "%s, ", adr->locality);
- if (adr->region && *adr->region)
+ if (adr->region && *adr->region)
g_string_append_printf (link, "%s, ", adr->region);
- if (adr->country && *adr->country)
+ if (adr->country && *adr->country)
g_string_append_printf (link, "%s", adr->country);
- escaped = g_uri_escape_string (link->str, NULL, TRUE);
- g_string_assign (link, escaped);
- g_free (escaped);
+ escaped = g_uri_escape_string (link->str, NULL, TRUE);
+ 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"));
}
if (adr)
- e_contact_address_free (adr);
+ e_contact_address_free (adr);
g_string_append (buffer, link->str);
- g_string_free (link, TRUE);
+ g_string_free (link, TRUE);
}
static void
@@ -186,18 +184,18 @@ accum_address (GString *buffer,
EContactField adr_field,
EContactField label_field)
{
- EContactAddress *adr;
- const gchar *label;
+ EContactAddress *adr;
+ const gchar *label;
GString *map_link = g_string_new ("<br>");
- render_address_link (map_link, contact, adr_field);
+ render_address_link (map_link, contact, adr_field);
- label = e_contact_get_const (contact, label_field);
- if (label) {
- gchar *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
+ label = e_contact_get_const (contact, label_field);
+ if (label) {
+ gchar *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
- if (TEXT_IS_RIGHT_TO_LEFT) {
- g_string_append_printf (
+ if (TEXT_IS_RIGHT_TO_LEFT) {
+ g_string_append_printf (
buffer,
"<tr>"
"<td align=\"right\" valign=\"top\" nowrap>%s</td>"
@@ -206,7 +204,7 @@ accum_address (GString *buffer,
"</tr>",
html, html_label, map_link->str);
} else {
- g_string_append_printf (
+ g_string_append_printf (
buffer,
"<tr>"
"<td width=\"" IMAGE_COL_WIDTH "\"></td>"
@@ -216,21 +214,21 @@ accum_address (GString *buffer,
html_label, map_link->str, html);
}
- g_free (html);
- g_string_free (map_link, TRUE);
- return;
- }
+ g_free (html);
+ g_string_free (map_link, TRUE);
+ return;
+ }
- adr = e_contact_get (contact, adr_field);
- if (adr &&
- (adr->po || adr->ext || adr->street || adr->locality ||
+ adr = e_contact_get (contact, adr_field);
+ if (adr &&
+ (adr->po || adr->ext || adr->street || adr->locality ||
adr->region || adr->code || adr->country)) {
if (TEXT_IS_RIGHT_TO_LEFT) {
- g_string_append_printf (
+ g_string_append_printf (
buffer, "<tr><td align=\"right\" valign=\"top\" nowrap>");
} else {
- g_string_append_printf (
+ g_string_append_printf (
buffer,
"<tr>"
"<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td>"
@@ -239,7 +237,7 @@ accum_address (GString *buffer,
html_label, map_link->str);
}
- if (adr->po && *adr->po)
+ if (adr->po && *adr->po)
g_string_append_printf (buffer, "%s<br>", adr->po);
if (adr->ext && *adr->ext)
@@ -248,20 +246,20 @@ accum_address (GString *buffer,
if (adr->street && *adr->street)
g_string_append_printf (buffer, "%s<br>", adr->street);
- if (adr->locality && *adr->locality)
+ if (adr->locality && *adr->locality)
g_string_append_printf (buffer, "%s<br>", adr->locality);
- if (adr->region && *adr->region)
+ if (adr->region && *adr->region)
g_string_append_printf (buffer, "%s<br>", adr->region);
- if (adr->code && *adr->code)
+ if (adr->code && *adr->code)
g_string_append_printf (buffer, "%s<br>", adr->code);
- if (adr->country && *adr->country)
+ if (adr->country && *adr->country)
g_string_append_printf (buffer, "%s<br>", adr->country);
- if (TEXT_IS_RIGHT_TO_LEFT) {
- g_string_append_printf (
+ if (TEXT_IS_RIGHT_TO_LEFT) {
+ g_string_append_printf (
buffer,
"</td><th%s:<br>%s</th>"
"<td width=\"" IMAGE_COL_WIDTH "\"></td>"
@@ -285,42 +283,42 @@ render_table_row (GString *buffer,
const gchar *icon,
guint html_flags)
{
- const gchar *icon_html;
- gchar *value;
+ const gchar *icon_html;
+ gchar *value;
- if (html_flags)
- value = e_text_to_html (str, html_flags);
- else
- value = (gchar*)str;
+ if (html_flags)
+ value = e_text_to_html (str, html_flags);
+ else
+ value = (gchar *) str;
- if (icon) {
- gchar *icon_uri = get_icon_uri (icon);
+ if (icon) {
+ gchar *icon_uri = get_icon_uri (icon);
icon_html = g_strdup_printf ("<img src=\"%s\" width=\"16\" height=\"16\" />", icon_uri);
- g_free (icon_uri);
- } else {
+ g_free (icon_uri);
+ } else {
icon_html = "";
- }
+ }
- if (TEXT_IS_RIGHT_TO_LEFT) {
- g_string_append_printf (
+ 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>",
- value, label, icon_html);
- } else {
- g_string_append_printf (
+ 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>",
- icon_html, label, value);
- }
+ icon_html, label, value);
+ }
- if (html_flags)
- g_free (value);
+ if (html_flags)
+ g_free (value);
}
static void
@@ -331,12 +329,12 @@ accum_attribute (GString *buffer,
const gchar *icon,
guint html_flags)
{
- const gchar *str;
+ const gchar *str;
- str = e_contact_get_const (contact, field);
+ str = e_contact_get_const (contact, field);
- if (str != NULL && *str != '\0')
- render_table_row (buffer, html_label, str, icon, html_flags);
+ if (str != NULL && *str != '\0')
+ render_table_row (buffer, html_label, str, icon, html_flags);
}
static void
@@ -347,20 +345,20 @@ accum_time_attribute (GString *buffer,
const gchar *icon,
guint html_flags)
{
- EContactDate *date;
- GDate *gdate = NULL;
- gchar sdate[100];
-
- date = e_contact_get (contact, field);
- if (date) {
- gdate = g_date_new_dmy ( date->day,
- date->month,
- date->year );
+ EContactDate *date;
+ GDate *gdate = NULL;
+ gchar sdate[100];
+
+ date = e_contact_get (contact, field);
+ if (date) {
+ gdate = g_date_new_dmy ( date->day,
+ date->month,
+ date->year );
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);
- }
+ g_date_free (gdate);
+ render_table_row (buffer, html_label, sdate, icon, html_flags);
+ e_contact_date_free (date);
+ }
}
static void
@@ -371,261 +369,261 @@ accum_attribute_multival (GString *buffer,
const gchar *icon,
guint html_flags)
{
- GList *val_list, *l;
+ GList *val_list, *l;
GString *val = g_string_new ("");
- val_list = e_contact_get (contact, field);
+ val_list = e_contact_get (contact, field);
- for (l = val_list; l; l = l->next) {
- if (l != val_list)
+ for (l = val_list; l; l = l->next) {
+ if (l != val_list)
g_string_append (val, "<br>");
- g_string_append (val, l->data);
- }
+ g_string_append (val, l->data);
+ }
- if (val->str && *val->str)
- render_table_row (buffer, html_label, val->str, icon, html_flags);
+ if (val->str && *val->str)
+ render_table_row (buffer, html_label, val->str, icon, html_flags);
- g_string_free (val, TRUE);
- g_list_foreach (val_list, (GFunc) g_free, NULL);
- g_list_free (val_list);
+ g_string_free (val, TRUE);
+ g_list_foreach (val_list, (GFunc) g_free, NULL);
+ g_list_free (val_list);
}
static const gchar *
get_email_location (EVCardAttribute *attr)
{
- gint i;
+ gint i;
- for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
- if (e_vcard_attribute_has_type (attr, common_location[i].name))
- return _(common_location[i].pretty_name);
- }
+ for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
+ if (e_vcard_attribute_has_type (attr, common_location[i].name))
+ return _(common_location[i].pretty_name);
+ }
return _("Other");
}
static void
render_title_block (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
- const gchar *str;
- gchar *html;
- EContactPhoto *photo;
+ const gchar *str;
+ gchar *html;
+ EContactPhoto *photo;
EContact *contact;
contact = formatter->priv->contact;
- g_string_append_printf (
- buffer,
+ g_string_append_printf (
+ buffer,
"<table border=\"0\"><tr>"
"<td %s valign=\"middle\">", TEXT_IS_RIGHT_TO_LEFT ?
"align=\"right\"" : "");
- photo = e_contact_get (contact, E_CONTACT_PHOTO);
- if (!photo)
- photo = e_contact_get (contact, E_CONTACT_LOGO);
+ photo = e_contact_get (contact, E_CONTACT_PHOTO);
+ if (!photo)
+ photo = e_contact_get (contact, E_CONTACT_LOGO);
- if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
- gchar *photo_data;
+ if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+ gchar *photo_data;
photo_data = g_base64_encode (
photo->data.inlined.data,
photo->data.inlined.length);
- g_string_append_printf (
+ g_string_append_printf (
buffer, "<img border=\"1\" src=\"data:%s;base64,%s\">",
- photo->data.inlined.mime_type,
- photo_data);
- } else if (photo && photo->type == E_CONTACT_PHOTO_TYPE_URI && photo->data.uri && *photo->data.uri) {
- g_string_append_printf (
+ photo->data.inlined.mime_type,
+ photo_data);
+ } else if (photo && photo->type == E_CONTACT_PHOTO_TYPE_URI && photo->data.uri && *photo->data.uri) {
+ g_string_append_printf (
buffer, "<img border=\"1\" src=\"%s\">", photo->data.uri);
- }
+ }
- if (photo)
- e_contact_photo_free (photo);
+ if (photo)
+ e_contact_photo_free (photo);
- if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
- gchar *icon = get_icon_uri (CONTACT_LIST_ICON);
+ 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_free (icon);
- }
+ g_free (icon);
+ }
- g_string_append_printf (
- buffer,
+ g_string_append_printf (
+ buffer,
"</td><td width=\"20\"></td><td %s valign=\"top\">\n",
TEXT_IS_RIGHT_TO_LEFT ? "align=\"right\"" : "");
- str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
- if (!str)
- str = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
+ str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
+ if (!str)
+ str = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
- if (str) {
- html = e_text_to_html (str, 0);
- if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
- g_string_append_printf (
+ if (str) {
+ html = e_text_to_html (str, 0);
+ if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
+ g_string_append_printf (
buffer,
"<h2><a href=\"internal-mailto:0\";>%s</a></h2>",
html);
} else {
g_string_append_printf (buffer, "<h2>%s</h2>", html);
}
- g_free (html);
- }
+ g_free (html);
+ }
g_string_append (buffer, "</td></tr></table>");
}
static void
render_contact_list_row (EABContactFormatter *formatter,
- EDestination *destination,
- GString *buffer)
+ EDestination *destination,
+ GString *buffer)
{
- gchar *evolution_imagesdir;
- gboolean list_collapsed = FALSE;
- const gchar *textrep;
- gchar *name = NULL, *email_addr = NULL;
+ gchar *evolution_imagesdir;
+ gboolean list_collapsed = FALSE;
+ const gchar *textrep;
+ gchar *name = NULL, *email_addr = NULL;
evolution_imagesdir = g_filename_to_uri (EVOLUTION_IMAGESDIR, NULL, NULL);
- textrep = e_destination_get_textrep (destination, TRUE);
- if (!eab_parse_qp_email (textrep, &name, &email_addr))
- email_addr = g_strdup (textrep);
+ textrep = e_destination_get_textrep (destination, TRUE);
+ if (!eab_parse_qp_email (textrep, &name, &email_addr))
+ email_addr = g_strdup (textrep);
g_string_append (buffer, "<tr>");
- if (e_destination_is_evolution_list (destination)) {
- g_string_append_printf (
+ if (e_destination_is_evolution_list (destination)) {
+ g_string_append_printf (
buffer,
"<td width=" IMAGE_COL_WIDTH " valign=\"top\">"
"<img src=\"%s/minus.png\" "
"onClick=\"collapse_list(this, %s);\" "
"class=\"navigable\">"
"</td><td width=\"100%%\">%s",
- evolution_imagesdir,
- e_destination_get_contact_uid (destination),
- name ? name : email_addr);
+ evolution_imagesdir,
+ e_destination_get_contact_uid (destination),
+ name ? name : email_addr);
- if (!list_collapsed) {
- const GList *dest, *dests;
- g_string_append_printf (
+ if (!list_collapsed) {
+ const GList *dest, *dests;
+ g_string_append_printf (
buffer,
"<br><table cellspacing=\"1\" id=\"%s\">",
- e_destination_get_contact_uid (destination));
+ e_destination_get_contact_uid (destination));
- dests = e_destination_list_get_root_dests (destination);
- for (dest = dests; dest; dest = dest->next) {
- render_contact_list_row (
+ dests = e_destination_list_get_root_dests (destination);
+ 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>");
- } else {
- if (name && *name) {
- g_string_append_printf (
+ } else {
+ if (name && *name) {
+ g_string_append_printf (
buffer,
"<td colspan=\"2\">%s <"
"<a href=\"mailto:%s\";>%s</a>>"
"</td>",
name, email_addr, email_addr);
- } else {
- g_string_append_printf (
+ } else {
+ g_string_append_printf (
buffer,
"<td colspan=\"2\">"
"<a href=\"mailto:%s\";>%s</a>"
"</td>",
email_addr, email_addr);
- }
- }
+ }
+ }
g_string_append (buffer, "</tr>");
- g_free (evolution_imagesdir);
- g_free (name);
- g_free (email_addr);
+ g_free (evolution_imagesdir);
+ g_free (name);
+ g_free (email_addr);
}
static void
render_contact_list (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
EContact *contact;
- EDestination *destination;
- const GList *dest, *dests;
+ EDestination *destination;
+ const GList *dest, *dests;
contact = formatter->priv->contact;
- destination = e_destination_new ();
- e_destination_set_contact (destination, contact, 0);
- dests = e_destination_list_get_root_dests (destination);
+ destination = e_destination_new ();
+ e_destination_set_contact (destination, contact, 0);
+ dests = e_destination_list_get_root_dests (destination);
- render_title_block (formatter, buffer);
+ render_title_block (formatter, buffer);
- g_string_append_printf (
+ g_string_append_printf (
buffer,
"<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\">");
- for (dest = dests; dest; dest = dest->next)
- render_contact_list_row (formatter, dest->data, buffer);
+ 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_object_unref (destination);
+ g_object_unref (destination);
}
static void
render_contact_column (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
EContact *contact;
- GString *accum, *email;
- GList *email_list, *l, *email_attr_list, *al;
- gint email_num = 0;
- const gchar *nl;
+ GString *accum, *email;
+ GList *email_list, *l, *email_attr_list, *al;
+ gint email_num = 0;
+ const gchar *nl;
contact = formatter->priv->contact;
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);
+ email_list = e_contact_get (contact, E_CONTACT_EMAIL);
+ email_attr_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
- for (l = email_list, al = email_attr_list; l && al; l = l->next, al = al->next) {
- gchar *name = NULL, *mail = NULL;
- gchar *attr_str = (gchar *) get_email_location ((EVCardAttribute *) al->data);
+ for (l = email_list, al = email_attr_list; l && al; l = l->next, al = al->next) {
+ gchar *name = NULL, *mail = NULL;
+ gchar *attr_str = (gchar *) get_email_location ((EVCardAttribute *) al->data);
- if (!eab_parse_qp_email (l->data, &name, &mail))
- mail = e_text_to_html (l->data, 0);
+ if (!eab_parse_qp_email (l->data, &name, &mail))
+ mail = e_text_to_html (l->data, 0);
- g_string_append_printf (
+ g_string_append_printf (
email,
"%s%s%s<a href=\"internal-mailto:%d\";>%s</a>%s "
"<span class=\"header\">(%s)</span>",
- nl,
+ nl,
name ? name : "",
name ? " <" : "",
- email_num,
- mail,
+ email_num,
+ mail,
name ? ">" : "",
attr_str ? attr_str : "");
- email_num++;
+ email_num++;
nl = "<br>";
- g_free (name);
- g_free (mail);
- }
- g_list_foreach (email_list, (GFunc) g_free, NULL);
- g_list_foreach (email_attr_list, (GFunc) e_vcard_attribute_free, NULL);
- g_list_free (email_list);
- g_list_free (email_attr_list);
+ g_free (name);
+ g_free (mail);
+ }
+ g_list_foreach (email_list, (GFunc) g_free, NULL);
+ g_list_foreach (email_attr_list, (GFunc) e_vcard_attribute_free, NULL);
+ g_list_free (email_list);
+ g_list_free (email_attr_list);
accum = g_string_new ("");
- if (email->len)
+ if (email->len)
render_table_row (accum, _("Email"), email->str, NULL, 0);
accum_attribute (accum, contact, _("Nickname"), E_CONTACT_NICKNAME, NULL, 0);
@@ -638,18 +636,17 @@ render_contact_column (EABContactFormatter *formatter,
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 (
+ if (accum->len)
+ g_string_append_printf (
buffer,
"<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);
+ g_string_free (email, TRUE);
}
-
static void
accum_address_map (GString *buffer,
EContact *contact,
@@ -659,15 +656,15 @@ accum_address_map (GString *buffer,
g_string_append (buffer, "<tr><td colspan=\"3\">");
- if (map_type == E_CONTACT_ADDRESS_WORK) {
- g_string_append (buffer,
+ if (map_type == E_CONTACT_ADDRESS_WORK) {
+ g_string_append (buffer,
"<object type=\"application/x-work-map-widget\" "
"width=\"250\" height=\"250\"></object>");
- } else {
- g_string_append (buffer,
+ } else {
+ g_string_append (buffer,
"<object type=\"application/x-home-map-widget\" "
"width=\"250\" height=\"250\"></object>");
- }
+ }
g_string_append (buffer, "</td></tr>");
@@ -676,7 +673,7 @@ accum_address_map (GString *buffer,
static void
render_work_column (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
EContact *contact = formatter->priv->contact;
GString *accum = g_string_new ("");
@@ -693,24 +690,24 @@ render_work_column (EABContactFormatter *formatter,
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 (formatter->priv->render_maps)
+ accum_address_map (accum, contact, E_CONTACT_ADDRESS_WORK);
- if (accum->len > 0) {
- g_string_append_printf (
+ 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);
- }
+ }
- g_string_free (accum, TRUE);
+ g_string_free (accum, TRUE);
}
static void
render_personal_column (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
EContact *contact = formatter->priv->contact;
GString *accum = g_string_new ("");
@@ -723,53 +720,52 @@ render_personal_column (EABContactFormatter *formatter,
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 (formatter->priv->render_maps)
+ accum_address_map (accum, contact, E_CONTACT_ADDRESS_HOME);
- if (accum->len > 0) {
- g_string_append_printf (
+ 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);
- }
+ }
- g_string_free (accum, TRUE);
+ g_string_free (accum, TRUE);
}
static void
render_footer (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
EContact *contact;
- const gchar *str;
+ const gchar *str;
contact = formatter->priv->contact;
- str = e_contact_get_const (contact, E_CONTACT_NOTE);
- if (!str || !*str)
- return;
+ str = e_contact_get_const (contact, E_CONTACT_NOTE);
+ if (!str || !*str)
+ return;
- g_string_append (
- buffer,
+ g_string_append (
+ buffer,
"<div id=\"footer\"><table border=\"0\" cellspacing=\"5\">");
- render_table_row (
+ render_table_row (
buffer, _("Note"),
- e_contact_get_const (contact, E_CONTACT_NOTE),
- NULL,
- E_TEXT_TO_HTML_CONVERT_ADDRESSES |
- E_TEXT_TO_HTML_CONVERT_URLS |
- E_TEXT_TO_HTML_CONVERT_NL);
+ e_contact_get_const (contact, E_CONTACT_NOTE),
+ NULL,
+ E_TEXT_TO_HTML_CONVERT_ADDRESSES |
+ E_TEXT_TO_HTML_CONVERT_URLS |
+ E_TEXT_TO_HTML_CONVERT_NL);
g_string_append (buffer, "</table></div>");
}
-
static void
render_contact (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
render_title_block (formatter, buffer);
@@ -784,37 +780,37 @@ render_contact (EABContactFormatter *formatter,
static void
render_normal (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
- g_string_append (buffer, HTML_HEADER);
+ g_string_append (buffer, HTML_HEADER);
g_string_append (buffer, "<body>");
- if (formatter->priv->contact) {
+ if (formatter->priv->contact) {
- if (e_contact_get (formatter->priv->contact, E_CONTACT_IS_LIST))
+ if (e_contact_get (formatter->priv->contact, E_CONTACT_IS_LIST))
- render_contact_list (
- formatter,
- buffer);
- else
- render_contact (
- formatter,
- buffer);
+ render_contact_list (
+ formatter,
+ buffer);
+ else
+ render_contact (
+ formatter,
+ buffer);
- }
+ }
g_string_append (buffer, "</body></html>\n");
}
static void
render_compact (EABContactFormatter *formatter,
- GString *buffer)
+ GString *buffer)
{
EContact *contact = formatter->priv->contact;
const gchar *str;
gchar *html;
EContactPhoto *photo;
-
+
g_string_append (buffer, HTML_HEADER);
g_string_append (buffer, "<body>\n");
@@ -822,7 +818,7 @@ render_compact (EABContactFormatter *formatter,
g_string_append (buffer, "</body></html>");
return;
}
-
+
g_string_append_printf (
buffer,
"<table><tr><td valign=\"top\">");
@@ -845,7 +841,7 @@ render_compact (EABContactFormatter *formatter,
gdk_pixbuf_loader_write (
loader, photo->data.inlined.data,
photo->data.inlined.length, NULL);
- } else if (photo->type == E_CONTACT_PHOTO_TYPE_URI &&
+ } else if (photo->type == E_CONTACT_PHOTO_TYPE_URI &&
photo->data.uri &&
g_ascii_strncasecmp (photo->data.uri, "file://", 7) == 0) {
gchar *filename, *contents = NULL;
@@ -890,7 +886,7 @@ render_compact (EABContactFormatter *formatter,
g_object_unref (pixbuf);
}
- if (photo->type == E_CONTACT_PHOTO_TYPE_URI &&
+ if (photo->type == E_CONTACT_PHOTO_TYPE_URI &&
photo->data.uri && *photo->data.uri)
g_string_append_printf (
buffer,
@@ -1025,7 +1021,7 @@ render_compact (EABContactFormatter *formatter,
g_string_append (buffer, "</body></html>\n");
}
-static CamelStream*
+static CamelStream *
format_contact (EABContactFormatter *formatter,
GCancellable *cancellable)
{
@@ -1034,10 +1030,10 @@ format_contact (EABContactFormatter *formatter,
buffer = g_string_new ("");
- if (formatter->priv->mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
- render_normal (formatter, buffer);
+ if (formatter->priv->mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
+ render_normal (formatter, buffer);
} else {
- render_compact (formatter, buffer);
+ render_compact (formatter, buffer);
}
stream = camel_stream_mem_new ();
@@ -1053,22 +1049,22 @@ do_start_async_formatter (GSimpleAsyncResult *result,
GObject *object,
GCancellable *cancellable)
{
- EABContactFormatter *formatter;
+ EABContactFormatter *formatter;
CamelStream *stream;
- formatter = EAB_CONTACT_FORMATTER (object);
+ formatter = EAB_CONTACT_FORMATTER (object);
- stream = format_contact (formatter, cancellable);
+ stream = format_contact (formatter, cancellable);
g_simple_async_result_set_op_res_gpointer (result, stream, NULL);
}
static void
eab_contact_formatter_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
-{
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
EABContactFormatter *formatter = EAB_CONTACT_FORMATTER (object);
switch (property_id) {
@@ -1087,9 +1083,9 @@ eab_contact_formatter_set_property (GObject *object,
static void
eab_contact_formatter_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
EABContactFormatter *formatter = EAB_CONTACT_FORMATTER (object);
@@ -1109,8 +1105,6 @@ eab_contact_formatter_get_property (GObject *object,
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
-
-
static void
eab_contact_formatter_finalize (GObject *object)
{
@@ -1118,70 +1112,70 @@ eab_contact_formatter_finalize (GObject *object)
formatter = EAB_CONTACT_FORMATTER (object);
- if (formatter->priv->contact) {
- g_object_unref (formatter->priv->contact);
- formatter->priv->contact = NULL;
- }
+ if (formatter->priv->contact) {
+ g_object_unref (formatter->priv->contact);
+ formatter->priv->contact = NULL;
+ }
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
eab_contact_formatter_class_init (EABContactFormatterClass *klass)
{
- GObjectClass *object_class;
+ GObjectClass *object_class;
- parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (EABContactFormatterClass));
+ parent_class = g_type_class_peek_parent (klass);
+ g_type_class_add_private (klass, sizeof (EABContactFormatterClass));
- object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = eab_contact_formatter_finalize;
+ object_class = G_OBJECT_CLASS (klass);
+ object_class->finalize = eab_contact_formatter_finalize;
object_class->set_property = eab_contact_formatter_set_property;
object_class->get_property = eab_contact_formatter_get_property;
- g_object_class_install_property (
- object_class,
- PROP_DISPLAY_MODE,
- g_param_spec_int (
+ g_object_class_install_property (
+ object_class,
+ PROP_DISPLAY_MODE,
+ g_param_spec_int (
"display-mode",
"",
"",
- EAB_CONTACT_DISPLAY_RENDER_NORMAL,
- EAB_CONTACT_DISPLAY_RENDER_COMPACT,
- EAB_CONTACT_DISPLAY_RENDER_NORMAL,
- G_PARAM_READWRITE));
-
- g_object_class_install_property (
- object_class,
- PROP_RENDER_MAPS,
- g_param_spec_boolean (
+ EAB_CONTACT_DISPLAY_RENDER_NORMAL,
+ EAB_CONTACT_DISPLAY_RENDER_COMPACT,
+ EAB_CONTACT_DISPLAY_RENDER_NORMAL,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_RENDER_MAPS,
+ g_param_spec_boolean (
"render-maps",
"",
"",
- FALSE,
- G_PARAM_READWRITE));
+ FALSE,
+ G_PARAM_READWRITE));
}
static void
eab_contact_formatter_init (EABContactFormatter *formatter)
{
- formatter->priv = EAB_CONTACT_FORMATTER_GET_PRIVATE (formatter);
+ formatter->priv = EAB_CONTACT_FORMATTER_GET_PRIVATE (formatter);
- formatter->priv->contact = NULL;
- formatter->priv->mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
- formatter->priv->render_maps = FALSE;
+ formatter->priv->contact = NULL;
+ formatter->priv->mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
+ formatter->priv->render_maps = FALSE;
}
void
eab_contact_formatter_set_display_mode (EABContactFormatter *formatter,
EABContactDisplayMode mode)
{
- g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
+ g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
- if (formatter->priv->mode == mode)
- return;
+ if (formatter->priv->mode == mode)
+ return;
- formatter->priv->mode = mode;
+ formatter->priv->mode = mode;
g_object_notify (G_OBJECT (formatter), "display-mode");
}
@@ -1189,22 +1183,22 @@ eab_contact_formatter_set_display_mode (EABContactFormatter *formatter,
EABContactDisplayMode
eab_contact_formatter_get_display_mode (EABContactFormatter *formatter)
{
- g_return_val_if_fail (EAB_IS_CONTACT_FORMATTER (formatter),
- EAB_CONTACT_DISPLAY_RENDER_NORMAL);
+ g_return_val_if_fail (EAB_IS_CONTACT_FORMATTER (formatter),
+ EAB_CONTACT_DISPLAY_RENDER_NORMAL);
- return formatter->priv->mode;
+ return formatter->priv->mode;
}
void
eab_contact_formatter_set_render_maps (EABContactFormatter *formatter,
gboolean render_maps)
{
- g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
+ g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
- if (formatter->priv->render_maps == render_maps)
- return;
+ if (formatter->priv->render_maps == render_maps)
+ return;
- formatter->priv->render_maps = render_maps;
+ formatter->priv->render_maps = render_maps;
g_object_notify (G_OBJECT (formatter), "render-maps");
}
@@ -1212,30 +1206,30 @@ eab_contact_formatter_set_render_maps (EABContactFormatter *formatter,
gboolean
eab_contact_formatter_get_render_maps (EABContactFormatter *formatter)
{
- g_return_val_if_fail (EAB_IS_CONTACT_FORMATTER (formatter), FALSE);
+ g_return_val_if_fail (EAB_IS_CONTACT_FORMATTER (formatter), FALSE);
- return formatter->priv->render_maps;
+ return formatter->priv->render_maps;
}
void
eab_contact_formatter_format_contact_sync (EABContactFormatter *formatter,
EContact *contact,
- CamelStream *stream,
+ CamelStream *stream,
GCancellable *cancellable)
{
CamelStream *out;
- g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
- g_return_if_fail (E_IS_CONTACT (contact));
+ g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
+ g_return_if_fail (E_IS_CONTACT (contact));
- g_object_ref (contact);
+ g_object_ref (contact);
- if (formatter->priv->contact)
- g_object_unref (formatter->priv->contact);
+ if (formatter->priv->contact)
+ g_object_unref (formatter->priv->contact);
formatter->priv->contact = contact;
- out = format_contact (formatter, cancellable);
+ out = format_contact (formatter, cancellable);
g_seekable_seek (G_SEEKABLE (out), 0, G_SEEK_SET, cancellable, NULL);
camel_stream_write_to_stream (out, stream, cancellable, NULL);
@@ -1243,7 +1237,6 @@ eab_contact_formatter_format_contact_sync (EABContactFormatter *formatter,
g_object_unref (out);
}
-
void
eab_contact_formatter_format_contact_async (EABContactFormatter *formatter,
EContact *contact,
@@ -1251,25 +1244,24 @@ eab_contact_formatter_format_contact_async (EABContactFormatter *formatter,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GSimpleAsyncResult *result;
+ GSimpleAsyncResult *result;
- g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
- g_return_if_fail (E_IS_CONTACT (contact));
- g_return_if_fail (callback != NULL);
+ g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
+ g_return_if_fail (E_IS_CONTACT (contact));
+ g_return_if_fail (callback != NULL);
- g_object_ref (contact);
- if (formatter->priv->contact)
- g_object_unref (formatter->priv->contact);
-
- formatter->priv->contact = contact;
+ g_object_ref (contact);
+ if (formatter->priv->contact)
+ g_object_unref (formatter->priv->contact);
+ formatter->priv->contact = contact;
- result = g_simple_async_result_new (
- G_OBJECT (formatter),
- callback, user_data,
- eab_contact_formatter_format_contact_async);
+ result = g_simple_async_result_new (
+ G_OBJECT (formatter),
+ callback, user_data,
+ eab_contact_formatter_format_contact_async);
- g_simple_async_result_run_in_thread (
- result, do_start_async_formatter,
+ g_simple_async_result_run_in_thread (
+ result, do_start_async_formatter,
G_PRIORITY_DEFAULT, cancellable);
}
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index 23994f2..4822f11 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -47,7 +47,6 @@ static void emfq_builtin_init (EMFormatQuoteClass *efhc);
static CamelMimePart * decode_inline_parts (CamelMimePart *part, GCancellable *cancellable);
-
static void emfq_parse_text_plain (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
static void emfq_parse_text_enriched (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
static void emfq_parse_text_html (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
@@ -63,7 +62,7 @@ static gpointer parent_class;
* if not NULL, should be unreffed with g_object_unref(). */
static CamelMimePart *
decode_inline_parts (CamelMimePart *part,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
CamelMultipart *mp;
CamelStream *null;
@@ -117,28 +116,28 @@ emfq_format_text_header (EMFormatQuote *emfq,
guint32 flags,
gint is_html)
{
- const gchar *html;
- gchar *mhtml = NULL;
+ const gchar *html;
+ gchar *mhtml = NULL;
- if (value == NULL)
- return;
+ if (value == NULL)
+ return;
- while (*value == ' ')
- value++;
+ while (*value == ' ')
+ value++;
- if (!is_html)
- html = mhtml = camel_text_to_html (value, 0, 0);
- else
- html = value;
+ if (!is_html)
+ html = mhtml = camel_text_to_html (value, 0, 0);
+ else
+ html = value;
- if (flags & EM_FORMAT_HEADER_BOLD)
- g_string_append_printf (
+ if (flags & EM_FORMAT_HEADER_BOLD)
+ g_string_append_printf (
buffer, "<b>%s</b>: %s<br>", label, html);
- else
- g_string_append_printf (
+ else
+ g_string_append_printf (
buffer, "%s: %s<br>", label, html);
- g_free (mhtml);
+ g_free (mhtml);
}
static const gchar *addrspec_hdrs[] = {
@@ -160,83 +159,83 @@ static void
emfq_format_address (GString *out,
struct _camel_header_address *a)
{
- guint32 flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
- gchar *name, *mailto, *addr;
+ guint32 flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
+ gchar *name, *mailto, *addr;
- while (a) {
- if (a->name)
- name = camel_text_to_html (a->name, flags, 0);
- else
- name = NULL;
+ while (a) {
+ if (a->name)
+ name = camel_text_to_html (a->name, flags, 0);
+ else
+ name = NULL;
- switch (a->type) {
- case CAMEL_HEADER_ADDRESS_NAME:
- if (name && *name) {
- gchar *real, *mailaddr;
+ switch (a->type) {
+ case CAMEL_HEADER_ADDRESS_NAME:
+ if (name && *name) {
+ gchar *real, *mailaddr;
g_string_append_printf (out, "%s <", name);
/* rfc2368 for mailto syntax and url encoding extras */
- if ((real = camel_header_encode_phrase ((guchar *) a->name))) {
+ if ((real = camel_header_encode_phrase ((guchar *) a->name))) {
mailaddr = g_strdup_printf ("%s <%s>", real, a->v.addr);
- g_free (real);
+ g_free (real);
mailto = camel_url_encode (mailaddr, "?=&()");
- g_free (mailaddr);
- } else {
+ g_free (mailaddr);
+ } else {
mailto = camel_url_encode (a->v.addr, "?=&()");
- }
- } else {
+ }
+ } else {
mailto = camel_url_encode (a->v.addr, "?=&()");
- }
- addr = camel_text_to_html (a->v.addr, flags, 0);
+ }
+ addr = camel_text_to_html (a->v.addr, flags, 0);
g_string_append_printf (
out, "<a href=\"mailto:%s\";>%s</a>",
mailto, addr);
- g_free (mailto);
- g_free (addr);
+ g_free (mailto);
+ g_free (addr);
- if (name && *name)
+ if (name && *name)
g_string_append (out, ">");
- break;
- case CAMEL_HEADER_ADDRESS_GROUP:
+ break;
+ case CAMEL_HEADER_ADDRESS_GROUP:
g_string_append_printf (out, "%s: ", name);
- emfq_format_address (out, a->v.members);
+ emfq_format_address (out, a->v.members);
g_string_append_printf (out, ";");
- break;
- default:
+ break;
+ default:
g_warning ("Invalid address type");
- break;
- }
+ break;
+ }
- g_free (name);
+ g_free (name);
- a = a->next;
- if (a)
+ a = a->next;
+ if (a)
g_string_append (out, ", ");
- }
+ }
}
static void
canon_header_name (gchar *name)
{
- gchar *inptr = name;
+ gchar *inptr = name;
/* canonicalise the header name... first letter is
* capitalised and any letter following a '-' also gets
* capitalised */
- if (g_ascii_islower (*inptr))
+ if (g_ascii_islower (*inptr))
*inptr = g_ascii_toupper (*inptr);
- inptr++;
+ inptr++;
- while (*inptr) {
- if (inptr[-1] == '-' && g_ascii_islower (*inptr))
+ while (*inptr) {
+ if (inptr[-1] == '-' && g_ascii_islower (*inptr))
*inptr = g_ascii_toupper (*inptr);
- else if (g_ascii_isupper (*inptr))
+ else if (g_ascii_isupper (*inptr))
*inptr = g_ascii_tolower (*inptr);
- inptr++;
- }
+ inptr++;
+ }
}
static void
@@ -247,86 +246,86 @@ emfq_format_header (EMFormat *emf,
guint32 flags,
const gchar *charset)
{
- CamelMimeMessage *msg = (CamelMimeMessage *) part;
- EMFormatQuote *emfq = (EMFormatQuote *) emf;
- gchar *name, *buf, *value = NULL;
- const gchar *txt, *label;
- gboolean addrspec = FALSE;
- gint is_html = FALSE;
- gint i;
-
- name = g_alloca (strlen (namein) + 1);
- strcpy (name, namein);
- canon_header_name (name);
+ CamelMimeMessage *msg = (CamelMimeMessage *) part;
+ EMFormatQuote *emfq = (EMFormatQuote *) emf;
+ gchar *name, *buf, *value = NULL;
+ const gchar *txt, *label;
+ gboolean addrspec = FALSE;
+ gint is_html = FALSE;
+ gint i;
+
+ name = g_alloca (strlen (namein) + 1);
+ strcpy (name, namein);
+ canon_header_name (name);
/* Never quote Bcc headers */
if (g_str_equal (name, "Bcc") || g_str_equal (name, "Resent-Bcc"))
- return;
+ return;
- for (i = 0; addrspec_hdrs[i]; i++) {
- if (!strcmp (name, addrspec_hdrs[i])) {
- addrspec = TRUE;
- break;
- }
- }
+ for (i = 0; addrspec_hdrs[i]; i++) {
+ if (!strcmp (name, addrspec_hdrs[i])) {
+ addrspec = TRUE;
+ break;
+ }
+ }
- label = _(name);
+ label = _(name);
- if (addrspec) {
- struct _camel_header_address *addrs;
- GString *html;
+ if (addrspec) {
+ struct _camel_header_address *addrs;
+ GString *html;
- if (!(txt = camel_medium_get_header (part, name)))
- return;
+ if (!(txt = camel_medium_get_header (part, name)))
+ return;
- buf = camel_header_unfold (txt);
- addrs = camel_header_address_decode (
- txt, em_format_get_charset (emf) ?
- em_format_get_charset (emf) : em_format_get_default_charset (emf));
- if (addrs == NULL) {
- g_free (buf);
- return;
- }
+ buf = camel_header_unfold (txt);
+ addrs = camel_header_address_decode (
+ txt, em_format_get_charset (emf) ?
+ em_format_get_charset (emf) : em_format_get_default_charset (emf));
+ if (addrs == NULL) {
+ g_free (buf);
+ return;
+ }
- g_free (buf);
+ g_free (buf);
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;
+ 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")) {
- txt = camel_mime_message_get_subject (msg);
+ txt = camel_mime_message_get_subject (msg);
label = _("Subject");
- flags |= EM_FORMAT_HEADER_BOLD;
+ 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")))
- return;
+ return;
- txt = value = camel_header_format_ctext (txt, charset);
+ txt = value = camel_header_format_ctext (txt, charset);
label = _("Mailer");
- flags |= EM_FORMAT_HEADER_BOLD;
+ flags |= EM_FORMAT_HEADER_BOLD;
} else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) {
- if (!(txt = camel_medium_get_header (part, name)))
- return;
+ if (!(txt = camel_medium_get_header (part, name)))
+ return;
- flags |= EM_FORMAT_HEADER_BOLD;
- } else {
- txt = camel_medium_get_header (part, name);
- buf = camel_header_unfold (txt);
- txt = value = camel_header_decode_string (txt, charset);
- g_free (buf);
- }
+ flags |= EM_FORMAT_HEADER_BOLD;
+ } else {
+ txt = camel_medium_get_header (part, name);
+ buf = camel_header_unfold (txt);
+ txt = value = camel_header_decode_string (txt, charset);
+ g_free (buf);
+ }
- emfq_format_text_header (emfq, buffer, label, txt, flags, is_html);
+ emfq_format_text_header (emfq, buffer, label, txt, flags, is_html);
- g_free (value);
+ g_free (value);
}
static void
@@ -334,26 +333,26 @@ emfq_format_headers (EMFormatQuote *emfq,
GString *buffer,
CamelMedium *part)
{
- EMFormat *emf = (EMFormat *) emfq;
- CamelContentType *ct;
- const gchar *charset;
- GList *link;
+ EMFormat *emf = (EMFormat *) emfq;
+ CamelContentType *ct;
+ const gchar *charset;
+ GList *link;
- if (!part)
- return;
+ if (!part)
+ return;
- ct = camel_mime_part_get_content_type ((CamelMimePart *) part);
+ ct = camel_mime_part_get_content_type ((CamelMimePart *) part);
charset = camel_content_type_param (ct, "charset");
- charset = camel_iconv_charset_name (charset);
+ charset = camel_iconv_charset_name (charset);
/* dump selected headers */
- link = g_queue_peek_head_link (&emf->header_list);
- while (link != NULL) {
- EMFormatHeader *h = link->data;
- emfq_format_header (
- emf, buffer, part, h->name, h->flags, charset);
- link = g_list_next (link);
- }
+ link = g_queue_peek_head_link (&emf->header_list);
+ while (link != NULL) {
+ EMFormatHeader *h = link->data;
+ emfq_format_header (
+ emf, buffer, part, h->name, h->flags, charset);
+ link = g_list_next (link);
+ }
g_string_append (buffer, "<br>\n");
}
@@ -380,17 +379,17 @@ 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;
+ EMFormatPURI *puri;
CamelMimePart *mp;
- gint len;
+ gint len;
- len = part_id->len;
+ len = part_id->len;
g_string_append (part_id, ".text_plain");
mp = decode_inline_parts (part, cancellable);
@@ -403,87 +402,83 @@ emfq_parse_text_plain (EMFormat* emf,
g_object_unref (mp);
}
- puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str);
- puri->write_func = emfq_write_text_plain;
+ 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");
- em_format_add_puri (emf, puri);
+ em_format_add_puri (emf, puri);
- g_string_truncate (part_id, len);
+ 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;
+ EMFormatPURI *puri;
+ gint len;
- len = part_id->len;
+ len = part_id->len;
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 = 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");
- em_format_add_puri (emf, puri);
+ em_format_add_puri (emf, puri);
- g_string_truncate (part_id, len);
+ 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;
+ EMFormatPURI *puri;
+ gint len;
- len = part_id->len;
+ len = part_id->len;
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 = 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");
- em_format_add_puri (emf, puri);
+ em_format_add_puri (emf, puri);
- g_string_truncate (part_id, len);
+ 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;
+ EMFormatPURI *puri;
+ gint len;
- len = part_id->len;
+ len = part_id->len;
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 = 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->is_attachment = TRUE;
- em_format_add_puri (emf, puri);
+ puri->is_attachment = TRUE;
+ em_format_add_puri (emf, puri);
- g_string_truncate (part_id, len);
+ g_string_truncate (part_id, len);
}
-
-
-
-
/******************************************************************************/
static void
emfq_write_attachment (EMFormat *emf,
- EMFormatPURI *puri,
+ EMFormatPURI *puri,
CamelStream *stream,
EMFormatWriterInfo *info,
GCancellable *cancellable)
@@ -604,22 +599,21 @@ em_format_quote_new (const gchar *credits,
return emfq;
}
-
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;
- GList *iter;
- EMFormatWriterInfo info = { 0 };
+ EMFormat *emf;
+ GSettings *settings;
+ GList *iter;
+ EMFormatWriterInfo info = { 0 };
- emf = (EMFormat *) emfq;
+ emf = (EMFormat *) emfq;
- g_seekable_seek (
- G_SEEKABLE (stream),
- 0, G_SEEK_SET, NULL, NULL);
+ g_seekable_seek (
+ G_SEEKABLE (stream),
+ 0, G_SEEK_SET, NULL, NULL);
settings = g_settings_new ("org.gnome.evolution.mail");
if (g_settings_get_boolean (
@@ -627,52 +621,52 @@ em_format_quote_write (EMFormatQuote* emfq,
camel_stream_write_string (
stream, "<br>\n", cancellable, NULL);
g_object_unref (settings);
-
- if (emfq->priv->credits && *emfq->priv->credits) {
+
+ if (emfq->priv->credits && *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, credits, cancellable, NULL);
+ g_free (credits);
+ } else {
camel_stream_write_string (stream, "<br/>", cancellable, NULL);
- }
+ }
- if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE)
- camel_stream_write_string (stream,
+ 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);
- for (iter = emf->mail_part_list; iter; iter = iter->next) {
- EMFormatPURI *puri = iter->data;
+ for (iter = emf->mail_part_list; iter; iter = iter->next) {
+ EMFormatPURI *puri = iter->data;
- if (puri->is_attachment || !puri->write_func)
- continue;
+ if (puri->is_attachment || !puri->write_func)
+ continue;
- puri = iter->data;
+ puri = iter->data;
- if (emfq->priv->flags & EM_FORMAT_QUOTE_HEADERS) {
+ if (emfq->priv->flags & EM_FORMAT_QUOTE_HEADERS) {
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);
- }
+ emfq_format_headers (emfq, buffer, (CamelMedium *) puri->part);
+ camel_stream_write_string (stream, buffer->str, cancellable, NULL);
+ g_string_free (buffer, TRUE);
+ }
- puri->write_func (emf, puri, stream, &info, cancellable);
- }
+ puri->write_func (emf, puri, stream, &info, cancellable);
+ }
- if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE)
- camel_stream_write_string (
+ if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE)
+ camel_stream_write_string (
stream, "</blockquote><!--+GtkHTML:"
"<DATA class=\"ClueFlow\" clear=\"orig\">-->",
- cancellable, NULL);
+ cancellable, NULL);
}
static void
emfq_write_text_plain (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
EMFormatQuote *emfq = EM_FORMAT_QUOTE (emf);
CamelStream *filtered_stream;
@@ -718,10 +712,10 @@ emfq_write_text_plain (EMFormat *emf,
static void
emfq_write_text_enriched (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
CamelStream *filtered_stream;
CamelMimeFilter *enriched;
@@ -761,10 +755,10 @@ emfq_write_text_enriched (EMFormat *emf,
static void
emfq_write_text_html (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
EMFormatQuotePrivate *priv;
diff --git a/em-format/em-format-quote.h b/em-format/em-format-quote.h
index b0f9701..be36407 100644
--- a/em-format/em-format-quote.h
+++ b/em-format/em-format-quote.h
@@ -73,7 +73,6 @@ void em_format_quote_write (EMFormatQuote *emfq,
CamelStream *stream,
GCancellable *cancellable);
-
G_END_DECLS
#endif /* EM_FORMAT_QUOTE_H */
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 8c21bcf..b824563 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -41,7 +41,6 @@
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), EM_TYPE_FORMAT, EMFormatPrivate))
-
struct _EMFormatPrivate {
GNode *current_node;
@@ -141,7 +140,7 @@ preserve_charset_in_content_type (CamelMimePart *ipart,
static CamelMimePart *
get_related_display_part (CamelMimePart *part,
- gint *out_displayid)
+ gint *out_displayid)
{
CamelMultipart *mp;
CamelMimePart *body_part, *display_part = NULL;
@@ -187,7 +186,7 @@ get_related_display_part (CamelMimePart *part,
static gboolean
related_display_part_is_attachment (EMFormat *emf,
- CamelMimePart *part)
+ CamelMimePart *part)
{
CamelMimePart *display_part;
@@ -198,10 +197,10 @@ related_display_part_is_attachment (EMFormat *emf,
/**************************************************************************/
void
em_format_empty_parser (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
/* DO NOTHING */
}
@@ -209,10 +208,10 @@ em_format_empty_parser (EMFormat *emf,
#ifdef ENABLE_SMIME
static void
emf_parse_application_xpkcs7mime (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelCipherContext *context;
CamelMimePart *opart;
@@ -247,8 +246,8 @@ emf_parse_application_xpkcs7mime (EMFormat *emf,
g_string_truncate (part_id, len);
/* Add a widget with details about the encryption, but only when
- the encrypted isn't itself secured, in that case it has created
- the button itself */
+ * the encrypted isn't itself secured, in that case it has created
+ * the button itself */
if (!is_secured (opart)) {
g_string_append (part_id, ".encrypted.button");
em_format_parse_part_as (emf, part, part_id, &encinfo,
@@ -267,10 +266,10 @@ emf_parse_application_xpkcs7mime (EMFormat *emf,
/* RFC 4155 */
static void
emf_parse_application_mbox (EMFormat *emf,
- CamelMimePart *mime_part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *mime_part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelMimeParser *parser;
CamelStream *mem_stream;
@@ -345,10 +344,10 @@ emf_parse_application_mbox (EMFormat *emf,
/* RFC 1740 */
static void
emf_parse_multipart_alternative (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelMultipart *mp;
gint i, nparts, bestid = 0;
@@ -426,10 +425,10 @@ emf_parse_multipart_alternative (EMFormat *emf,
/* RFC 1740 */
static void
emf_parse_multipart_appledouble (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelMultipart *mp;
CamelMimePart *mime_part;
@@ -459,10 +458,10 @@ emf_parse_multipart_appledouble (EMFormat *emf,
static void
emf_parse_multipart_encrypted (EMFormat *emf,
- CamelMimePart *part,
+ CamelMimePart *part,
GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelCipherContext *context;
const gchar *protocol;
@@ -474,7 +473,7 @@ emf_parse_multipart_encrypted (EMFormat *emf,
if (g_cancellable_is_cancelled (cancellable))
return;
- mpe = (CamelMultipartEncrypted*) camel_medium_get_content ((CamelMedium *) part);
+ mpe = (CamelMultipartEncrypted *) camel_medium_get_content ((CamelMedium *) part);
if (!CAMEL_IS_MULTIPART_ENCRYPTED (mpe)) {
em_format_format_error (
emf, _("Could not parse MIME message. "
@@ -525,8 +524,8 @@ emf_parse_multipart_encrypted (EMFormat *emf,
g_string_truncate (part_id, len);
/* Add a widget with details about the encryption, but only when
- the encrypted isn't itself secured, in that case it has created
- the button itself */
+ * the encrypted isn't itself secured, in that case it has created
+ * the button itself */
if (!is_secured (opart)) {
g_string_append (part_id, ".encrypted.button");
em_format_parse_part_as (emf, part, part_id, &encinfo,
@@ -545,10 +544,10 @@ emf_parse_multipart_encrypted (EMFormat *emf,
/* RFC 2046 */
static void
emf_parse_multipart_mixed (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelMultipart *mp;
gint i, nparts, len;
@@ -578,10 +577,10 @@ emf_parse_multipart_mixed (EMFormat *emf,
static void
emf_parse_multipart_signed (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelMimePart *cpart;
CamelMultipartSigned *mps;
@@ -666,8 +665,8 @@ emf_parse_multipart_signed (EMFormat *emf,
}
/* Add a widget with details about the encryption, but only when
- the encrypted isn't itself secured, in that case it has created
- the button itself */
+ * the encrypted isn't itself secured, in that case it has created
+ * the button itself */
if (!secured) {
g_string_append (part_id, ".signed.button");
em_format_parse_part_as (emf, part, part_id, &signinfo,
@@ -682,14 +681,13 @@ emf_parse_multipart_signed (EMFormat *emf,
g_object_unref (cipher);
}
-
/* RFC 2046 */
static void
emf_parse_multipart_digest (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelMultipart *mp;
gint i, nparts, len;
@@ -740,10 +738,10 @@ emf_parse_multipart_digest (EMFormat *emf,
/* RFC 2387 */
static void
emf_parse_multipart_related (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelMultipart *mp;
CamelMimePart *body_part, *display_part = NULL;
@@ -785,14 +783,12 @@ emf_parse_multipart_related (EMFormat *emf,
}
}
-
-
static void
emf_parse_message_deliverystatus (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
gint len;
@@ -816,10 +812,10 @@ emf_parse_message_deliverystatus (EMFormat *emf,
static void
emf_parse_inlinepgp_signed (EMFormat *emf,
- CamelMimePart *ipart,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *ipart,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelStream *filtered_stream;
CamelMimeFilterPgp *pgp_filter;
@@ -913,8 +909,8 @@ emf_parse_inlinepgp_signed (EMFormat *emf,
g_string_truncate (part_id, len);
/* Add a widget with details about the encryption, but only when
- the encrypted isn't itself secured, in that case it has created
- the button itself */
+ * the encrypted isn't itself secured, in that case it has created
+ * the button itself */
if (!is_secured (opart)) {
g_string_append (part_id, ".inlinepgp_signed.button");
em_format_parse_part_as (emf, opart, part_id, &signinfo,
@@ -932,10 +928,10 @@ emf_parse_inlinepgp_signed (EMFormat *emf,
static void
emf_parse_inlinepgp_encrypted (EMFormat *emf,
- CamelMimePart *ipart,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *ipart,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelCipherContext *cipher;
CamelCipherValidity *valid;
@@ -1002,8 +998,8 @@ emf_parse_inlinepgp_encrypted (EMFormat *emf,
g_string_truncate (part_id, len);
/* Add a widget with details about the encryption, but only when
- the encrypted isn't itself secured, in that case it has created
- the button itself */
+ * the encrypted isn't itself secured, in that case it has created
+ * the button itself */
if (!is_secured (opart)) {
g_string_append (part_id, ".inlinepgp_encrypted.button");
em_format_parse_part_as (emf, opart, part_id, &encinfo,
@@ -1019,32 +1015,32 @@ emf_parse_inlinepgp_encrypted (EMFormat *emf,
static void
emf_parse_message (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
/* Headers */
- info->force_handler = TRUE;
+ info->force_handler = TRUE;
em_format_parse_part_as (emf, part, part_id, info,
"x-evolution/message/headers", cancellable);
/* Anything that comes between headers and message body */
- info->force_handler = TRUE;
+ info->force_handler = TRUE;
em_format_parse_part_as (emf, part, part_id, info,
"x-evolution/message/post-headers", cancellable);
/* Begin parsing the message */
- info->force_handler = FALSE;
+ info->force_handler = FALSE;
em_format_parse_part (emf, part, part_id, info, cancellable);
}
static void
emf_parse_headers (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
gint len;
@@ -1062,23 +1058,23 @@ emf_parse_headers (EMFormat *emf,
static void
emf_parse_post_headers (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
/* Add attachment bar */
- info->force_handler = TRUE;
+ info->force_handler = TRUE;
em_format_parse_part_as (emf, part, part_id, info,
"x-evolution/message/attachment-bar", cancellable);
}
static void
emf_parse_source (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
gint len;
@@ -1101,20 +1097,20 @@ emf_parse_source (EMFormat *emf,
void
em_format_empty_writer (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
/* DO NOTHING */
}
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);
@@ -1122,10 +1118,10 @@ emf_write_error (EMFormat* emf,
static void
emf_write_text (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
CamelContentType *ct;
@@ -1142,10 +1138,10 @@ emf_write_text (EMFormat *emf,
static void
emf_write_source (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
GByteArray *ba;
gchar *data;
@@ -1186,7 +1182,6 @@ emf_is_inline (EMFormat *emf,
return (handle->flags & EM_FORMAT_HANDLER_INLINE) != 0;
}
-
/**************************************************************************/
static EMFormatHandler type_handlers[] = {
@@ -1239,9 +1234,9 @@ static const struct {
static void
em_format_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
EMFormat *emf = EM_FORMAT (object);
@@ -1269,9 +1264,9 @@ em_format_get_property (GObject *object,
static void
em_format_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EMFormat *emf = EM_FORMAT (object);
@@ -1309,9 +1304,9 @@ em_format_finalize (GObject *object)
}
if (emf->uri_base) {
- g_free (emf->uri_base);
- emf->uri_base = NULL;
- }
+ g_free (emf->uri_base);
+ emf->uri_base = NULL;
+ }
if (emf->message) {
g_object_unref (emf->message);
@@ -1335,7 +1330,6 @@ em_format_finalize (GObject *object)
emf->mail_part_list = NULL;
}
-
if (emf->priv->base_url) {
camel_url_free (emf->priv->base_url);
emf->priv->base_url = NULL;
@@ -1351,7 +1345,7 @@ em_format_finalize (GObject *object)
emf->priv->charset = NULL;
}
- em_format_clear_headers (emf);
+ em_format_clear_headers (emf);
/* Chain up to parent's finalize() method */
G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -1452,7 +1446,7 @@ em_format_init (EMFormat *emf)
emf->mail_part_table = g_hash_table_new_full (g_str_hash, g_str_equal,
NULL, (GDestroyNotify) mail_part_table_item_free);
/* No need to free the key, because it's owned and free'd by the PURI */
-
+
shell = e_shell_get_default ();
shell_settings = e_shell_get_shell_settings (shell);
@@ -1466,7 +1460,7 @@ em_format_init (EMFormat *emf)
em_format_default_headers (emf);
}
-EMFormat*
+EMFormat *
em_format_new (void)
{
EMFormat *emf = g_object_new (EM_TYPE_FORMAT, NULL);
@@ -1502,7 +1496,7 @@ em_format_get_type (void)
void
em_format_set_charset (EMFormat *emf,
- const gchar *charset)
+ const gchar *charset)
{
g_return_if_fail (EM_IS_FORMAT (emf));
@@ -1514,7 +1508,7 @@ em_format_set_charset (EMFormat *emf,
g_object_notify (G_OBJECT (emf), "charset");
}
-const gchar*
+const gchar *
em_format_get_charset (EMFormat *emf)
{
g_return_val_if_fail (EM_IS_FORMAT (emf), NULL);
@@ -1524,7 +1518,7 @@ em_format_get_charset (EMFormat *emf)
void
em_format_set_default_charset (EMFormat *emf,
- const gchar *charset)
+ const gchar *charset)
{
g_return_if_fail (EM_IS_FORMAT (emf));
@@ -1536,7 +1530,7 @@ em_format_set_default_charset (EMFormat *emf,
g_object_notify (G_OBJECT (emf), "default-charset");
}
-const gchar*
+const gchar *
em_format_get_default_charset (EMFormat *emf)
{
g_return_val_if_fail (EM_IS_FORMAT (emf), NULL);
@@ -1546,7 +1540,7 @@ em_format_get_default_charset (EMFormat *emf)
void
em_format_set_composer (EMFormat *emf,
- gboolean composer)
+ gboolean composer)
{
g_return_if_fail (EM_IS_FORMAT (emf));
@@ -1568,7 +1562,7 @@ em_format_get_composer (EMFormat *emf)
void
em_format_set_base_url (EMFormat *emf,
- CamelURL *url)
+ CamelURL *url)
{
g_return_if_fail (EM_IS_FORMAT (emf));
g_return_if_fail (url);
@@ -1583,7 +1577,7 @@ em_format_set_base_url (EMFormat *emf,
void
em_format_set_base_url_string (EMFormat *emf,
- const gchar *url_string)
+ const gchar *url_string)
{
g_return_if_fail (EM_IS_FORMAT (emf));
g_return_if_fail (url_string && *url_string);
@@ -1596,7 +1590,7 @@ em_format_set_base_url_string (EMFormat *emf,
g_object_notify (G_OBJECT (emf), "base-url");
}
-CamelURL*
+CamelURL *
em_format_get_base_url (EMFormat *emf)
{
g_return_val_if_fail (EM_IS_FORMAT (emf), NULL);
@@ -1654,7 +1648,7 @@ em_format_default_headers (EMFormat *emf)
void
em_format_add_header (EMFormat *emf,
const gchar *name,
- const gchar *value,
+ const gchar *value,
guint32 flags)
{
EMFormatHeader *h;
@@ -1669,7 +1663,7 @@ em_format_add_header (EMFormat *emf,
void
em_format_add_header_struct (EMFormat *emf,
- EMFormatHeader *header)
+ EMFormatHeader *header)
{
g_return_if_fail (EM_IS_FORMAT (emf));
g_return_if_fail (header && header->name);
@@ -1678,27 +1672,27 @@ em_format_add_header_struct (EMFormat *emf,
}
void
-em_format_remove_header (EMFormat* emf,
- const gchar* name,
- const gchar* value)
+em_format_remove_header (EMFormat * emf,
+ const gchar *name,
+ const gchar *value)
{
GList *iter = NULL;
g_return_if_fail (EM_IS_FORMAT (emf));
g_return_if_fail (name && *name);
- iter = g_queue_peek_head_link (&emf->header_list);
- while (iter) {
+ iter = g_queue_peek_head_link (&emf->header_list);
+ while (iter) {
EMFormatHeader *header = iter->data;
- if (!header->value || !*header->value) {
- GList *next = iter->next;
- if (g_strcmp0 (name, header->name) == 0)
- g_queue_delete_link (&emf->header_list, iter);
+ if (!header->value || !*header->value) {
+ GList *next = iter->next;
+ if (g_strcmp0 (name, header->name) == 0)
+ g_queue_delete_link (&emf->header_list, iter);
- iter = next;
- continue;
- }
+ iter = next;
+ continue;
+ }
if (value && *value) {
if ((g_strcmp0 (name, header->name) == 0) &&
@@ -1713,14 +1707,14 @@ em_format_remove_header (EMFormat* emf,
}
if (iter) {
- em_format_header_free (iter->data);
+ em_format_header_free (iter->data);
g_queue_delete_link (&emf->header_list, iter);
}
}
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);
@@ -1731,23 +1725,23 @@ void
em_format_add_puri (EMFormat *emf,
EMFormatPURI *puri)
{
- GList *item;
+ GList *item;
- g_return_if_fail (EM_IS_FORMAT (emf));
- g_return_if_fail (puri != NULL);
+ g_return_if_fail (EM_IS_FORMAT (emf));
+ g_return_if_fail (puri != NULL);
- emf->mail_part_list = g_list_append (emf->mail_part_list, puri);
- item = g_list_last (emf->mail_part_list);
+ emf->mail_part_list = g_list_append (emf->mail_part_list, puri);
+ item = g_list_last (emf->mail_part_list);
- g_hash_table_insert (emf->mail_part_table,
- puri->uri, item);
+ g_hash_table_insert (emf->mail_part_table,
+ puri->uri, item);
d(printf("Added PURI %s\n", puri->uri));
}
-EMFormatPURI*
+EMFormatPURI *
em_format_find_puri (EMFormat *emf,
- const gchar *id)
+ const gchar *id)
{
GList *list_iter;
@@ -1775,7 +1769,7 @@ em_format_find_puri (EMFormat *emf,
void
em_format_class_add_handler (EMFormatClass *emfc,
- EMFormatHandler *handler)
+ EMFormatHandler *handler)
{
EMFormatHandler *old_handler;
@@ -1805,7 +1799,7 @@ em_format_class_add_handler (EMFormatClass *emfc,
void
em_format_class_remove_handler (EMFormatClass *emfc,
- EMFormatHandler *handler)
+ EMFormatHandler *handler)
{
g_return_if_fail (EM_IS_FORMAT_CLASS (emfc));
g_return_if_fail (handler);
@@ -1818,22 +1812,22 @@ em_format_find_handler (EMFormat *emf,
const gchar *mime_type)
{
EMFormatClass *emfc;
- gchar *s;
- const EMFormatHandler *handler;
+ gchar *s;
+ const EMFormatHandler *handler;
g_return_val_if_fail (EM_IS_FORMAT (emf), NULL);
g_return_val_if_fail (mime_type && *mime_type, NULL);
emfc = (EMFormatClass *) G_OBJECT_GET_CLASS (emf);
- s = g_ascii_strdown (mime_type, -1);
+ s = g_ascii_strdown (mime_type, -1);
- handler = g_hash_table_lookup (
+ handler = g_hash_table_lookup (
emfc->type_handlers, s);
- g_free (s);
+ g_free (s);
- return handler;
+ return handler;
}
/**
@@ -1849,7 +1843,7 @@ em_format_find_handler (EMFormat *emf,
**/
const EMFormatHandler *
em_format_fallback_handler (EMFormat *emf,
- const gchar *mime_type)
+ const gchar *mime_type)
{
gchar *mime, *s;
@@ -1857,9 +1851,9 @@ em_format_fallback_handler (EMFormat *emf,
if (s == NULL)
mime = (gchar *) mime_type;
else {
- gsize len = (s-mime_type)+1;
+ gsize len = (s - mime_type) + 1;
- mime = g_alloca (len+2);
+ mime = g_alloca (len + 2);
strncpy (mime, mime_type, len);
strcpy(mime+len, "*");
}
@@ -1869,9 +1863,9 @@ em_format_fallback_handler (EMFormat *emf,
void
em_format_parse (EMFormat *emf,
- CamelMimeMessage *message,
- CamelFolder *folder,
- GCancellable *cancellable)
+ CamelMimeMessage *message,
+ CamelFolder *folder,
+ GCancellable *cancellable)
{
GString *part_id;
EMFormatPURI *puri;
@@ -1899,8 +1893,8 @@ em_format_parse (EMFormat *emf,
}
/* Before the actual parsing starts, let child classes prepare themselves. */
- if (EM_FORMAT_GET_CLASS (emf)->preparse)
- EM_FORMAT_GET_CLASS (emf)->preparse(emf);
+ if (EM_FORMAT_GET_CLASS (emf)->preparse)
+ EM_FORMAT_GET_CLASS (emf)->preparse (emf);
part_id = g_string_new (".message");
@@ -1910,7 +1904,7 @@ em_format_parse (EMFormat *emf,
puri->mime_type = g_strdup ("text/html");
em_format_add_puri (emf, puri);
- info.force_handler = TRUE;
+ info.force_handler = TRUE;
em_format_parse_part_as (emf, CAMEL_MIME_PART (emf->message), part_id, &info,
"x-evolution/message", cancellable);
@@ -1938,16 +1932,16 @@ emf_start_async_parser (GSimpleAsyncResult *result,
GObject *object,
GCancellable *cancellable)
{
- em_format_parse (EM_FORMAT (object), NULL, NULL, cancellable);
+ em_format_parse (EM_FORMAT (object), NULL, NULL, cancellable);
}
void
em_format_parse_async (EMFormat *emf,
- CamelMimeMessage *message,
- CamelFolder *folder,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+ CamelMimeMessage *message,
+ CamelFolder *folder,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *result;
@@ -1982,38 +1976,37 @@ em_format_parse_async (EMFormat *emf,
G_PRIORITY_DEFAULT, cancellable);
}
-
void
em_format_parse_part_as (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- const gchar *mime_type,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ const gchar *mime_type,
+ GCancellable *cancellable)
{
const EMFormatHandler *handler;
- const CamelContentDisposition *disposition;
+ const CamelContentDisposition *disposition;
EMFormatParserInfo ninfo = {
.handler = 0,
.validity_type = info ? info->validity_type : 0,
.validity = info ? info->validity : 0,
- .force_handler = 0
+ .force_handler = 0
};
/* Let everything that claims to be an attachment or inlined part to be parsed
* as an attachment. The parser will decide how to display it. */
- disposition = camel_mime_part_get_content_disposition (part);
- if (!info->force_handler && disposition &&
+ disposition = camel_mime_part_get_content_disposition (part);
+ if (!info->force_handler && disposition &&
(g_strcmp0 (disposition->disposition, "attachment") == 0)) {
- ninfo.is_attachment = TRUE;
+ ninfo.is_attachment = TRUE;
handler = em_format_find_handler (emf, "x-evolution/message/attachment");
- ninfo.handler = handler;
+ ninfo.handler = handler;
- if (handler && handler->parse_func)
- handler->parse_func (emf, part, part_id, &ninfo, cancellable);
+ if (handler && handler->parse_func)
+ handler->parse_func (emf, part, part_id, &ninfo, cancellable);
- return;
- }
+ return;
+ }
handler = em_format_find_handler (emf, mime_type);
if (handler && handler->parse_func) {
@@ -2024,17 +2017,17 @@ em_format_parse_part_as (EMFormat *emf,
ninfo.handler = handler;
/* When this fails, something is probably very wrong...*/
- if (handler && handler->parse_func)
- handler->parse_func (emf, part, part_id, &ninfo, cancellable);
+ if (handler && handler->parse_func)
+ handler->parse_func (emf, part, part_id, &ninfo, cancellable);
}
}
void
em_format_parse_part (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelContentType *ct;
gchar *mime_type;
@@ -2052,12 +2045,11 @@ em_format_parse_part (EMFormat *emf,
g_free (mime_type);
}
-
gboolean
em_format_is_inline (EMFormat *emf,
- const gchar *part_id,
- CamelMimePart *part,
- const EMFormatHandler *handler)
+ const gchar *part_id,
+ CamelMimePart *part,
+ const EMFormatHandler *handler)
{
EMFormatClass *klass;
@@ -2409,7 +2401,7 @@ em_format_snoop_type (CamelMimePart *part)
return res;
/* We used to load parts to check their type, we dont anymore,
- see bug #211778 for some discussion */
+ * see bug #211778 for some discussion */
}
/**
@@ -2422,32 +2414,32 @@ em_format_snoop_type (CamelMimePart *part)
* @param message_uid ID of message within the \p folder
* @param first_param_name Name of first query parameter followed by GType of it's value and value.
*/
-gchar*
+gchar *
em_format_build_mail_uri (CamelFolder *folder,
- const gchar *message_uid,
- const gchar *first_param_name,
- ...)
+ const gchar *message_uid,
+ const gchar *first_param_name,
+ ...)
{
CamelStore *store;
gchar *uri, *tmp;
va_list ap;
const gchar *name;
- const gchar *service_uid, *folder_name;
- char separator;
+ const gchar *service_uid, *folder_name;
+ gchar separator;
g_return_val_if_fail (message_uid && *message_uid, NULL);
- if (!folder) {
+ if (!folder) {
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
+ } 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";
- }
+ }
tmp = g_strdup_printf ("mail://%s/%s/%s",
service_uid,
@@ -2459,28 +2451,28 @@ em_format_build_mail_uri (CamelFolder *folder,
separator = '?';
while (name) {
gchar *tmp2;
- gint type = va_arg (ap, int);
+ gint type = va_arg (ap, gint);
switch (type) {
case G_TYPE_INT:
case G_TYPE_BOOLEAN: {
- gint val = va_arg (ap, int);
+ gint val = va_arg (ap, gint);
tmp2 = g_strdup_printf ("%s%c%s=%d", tmp,
- separator, name, val);
+ separator, name, val);
break;
}
case G_TYPE_FLOAT:
case G_TYPE_DOUBLE: {
gdouble val = va_arg (ap, double);
tmp2 = g_strdup_printf ("%s%c%s=%f", tmp,
- separator, name, val);
+ separator, name, val);
break;
}
case G_TYPE_STRING: {
- gchar *val = va_arg (ap, char *);
- gchar *escaped = soup_uri_encode (val, NULL);
+ gchar *val = va_arg (ap, gchar *);
+ gchar *escaped = soup_uri_encode (val, NULL);
tmp2 = g_strdup_printf ("%s%c%s=%s", tmp,
- separator, name, escaped);
- g_free (escaped);
+ separator, name, escaped);
+ g_free (escaped);
break;
}
default:
@@ -2494,7 +2486,7 @@ em_format_build_mail_uri (CamelFolder *folder,
if (separator == '?')
separator = '&';
- name = va_arg (ap, char *);
+ name = va_arg (ap, gchar *);
}
va_end (ap);
@@ -2521,15 +2513,12 @@ em_format_redraw (EMFormat *emf)
g_signal_emit (emf, signals[REDRAW_REQUESTED], 0);
}
-
-
-
/**************************************************************************/
-EMFormatPURI*
+EMFormatPURI *
em_format_puri_new (EMFormat *emf,
- gsize puri_size,
- CamelMimePart *part,
- const gchar *uri)
+ gsize puri_size,
+ CamelMimePart *part,
+ const gchar *uri)
{
EMFormatPURI *puri;
@@ -2572,17 +2561,16 @@ em_format_puri_free (EMFormatPURI *puri)
camel_cipher_validity_free (puri->validity_parent);
if (puri->free)
- puri->free(puri);
+ puri->free (puri);
g_free (puri);
}
-
void
em_format_puri_write (EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
g_return_if_fail (puri);
g_return_if_fail (CAMEL_IS_STREAM (stream));
@@ -2614,9 +2602,9 @@ em_format_puri_write (EMFormatPURI *puri,
}
}
-EMFormatHeader*
+EMFormatHeader *
em_format_header_new (const gchar *name,
- const gchar *value)
+ const gchar *value)
{
EMFormatHeader *header;
@@ -2631,7 +2619,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/em-format/em-format.h b/em-format/em-format.h
index 5b93294..712b41b 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -68,18 +68,18 @@ typedef struct _EMFormatWriterInfo EMFormatWriterInfo;
typedef struct _WebKitDOMElement WebKitDOMElement;
typedef void (*EMFormatParseFunc) (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable);
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable);
typedef void (*EMFormatWriteFunc) (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable);
-typedef GtkWidget* (*EMFormatWidgetFunc) (EMFormat *emf,
- EMFormatPURI *puri,
- GCancellable *cancellable);
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable);
+typedef GtkWidget * (*EMFormatWidgetFunc) (EMFormat *emf,
+ EMFormatPURI *puri,
+ GCancellable *cancellable);
typedef void (*EMailDisplayBindFunc) (WebKitDOMElement *root,
EMFormatPURI *puri);
@@ -137,7 +137,6 @@ struct _EMFormatHeader {
#define EM_FORMAT_HEADER_BOLD (1<<0)
#define EM_FORMAT_HEADER_LAST (1<<4) /* reserve 4 slots */
-
struct _EMFormatPURI {
CamelMimePart *part;
@@ -189,7 +188,7 @@ struct _EMFormatClass {
GHashTable *type_handlers;
- gboolean (*is_inline) (EMFormat *emf,
+ gboolean (*is_inline) (EMFormat *emf,
const gchar *part_id,
CamelMimePart *part,
const EMFormatHandler *handler);
@@ -207,27 +206,27 @@ struct _EMFormatClass {
};
-EMFormat* em_format_new (void);
+EMFormat * em_format_new (void);
-GType em_format_get_type (void);
+GType em_format_get_type (void);
void em_format_set_charset (EMFormat *emf,
const gchar *charset);
-const gchar* em_format_get_charset (EMFormat *emf);
+const gchar * em_format_get_charset (EMFormat *emf);
void em_format_set_default_charset (EMFormat *emf,
- const gchar *charset);
-const gchar* em_format_get_default_charset (EMFormat *emf);
+ const gchar *charset);
+const gchar * em_format_get_default_charset (EMFormat *emf);
-void em_format_set_composer (EMFormat *emf,
- gboolean composer);
+void em_format_set_composer (EMFormat *emf,
+ gboolean composer);
gboolean em_format_get_composer (EMFormat *emf);
void em_format_set_base_url (EMFormat *emf,
- CamelURL *url);
+ CamelURL *url);
void em_format_set_base_url_string (EMFormat *emf,
const gchar *url_string);
-CamelURL* em_format_get_base_url (EMFormat *emf);
+CamelURL * em_format_get_base_url (EMFormat *emf);
void em_format_clear_headers (EMFormat *emf);
@@ -239,7 +238,7 @@ void em_format_add_header (EMFormat *emf,
guint32 flags);
void em_format_add_header_struct (EMFormat *emf,
EMFormatHeader *header);
-void em_format_remove_header (EMFormat *emf,
+void em_format_remove_header (EMFormat *emf,
const gchar *name,
const gchar *value);
void em_format_remove_header_struct (EMFormat *emf,
@@ -247,18 +246,18 @@ void em_format_remove_header_struct (EMFormat *emf,
void em_format_add_puri (EMFormat *emf,
EMFormatPURI *puri);
-EMFormatPURI* em_format_find_puri (EMFormat *emf,
+EMFormatPURI * em_format_find_puri (EMFormat *emf,
const gchar *id);
void em_format_class_add_handler (EMFormatClass *emfc,
EMFormatHandler *handler);
-void em_format_class_remove_handler (EMFormatClass *emfc,
+void em_format_class_remove_handler (EMFormatClass *emfc,
EMFormatHandler *handler);
-const EMFormatHandler* em_format_find_handler (EMFormat *emf,
+const EMFormatHandler * em_format_find_handler (EMFormat *emf,
+ const gchar *mime_type);
+const EMFormatHandler * em_format_fallback_handler (EMFormat *emf,
const gchar *mime_type);
-const EMFormatHandler* em_format_fallback_handler (EMFormat *emf,
- const gchar *mime_type);
void em_format_parse (EMFormat *emf,
CamelMimeMessage *message,
@@ -277,12 +276,12 @@ void em_format_parse_async (EMFormat *emf,
GAsyncReadyCallback callback,
gpointer user_data);
-void em_format_parse_part (EMFormat *emf,
+void em_format_parse_part (EMFormat *emf,
CamelMimePart *part,
GString *part_id,
EMFormatParserInfo *info,
GCancellable *cancellable);
-void em_format_parse_part_as (EMFormat *emf,
+void em_format_parse_part_as (EMFormat *emf,
CamelMimePart *part,
GString *part_id,
EMFormatParserInfo *info,
@@ -293,7 +292,7 @@ gboolean em_format_is_inline (EMFormat *emf,
CamelMimePart *part,
const EMFormatHandler *handler);
-gchar* em_format_get_error_id (EMFormat *emf);
+gchar * em_format_get_error_id (EMFormat *emf);
void em_format_format_error (EMFormat *emf,
const gchar *format,
@@ -302,11 +301,11 @@ void em_format_format_text (EMFormat *emf,
CamelStream *stream,
CamelDataWrapper *dw,
GCancellable *cancellable);
-gchar* em_format_describe_part (CamelMimePart *part,
+gchar * em_format_describe_part (CamelMimePart *part,
const gchar *mime_type);
-gint em_format_is_attachment (EMFormat *emf,
- CamelMimePart *part);
-const gchar* em_format_snoop_type (CamelMimePart *part);
+gint em_format_is_attachment (EMFormat *emf,
+ CamelMimePart *part);
+const gchar * em_format_snoop_type (CamelMimePart *part);
gchar * em_format_build_mail_uri (CamelFolder *folder,
const gchar *message_uid,
@@ -315,7 +314,7 @@ gchar * em_format_build_mail_uri (CamelFolder *folder,
/* EMFormatParseFunc that does nothing. Use it to disable
* parsing of a specific mime type parts */
-void em_format_empty_parser (EMFormat *emf,
+void em_format_empty_parser (EMFormat *emf,
CamelMimePart *part,
GString *part_id,
EMFormatParserInfo *info,
@@ -323,7 +322,7 @@ void em_format_empty_parser (EMFormat *emf,
/* EMFormatWriteFunc that does nothing. Use it to disable
* writing of a specific mime type parts */
-void em_format_empty_writer (EMFormat *emf,
+void em_format_empty_writer (EMFormat *emf,
EMFormatPURI *puri,
CamelStream *stream,
EMFormatWriterInfo *info,
@@ -331,19 +330,18 @@ void em_format_empty_writer (EMFormat *emf,
void em_format_redraw (EMFormat *emf);
-
-EMFormatPURI* em_format_puri_new (EMFormat *emf,
+EMFormatPURI * em_format_puri_new (EMFormat *emf,
gsize puri_size,
CamelMimePart *part,
const gchar *uri);
-void em_format_puri_free (EMFormatPURI *puri);
+void em_format_puri_free (EMFormatPURI *puri);
-void em_format_puri_write (EMFormatPURI *puri,
+void em_format_puri_write (EMFormatPURI *puri,
CamelStream *stream,
EMFormatWriterInfo *info,
GCancellable *cancellable);
-EMFormatHeader* em_format_header_new (const gchar *name,
+EMFormatHeader * em_format_header_new (const gchar *name,
const gchar *value);
void em_format_header_free (EMFormatHeader *header);
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 2a48fbc..7572c66 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -120,7 +120,7 @@ mail_attachment_bar_update_status (EMailAttachmentBar *bar)
static void
mail_attachment_bar_set_store (EMailAttachmentBar *bar,
- EAttachmentStore *store)
+ EAttachmentStore *store)
{
g_return_if_fail (E_IS_ATTACHMENT_STORE (store));
@@ -756,7 +756,7 @@ e_mail_attachment_bar_set_expanded (EMailAttachmentBar *bar,
g_object_notify (G_OBJECT (bar), "expanded");
}
-EAttachmentStore*
+EAttachmentStore *
e_mail_attachment_bar_get_store (EMailAttachmentBar *bar)
{
g_return_val_if_fail (E_IS_MAIL_ATTACHMENT_BAR (bar), NULL);
diff --git a/mail/e-mail-attachment-bar.h b/mail/e-mail-attachment-bar.h
index 161c0d7..b83d973 100644
--- a/mail/e-mail-attachment-bar.h
+++ b/mail/e-mail-attachment-bar.h
@@ -71,7 +71,7 @@ gboolean e_mail_attachment_bar_get_expanded
void e_mail_attachment_bar_set_expanded
(EMailAttachmentBar *bar,
gboolean expanded);
-EAttachmentStore*
+EAttachmentStore *
e_mail_attachment_bar_get_store (EMailAttachmentBar *bar);
G_END_DECLS
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 8619006..806980d 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -540,7 +540,7 @@ mail_browser_constructed (GObject *object)
EMailReader *reader;
EMailBackend *backend;
EMailSession *session;
- EMailDisplay *display;
+ EMailDisplay *display;
EShellBackend *shell_backend;
EShell *shell;
EFocusTracker *focus_tracker;
@@ -589,8 +589,7 @@ mail_browser_constructed (GObject *object)
browser->priv->message_list, "message-list-built",
G_CALLBACK (mail_browser_message_list_built_cb), object);
-
- display = g_object_new (E_TYPE_MAIL_DISPLAY,
+ display = g_object_new (E_TYPE_MAIL_DISPLAY,
"mode", E_MAIL_BROWSER (object)->priv->mode, NULL);
g_signal_connect_swapped (
@@ -769,7 +768,7 @@ mail_browser_get_mail_display (EMailReader *reader)
priv = E_MAIL_BROWSER_GET_PRIVATE (E_MAIL_BROWSER (reader));
return E_MAIL_DISPLAY (e_preview_pane_get_web_view (
- E_PREVIEW_PANE (priv->preview_pane)));
+ E_PREVIEW_PANE (priv->preview_pane)));
}
static GtkWidget *
@@ -950,9 +949,9 @@ e_mail_browser_init (EMailBrowser *browser)
GtkWidget *
e_mail_browser_new (EMailBackend *backend,
- CamelFolder *folder,
- const gchar *msg_uid,
- EMFormatWriteMode mode)
+ CamelFolder *folder,
+ const gchar *msg_uid,
+ EMFormatWriteMode mode)
{
GtkWidget *widget;
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index e2edd2e..07f45ad 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -40,7 +40,6 @@
#include "mail/e-mail-attachment-bar.h"
#include "widgets/misc/e-attachment-button.h"
-
#include <camel/camel.h>
#include <libsoup/soup.h>
@@ -146,7 +145,6 @@ static GtkActionEntry mailto_entries[] = {
NULL }
};
-
static GtkActionEntry image_entries[] = {
{ "image-save",
@@ -158,33 +156,32 @@ static GtkActionEntry image_entries[] = {
};
-
static void
mail_display_webview_update_actions (EWebView *web_view,
gpointer user_data)
{
- const gchar *image_src;
- gboolean visible;
- GtkAction *action;
+ const gchar *image_src;
+ gboolean visible;
+ GtkAction *action;
- g_return_if_fail (web_view != NULL);
+ g_return_if_fail (web_view != NULL);
- image_src = e_web_view_get_cursor_image_src (web_view);
+ image_src = e_web_view_get_cursor_image_src (web_view);
visible = image_src && g_str_has_prefix (image_src, "cid:");
- if (!visible && image_src) {
- CamelStream *image_stream;
+ if (!visible && image_src) {
+ CamelStream *image_stream;
image_stream = camel_data_cache_get (emd_global_http_cache, "http", image_src, NULL);
- visible = image_stream != NULL;
+ visible = image_stream != NULL;
- if (image_stream)
- g_object_unref (image_stream);
- }
+ if (image_stream)
+ g_object_unref (image_stream);
+ }
action = e_web_view_get_action (web_view, "image-save");
- if (action)
- gtk_action_set_visible (action, visible);
+ if (action)
+ gtk_action_set_visible (action, visible);
}
static void
@@ -192,9 +189,9 @@ formatter_image_loading_policy_changed_cb (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
- EMailDisplay *display = user_data;
+ EMailDisplay *display = user_data;
- e_mail_display_load_images (display);
+ e_mail_display_load_images (display);
}
static void
@@ -355,7 +352,7 @@ mail_display_process_mailto (EWebView *web_view,
CamelFolder *folder = NULL;
EShell *shell;
- format = (EMFormat *) E_MAIL_DISPLAY (web_view)->priv->formatter;
+ format = (EMFormat *) E_MAIL_DISPLAY (web_view)->priv->formatter;
if (format != NULL && format->folder != NULL)
folder = format->folder;
@@ -372,18 +369,18 @@ mail_display_process_mailto (EWebView *web_view,
static gboolean
mail_display_link_clicked (WebKitWebView *web_view,
- WebKitWebFrame *frame,
- WebKitNetworkRequest *request,
- WebKitWebNavigationAction *navigation_action,
- WebKitWebPolicyDecision *policy_decision,
- gpointer user_data)
+ WebKitWebFrame *frame,
+ WebKitNetworkRequest *request,
+ WebKitWebNavigationAction *navigation_action,
+ WebKitWebPolicyDecision *policy_decision,
+ gpointer user_data)
{
- EMailDisplay *display;
+ EMailDisplay *display;
const gchar *uri = webkit_network_request_get_uri (request);
display = E_MAIL_DISPLAY (web_view);
if (display->priv->formatter == NULL)
- return FALSE;
+ return FALSE;
if (mail_display_process_mailto (E_WEB_VIEW (web_view), uri, NULL)) {
/* do nothing, function handled the "mailto:"; uri already */
@@ -408,7 +405,7 @@ mail_display_link_clicked (WebKitWebView *web_view,
static void
webkit_request_load_from_file (WebKitNetworkRequest *request,
- const gchar *path)
+ const gchar *path)
{
gchar *data = NULL;
gsize length = 0;
@@ -420,7 +417,7 @@ webkit_request_load_from_file (WebKitNetworkRequest *request,
if (!status)
return;
- b64 = g_base64_encode ((guchar*) data, length);
+ b64 = g_base64_encode ((guchar *) data, length);
ct = g_content_type_guess (path, NULL, 0, NULL);
new_uri = g_strdup_printf ("data:%s;base64,%s", ct, b64);
@@ -434,20 +431,20 @@ webkit_request_load_from_file (WebKitNetworkRequest *request,
static void
mail_display_resource_requested (WebKitWebView *web_view,
- WebKitWebFrame *frame,
- WebKitWebResource *resource,
- WebKitNetworkRequest *request,
- WebKitNetworkResponse *response,
- gpointer user_data)
+ WebKitWebFrame *frame,
+ WebKitWebResource *resource,
+ WebKitNetworkRequest *request,
+ WebKitNetworkResponse *response,
+ gpointer user_data)
{
EMailDisplay *display = E_MAIL_DISPLAY (web_view);
EMFormat *formatter = EM_FORMAT (display->priv->formatter);
const gchar *uri = webkit_network_request_get_uri (request);
- if (!formatter) {
+ if (!formatter) {
webkit_network_request_set_uri (request, "invalid://uri");
- return;
- }
+ return;
+ }
/* Redirect cid:part_id to mail://mail_id/cid:part_id */
if (g_str_has_prefix (uri, "cid:")) {
@@ -458,12 +455,12 @@ mail_display_resource_requested (WebKitWebView *web_view,
"part_id", G_TYPE_STRING, uri,
"mode", G_TYPE_INT, EM_FORMAT_WRITE_MODE_RAW, NULL);
- webkit_network_request_set_uri (request, new_uri);
+ webkit_network_request_set_uri (request, new_uri);
- g_free (new_uri);
+ g_free (new_uri);
/* WebKit won't allow to load a local file when displaing "remote" mail://,
- protocol, so we need to handle this manually */
+ protocol, so we need to handle this manually */
} else if (g_str_has_prefix (uri, "file:")) {
gchar *path;
@@ -479,124 +476,124 @@ mail_display_resource_requested (WebKitWebView *web_view,
* further details about this. */
} else if (g_str_has_prefix (uri, "http:") || g_str_has_prefix (uri, "https")) {
- gchar *new_uri, *mail_uri, *enc;
- SoupURI *soup_uri;
- GHashTable *query;
- gchar *uri_md5;
- CamelStream *stream;
+ gchar *new_uri, *mail_uri, *enc;
+ SoupURI *soup_uri;
+ GHashTable *query;
+ gchar *uri_md5;
+ CamelStream *stream;
/* Open Evolution's cache */
- uri_md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
- stream = camel_data_cache_get (
+ 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);
- g_free (uri_md5);
+ g_free (uri_md5);
/* If the URI is not cached and we are not allowed to load it
* then redirect to invalid URI, so that webkit would display
* a native placeholder for it. */
- if (!stream && !display->priv->force_image_load &&
- !em_format_html_can_load_images (display->priv->formatter)) {
+ if (!stream && !display->priv->force_image_load &&
+ !em_format_html_can_load_images (display->priv->formatter)) {
webkit_network_request_set_uri (request, "invalid://protocol");
- return;
- }
+ return;
+ }
new_uri = g_strconcat ("evo-", uri, NULL);
- mail_uri = em_format_build_mail_uri (formatter->folder,
- formatter->message_uid, NULL, NULL);
-
- soup_uri = soup_uri_new (new_uri);
- if (soup_uri->query) {
- query = soup_form_decode (soup_uri->query);
- } else {
- query = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, g_free);
- }
- enc = soup_uri_encode (mail_uri, NULL);
+ mail_uri = em_format_build_mail_uri (formatter->folder,
+ formatter->message_uid, NULL, NULL);
+
+ soup_uri = soup_uri_new (new_uri);
+ if (soup_uri->query) {
+ query = soup_form_decode (soup_uri->query);
+ } else {
+ query = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_free);
+ }
+ enc = soup_uri_encode (mail_uri, NULL);
g_hash_table_insert (query, g_strdup ("__evo-mail"), enc);
- if (display->priv->force_image_load) {
- g_hash_table_insert (query,
+ if (display->priv->force_image_load) {
+ g_hash_table_insert (query,
g_strdup ("__evo-load-images"),
g_strdup ("true"));
- }
+ }
- g_free (mail_uri);
+ g_free (mail_uri);
- soup_uri_set_query_from_form (soup_uri, query);
- g_free (new_uri);
+ soup_uri_set_query_from_form (soup_uri, query);
+ g_free (new_uri);
- new_uri = soup_uri_to_string (soup_uri, FALSE);
- webkit_network_request_set_uri (request, new_uri);
+ new_uri = soup_uri_to_string (soup_uri, FALSE);
+ webkit_network_request_set_uri (request, new_uri);
- g_free (new_uri);
- soup_uri_free (soup_uri);
- g_hash_table_unref (query);
- }
+ g_free (new_uri);
+ soup_uri_free (soup_uri);
+ g_hash_table_unref (query);
+ }
}
-static WebKitDOMElement*
+static WebKitDOMElement *
find_element_by_id (WebKitDOMDocument *document,
const gchar *id)
{
- WebKitDOMNodeList *frames;
- WebKitDOMElement *element;
- gulong i, length;
+ WebKitDOMNodeList *frames;
+ WebKitDOMElement *element;
+ gulong i, length;
/* Try to look up the element in this DOM document */
- element = webkit_dom_document_get_element_by_id (document, id);
- if (element)
- return element;
+ element = webkit_dom_document_get_element_by_id (document, id);
+ if (element)
+ return element;
/* If the element is not here then recursively scan all frames */
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++){
+ length = webkit_dom_node_list_get_length (frames);
+ for (i = 0; i < length; i++) {
- WebKitDOMHTMLIFrameElement *iframe =
- WEBKIT_DOM_HTML_IFRAME_ELEMENT (
- webkit_dom_node_list_item (frames, i));
+ WebKitDOMHTMLIFrameElement *iframe =
+ WEBKIT_DOM_HTML_IFRAME_ELEMENT (
+ webkit_dom_node_list_item (frames, i));
- WebKitDOMDocument *frame_doc =
- webkit_dom_html_iframe_element_get_content_document (iframe);
+ WebKitDOMDocument *frame_doc =
+ webkit_dom_html_iframe_element_get_content_document (iframe);
- WebKitDOMElement *el =
- find_element_by_id (frame_doc, id);
+ WebKitDOMElement *el =
+ find_element_by_id (frame_doc, id);
- if (el)
- return el;
- }
+ if (el)
+ return el;
+ }
- return NULL;
+ return NULL;
}
static void
mail_display_plugin_widget_resize (GObject *object,
gpointer dummy,
- EMailDisplay *display)
+ EMailDisplay *display)
{
- GtkWidget *widget;
- WebKitDOMElement *parent_element;
- gchar *dim;
+ GtkWidget *widget;
+ WebKitDOMElement *parent_element;
+ gchar *dim;
gint height;
- widget = GTK_WIDGET (object);
+ widget = GTK_WIDGET (object);
gtk_widget_get_preferred_height (widget, &height, NULL);
parent_element = g_object_get_data (object, "parent_element");
- if (!parent_element || !WEBKIT_DOM_IS_ELEMENT (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")));
- return;
- }
+ return;
+ }
/* Int -> Str */
dim = g_strdup_printf ("%d", height);
/* Set height of the containment <object> to match height of the
* GtkWidget it contains */
- webkit_dom_html_object_element_set_height (
- WEBKIT_DOM_HTML_OBJECT_ELEMENT (parent_element), dim);
- g_free (dim);
+ webkit_dom_html_object_element_set_height (
+ WEBKIT_DOM_HTML_OBJECT_ELEMENT (parent_element), dim);
+ g_free (dim);
}
static void
@@ -605,28 +602,28 @@ mail_display_plugin_widget_realize_cb (GtkWidget *widget,
{
/* Initial resize of the <object> element when the widget
* is displayed for the first time. */
- mail_display_plugin_widget_resize (G_OBJECT (widget), NULL, user_data);
+ mail_display_plugin_widget_resize (G_OBJECT (widget), NULL, user_data);
}
static void
plugin_widget_set_parent_element (GtkWidget *widget,
EMailDisplay *display)
{
- const gchar *uri;
- WebKitDOMDocument *document;
- WebKitDOMElement *element;
+ const gchar *uri;
+ WebKitDOMDocument *document;
+ WebKitDOMElement *element;
uri = g_object_get_data (G_OBJECT (widget), "uri");
- if (!uri || !*uri)
- return;
+ if (!uri || !*uri)
+ return;
- document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (display));
- element = find_element_by_id (document, uri);
+ document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (display));
+ element = find_element_by_id (document, uri);
- if (!element || !WEBKIT_DOM_IS_ELEMENT (element)) {
+ if (!element || !WEBKIT_DOM_IS_ELEMENT (element)) {
g_warning ("Failed to find parent <object> for '%s' - no ID set?", uri);
- return;
- }
+ return;
+ }
/* Assign the WebKitDOMElement to "parent_element" data of the GtkWidget
* and the GtkWidget to "widget" data of the DOM Element */
@@ -639,26 +636,26 @@ attachment_button_expanded (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
- EAttachmentButton *button = E_ATTACHMENT_BUTTON (object);
- WebKitDOMElement *attachment = user_data;
- WebKitDOMCSSStyleDeclaration *css;
- gboolean expanded;
+ EAttachmentButton *button = E_ATTACHMENT_BUTTON (object);
+ WebKitDOMElement *attachment = user_data;
+ WebKitDOMCSSStyleDeclaration *css;
+ gboolean expanded;
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));
+ expanded = e_attachment_button_get_expanded (button) &&
+ gtk_widget_get_visible (GTK_WIDGET (button));
- if (!WEBKIT_DOM_IS_ELEMENT (attachment)) {
+ 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")));
- return;
- }
+ 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 = webkit_dom_element_get_style (attachment);
+ webkit_dom_css_style_declaration_set_property (
css, "display", expanded ? "block" : "none", "", NULL);
}
@@ -667,16 +664,16 @@ constraint_widget_visibility (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
- GtkWidget *widget = GTK_WIDGET (object);
- EAttachmentButton *button = user_data;
+ GtkWidget *widget = GTK_WIDGET (object);
+ EAttachmentButton *button = user_data;
- gboolean can_show = e_attachment_button_get_expanded (button);
- gboolean is_visible = gtk_widget_get_visible (widget);
+ gboolean can_show = e_attachment_button_get_expanded (button);
+ gboolean is_visible = gtk_widget_get_visible (widget);
- if (is_visible && !can_show)
- gtk_widget_hide (widget);
- else if (!is_visible && can_show)
- gtk_widget_show (widget);
+ if (is_visible && !can_show)
+ gtk_widget_hide (widget);
+ else if (!is_visible && can_show)
+ gtk_widget_show (widget);
/* Otherwise it's OK */
}
@@ -685,47 +682,47 @@ static void
bind_iframe_content_visibility (EAttachmentButton *button,
WebKitDOMElement *iframe)
{
- WebKitDOMDocument *document;
- WebKitDOMNodeList *nodes;
- gulong i, length;
+ WebKitDOMDocument *document;
+ WebKitDOMNodeList *nodes;
+ gulong i, length;
- if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (iframe))
- return;
+ if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (iframe))
+ return;
- document = webkit_dom_html_iframe_element_get_content_document(
- WEBKIT_DOM_HTML_IFRAME_ELEMENT (iframe));
+ 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");
- length = webkit_dom_node_list_get_length (nodes);
+ length = webkit_dom_node_list_get_length (nodes);
d(printf("Found %ld objects within iframe %s\n", length,
- webkit_dom_html_iframe_element_get_name (
- WEBKIT_DOM_HTML_IFRAME_ELEMENT (iframe))));
+ webkit_dom_html_iframe_element_get_name (
+ WEBKIT_DOM_HTML_IFRAME_ELEMENT (iframe))));
/* Iterate through all <object>s and bind visibility of their widget
* with expanded-state of related attachment button */
- for (i = 0; i < length; i++) {
+ for (i = 0; i < length; i++) {
- WebKitDOMNode *node = webkit_dom_node_list_item (nodes, i);
- GtkWidget *widget;
+ WebKitDOMNode *node = webkit_dom_node_list_item (nodes, i);
+ GtkWidget *widget;
widget = g_object_get_data (G_OBJECT (node), "widget");
- if (!widget)
- continue;
+ 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));
- g_object_bind_property (
+ g_object_bind_property (
button, "expanded",
widget, "visible",
- G_BINDING_SYNC_CREATE);
+ 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_CALLBACK (constraint_widget_visibility), button);
- }
+ G_CALLBACK (constraint_widget_visibility), button);
+ }
}
static void
@@ -733,208 +730,208 @@ bind_attachment_iframe_visibility (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
- WebKitWebFrame *webframe;
- const gchar *frame_name;
- gchar *button_uri;
- WebKitDOMDocument *document;
- WebKitDOMElement *attachment;
- WebKitDOMElement *button_element;
- WebKitDOMNodeList *nodes;
- gulong i, length;
- GtkWidget *button;
+ WebKitWebFrame *webframe;
+ const gchar *frame_name;
+ gchar *button_uri;
+ WebKitDOMDocument *document;
+ WebKitDOMElement *attachment;
+ WebKitDOMElement *button_element;
+ WebKitDOMNodeList *nodes;
+ gulong i, length;
+ GtkWidget *button;
/* Whenever an <iframe> is loaded, bind visibility of all GtkWidgets
* the document within the <iframe> contains with "expanded" property
* of the EAttachmentButton */
- webframe = WEBKIT_WEB_FRAME (object);
- if (webkit_web_frame_get_load_status (webframe) != WEBKIT_LOAD_FINISHED)
- return;
+ webframe = WEBKIT_WEB_FRAME (object);
+ if (webkit_web_frame_get_load_status (webframe) != WEBKIT_LOAD_FINISHED)
+ return;
- frame_name = webkit_web_frame_get_name (webframe);
+ frame_name = webkit_web_frame_get_name (webframe);
d(printf("Rebinding visibility of frame %s because it's URL changed\n",
- frame_name));
+ frame_name));
/* Get DOMDocument of the main document */
- document = webkit_web_view_get_dom_document (
- webkit_web_frame_get_web_view (webframe));
- if (!document)
- return;
+ document = webkit_web_view_get_dom_document (
+ webkit_web_frame_get_web_view (webframe));
+ if (!document)
+ return;
/* Find the <DIV> containing the <iframe> and related EAttachmentButton
* within the DOM */
- attachment = find_element_by_id (document, frame_name);
- if (!attachment)
- return;
+ attachment = find_element_by_id (document, frame_name);
+ if (!attachment)
+ return;
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_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");
/* Get <iframe> representing the attachment content */
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++) {
+ length = webkit_dom_node_list_get_length (nodes);
+ for (i = 0; i < length; i++) {
- WebKitDOMNode *node =
- webkit_dom_node_list_item (nodes, i);
+ WebKitDOMNode *node =
+ webkit_dom_node_list_item (nodes, i);
- if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (node))
- continue;
+ if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (node))
+ continue;
/* Bind visibility of all GtkWidget within the
* iframe with "expanded" property of the button */
- bind_iframe_content_visibility(
- E_ATTACHMENT_BUTTON (button),
- WEBKIT_DOM_ELEMENT (node));
- }
+ bind_iframe_content_visibility (
+ E_ATTACHMENT_BUTTON (button),
+ WEBKIT_DOM_ELEMENT (node));
+ }
}
-static GtkWidget*
+static GtkWidget *
mail_display_plugin_widget_requested (WebKitWebView *web_view,
gchar *mime_type,
gchar *uri,
GHashTable *param,
gpointer user_data)
{
- EMFormat *emf;
- EMailDisplay *display;
- EMFormatPURI *puri;
- GtkWidget *widget;
- gchar *puri_uri;
+ EMFormat *emf;
+ EMailDisplay *display;
+ EMFormatPURI *puri;
+ GtkWidget *widget;
+ gchar *puri_uri;
puri_uri = g_hash_table_lookup (param, "data");
if (!puri_uri || !g_str_has_prefix (uri, "mail://"))
- return NULL;
+ return NULL;
- display = E_MAIL_DISPLAY (web_view);
- emf = (EMFormat *) display->priv->formatter;
+ display = E_MAIL_DISPLAY (web_view);
+ emf = (EMFormat *) display->priv->formatter;
puri = em_format_find_puri (emf, puri_uri);
- if (!puri) {
- return NULL;
+ if (!puri) {
+ return NULL;
}
- if (puri->widget_func)
+ if (puri->widget_func)
widget = puri->widget_func (emf, puri, NULL);
else
widget = NULL;
if (!widget)
- return NULL;
+ return NULL;
- if (E_IS_ATTACHMENT_BUTTON (widget)) {
+ 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",
- button_uri, (GDestroyNotify) g_free);
- } else {
+ button_uri, (GDestroyNotify) g_free);
+ } else {
g_object_set_data_full (G_OBJECT (widget), "uri",
- g_strdup (puri_uri), (GDestroyNotify) g_free);
- }
+ g_strdup (puri_uri), (GDestroyNotify) g_free);
+ }
/* Set widget's <object> container as GObject data "parent_element" */
- plugin_widget_set_parent_element (widget, display);
+ plugin_widget_set_parent_element (widget, display);
/* Resizing a GtkWidget requires changing size of parent
* <object> HTML element in DOM. */
g_signal_connect (widget, "realize",
- G_CALLBACK (mail_display_plugin_widget_realize_cb), display);
+ G_CALLBACK (mail_display_plugin_widget_realize_cb), display);
g_signal_connect (widget, "size-allocate",
- G_CALLBACK (mail_display_plugin_widget_resize), display);
+ G_CALLBACK (mail_display_plugin_widget_resize), display);
/* Embed the attachment bar into the GtkBox before we do anything
* further with the widget. */
- if (E_IS_MAIL_ATTACHMENT_BAR (widget)) {
+ if (E_IS_MAIL_ATTACHMENT_BAR (widget)) {
/* When EMailAttachmentBar is expanded/collapsed it does not
* emit size-allocate signal despite it changes it's height. */
- GtkWidget *box = NULL;
+ GtkWidget *box = NULL;
/* Only when packed in box, EMailAttachmentBar reports correct
* height */
- box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (box), widget, FALSE, FALSE, 0);
+ 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_CALLBACK (mail_display_plugin_widget_resize), display);
+ G_CALLBACK (mail_display_plugin_widget_resize), display);
g_signal_connect (widget, "notify::active-view",
- G_CALLBACK (mail_display_plugin_widget_resize), display);
+ G_CALLBACK (mail_display_plugin_widget_resize), display);
/* Show the EAttachmentBar but not the containing layout */
- gtk_widget_show (widget);
+ gtk_widget_show (widget);
- widget = box;
+ widget = box;
- } else if (E_IS_ATTACHMENT_BUTTON (widget)) {
+ } else if (E_IS_ATTACHMENT_BUTTON (widget)) {
/* Bind visibility of DOM element containing related
* attachment with 'expanded' property of this
* attachment button. */
- WebKitDOMElement *attachment;
- WebKitDOMDocument *document;
-
- document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (display));
- attachment = find_element_by_id (document, puri_uri);
- if (!attachment) {
- e_attachment_button_set_expandable (
- E_ATTACHMENT_BUTTON (widget), FALSE);
- } else {
- const CamelContentDisposition *disposition;
- WebKitDOMNodeList *nodes;
- gulong i, length;
+ WebKitDOMElement *attachment;
+ WebKitDOMDocument *document;
+
+ document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (display));
+ attachment = find_element_by_id (document, puri_uri);
+ if (!attachment) {
+ e_attachment_button_set_expandable (
+ E_ATTACHMENT_BUTTON (widget), FALSE);
+ } else {
+ const CamelContentDisposition *disposition;
+ WebKitDOMNodeList *nodes;
+ gulong i, length;
/* Show/hide the attachment when the EAttachmentButton
* is expanded/collapsed or shown/hidden */
g_signal_connect_data (widget, "notify::expanded",
- G_CALLBACK (attachment_button_expanded),
- g_object_ref (attachment), (GClosureNotify) g_object_unref, 0);
+ G_CALLBACK (attachment_button_expanded),
+ g_object_ref (attachment), (GClosureNotify) g_object_unref, 0);
g_signal_connect_data (widget, "notify::visible",
- G_CALLBACK (attachment_button_expanded),
- g_object_ref (attachment), (GClosureNotify) g_object_unref, 0);
+ G_CALLBACK (attachment_button_expanded),
+ g_object_ref (attachment), (GClosureNotify) g_object_unref, 0);
/* Initial synchronization */
- attachment_button_expanded (G_OBJECT (widget),
- NULL, attachment);
+ attachment_button_expanded (G_OBJECT (widget),
+ NULL, attachment);
/* 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 (
+ 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++) {
+ length = webkit_dom_node_list_get_length (nodes);
+ for (i = 0; i < length; i++) {
- WebKitDOMNode *node =
- webkit_dom_node_list_item (nodes, i);
+ WebKitDOMNode *node =
+ webkit_dom_node_list_item (nodes, i);
- if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (node))
- continue;
+ if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (node))
+ continue;
- bind_iframe_content_visibility (
- E_ATTACHMENT_BUTTON (widget),
- WEBKIT_DOM_ELEMENT (node));
- }
+ bind_iframe_content_visibility (
+ E_ATTACHMENT_BUTTON (widget),
+ WEBKIT_DOM_ELEMENT (node));
+ }
/* Expand inlined attachments */
- disposition =
- camel_mime_part_get_content_disposition (puri->part);
- if (disposition &&
- g_ascii_strncasecmp (
+ disposition =
+ camel_mime_part_get_content_disposition (puri->part);
+ if (disposition &&
+ g_ascii_strncasecmp (
disposition->disposition, "inline", 6) == 0) {
- e_attachment_button_set_expanded (
- E_ATTACHMENT_BUTTON (widget), TRUE);
- }
- }
- }
+ e_attachment_button_set_expanded (
+ E_ATTACHMENT_BUTTON (widget), TRUE);
+ }
+ }
+ }
d(printf("Created widget %s (%p)\n", puri_uri, widget));
- return widget;
+ return widget;
}
static void
@@ -942,30 +939,29 @@ toggle_headers_visibility (WebKitDOMElement *button,
WebKitDOMEvent *event,
WebKitWebView *web_view)
{
- WebKitDOMDocument *document;
- WebKitDOMElement *short_headers, *full_headers;
- WebKitDOMCSSStyleDeclaration *css_short, *css_full;
- gboolean expanded;
- const gchar *path;
+ WebKitDOMDocument *document;
+ WebKitDOMElement *short_headers, *full_headers;
+ WebKitDOMCSSStyleDeclaration *css_short, *css_full;
+ gboolean expanded;
+ const gchar *path;
- document = webkit_web_view_get_dom_document (web_view);
+ document = webkit_web_view_get_dom_document (web_view);
- short_headers = webkit_dom_document_get_element_by_id (
+ short_headers = webkit_dom_document_get_element_by_id (
document, "__evo-short-headers");
- if (!short_headers)
- return;
+ if (!short_headers)
+ return;
- css_short = webkit_dom_element_get_style (short_headers);
+ css_short = webkit_dom_element_get_style (short_headers);
- full_headers = webkit_dom_document_get_element_by_id (
+ full_headers = webkit_dom_document_get_element_by_id (
document, "__evo-full-headers");
- if (!full_headers)
- return;
-
- css_full = webkit_dom_element_get_style (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 (
+ expanded = (g_strcmp0 (webkit_dom_css_style_declaration_get_property_value (
css_full, "display"), "block") == 0);
webkit_dom_css_style_declaration_set_property (css_full, "display",
@@ -973,15 +969,15 @@ toggle_headers_visibility (WebKitDOMElement *button,
webkit_dom_css_style_declaration_set_property (css_short, "display",
expanded ? "block" : "none", "", NULL);
- if (expanded)
+ if (expanded)
path = "evo-file://" EVOLUTION_IMAGESDIR "/plus.png";
- else
+ else
path = "evo-file://" EVOLUTION_IMAGESDIR "/minus.png";
- webkit_dom_html_image_element_set_src (
- WEBKIT_DOM_HTML_IMAGE_ELEMENT (button), path);
+ 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);
+ e_mail_display_set_headers_collapsed (E_MAIL_DISPLAY (web_view), expanded);
d(printf("Headers %s!\n", expanded ? "collapsed" : "expanded"));
}
@@ -993,59 +989,59 @@ toggle_address_visibility (WebKitDOMElement *button,
WebKitDOMEvent *event,
const gchar *address)
{
- WebKitDOMElement *full_addr, *ellipsis;
- WebKitDOMCSSStyleDeclaration *css_full, *css_ellipsis;
- WebKitDOMDocument *document;
- gchar *id;
- const gchar *path;
- gboolean expanded;
+ WebKitDOMElement *full_addr, *ellipsis;
+ WebKitDOMCSSStyleDeclaration *css_full, *css_ellipsis;
+ WebKitDOMDocument *document;
+ gchar *id;
+ const gchar *path;
+ gboolean expanded;
- document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (button));
+ document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (button));
id = g_strconcat ("__evo-moreaddr-", address, NULL);
- full_addr = webkit_dom_document_get_element_by_id (document, id);
- g_free (id);
+ full_addr = webkit_dom_document_get_element_by_id (document, id);
+ g_free (id);
- if (!full_addr)
- return;
+ if (!full_addr)
+ return;
- css_full = webkit_dom_element_get_style (full_addr);
+ css_full = webkit_dom_element_get_style (full_addr);
id = g_strconcat ("__evo-moreaddr-ellipsis-", address, NULL);
- ellipsis = webkit_dom_document_get_element_by_id (document, id);
- g_free (id);
+ ellipsis = webkit_dom_document_get_element_by_id (document, id);
+ g_free (id);
- if (!ellipsis)
- return;
+ if (!ellipsis)
+ return;
- css_ellipsis = webkit_dom_element_get_style (ellipsis);
+ css_ellipsis = webkit_dom_element_get_style (ellipsis);
- expanded = (g_strcmp0 (
- webkit_dom_css_style_declaration_get_property_value (
+ expanded = (g_strcmp0 (
+ webkit_dom_css_style_declaration_get_property_value (
css_full, "display"), "inline") == 0);
- webkit_dom_css_style_declaration_set_property(
+ webkit_dom_css_style_declaration_set_property (
css_full, "display", (expanded ? "none" : "inline"), "", NULL);
- webkit_dom_css_style_declaration_set_property (
+ webkit_dom_css_style_declaration_set_property (
css_ellipsis, "display", (expanded ? "inline" : "none"), "", NULL);
- if (expanded) {
+ if (expanded) {
path = "evo-file://" EVOLUTION_IMAGESDIR "/plus.png";
- } else {
+ } else {
path = "evo-file://" EVOLUTION_IMAGESDIR "/minus.png";
- }
+ }
- if (!WEBKIT_DOM_IS_HTML_IMAGE_ELEMENT (button)) {
+ if (!WEBKIT_DOM_IS_HTML_IMAGE_ELEMENT (button)) {
id = g_strconcat ("__evo-moreaddr-img-", address, NULL);
- button = webkit_dom_document_get_element_by_id (document, id);
- g_free (id);
+ button = webkit_dom_document_get_element_by_id (document, id);
+ g_free (id);
- if (!button)
- return;
- }
+ if (!button)
+ return;
+ }
- webkit_dom_html_image_element_set_src (
- WEBKIT_DOM_HTML_IMAGE_ELEMENT (button), path);
+ webkit_dom_html_image_element_set_src (
+ WEBKIT_DOM_HTML_IMAGE_ELEMENT (button), path);
}
@@ -1054,69 +1050,69 @@ setup_DOM_bindings (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
- WebKitWebView *web_view;
- WebKitWebFrame *frame;
- WebKitLoadStatus load_status;
- WebKitDOMDocument *document;
- WebKitDOMElement *button;
- gint i = 0;
-
- frame = WEBKIT_WEB_FRAME (object);
- load_status = webkit_web_frame_get_load_status (frame);
- if (load_status != WEBKIT_LOAD_FINISHED)
- return;
-
- web_view = webkit_web_frame_get_web_view (frame);
- document = webkit_web_view_get_dom_document (web_view);
-
- button = webkit_dom_document_get_element_by_id (
+ WebKitWebView *web_view;
+ WebKitWebFrame *frame;
+ WebKitLoadStatus load_status;
+ WebKitDOMDocument *document;
+ WebKitDOMElement *button;
+ gint i = 0;
+
+ frame = WEBKIT_WEB_FRAME (object);
+ load_status = webkit_web_frame_get_load_status (frame);
+ if (load_status != WEBKIT_LOAD_FINISHED)
+ return;
+
+ web_view = webkit_web_frame_get_web_view (frame);
+ document = webkit_web_view_get_dom_document (web_view);
+
+ button = webkit_dom_document_get_element_by_id (
document, "__evo-collapse-headers-img");
- if (!button)
- return;
+ if (!button)
+ return;
d(printf("Conntecting to __evo-collapsable-headers-img::click event\n"));
- webkit_dom_event_target_add_event_listener (
+ webkit_dom_event_target_add_event_listener (
WEBKIT_DOM_EVENT_TARGET (button), "click",
- G_CALLBACK (toggle_headers_visibility), FALSE, web_view);
+ G_CALLBACK (toggle_headers_visibility), FALSE, web_view);
- for (i = 0; i < 3; i++) {
- gchar *id;
+ for (i = 0; i < 3; i++) {
+ gchar *id;
id = g_strconcat ("__evo-moreaddr-img-", addresses[i], NULL);
- button = webkit_dom_document_get_element_by_id (document, id);
- g_free (id);
+ button = webkit_dom_document_get_element_by_id (document, id);
+ g_free (id);
- if (!button)
- continue;
+ if (!button)
+ continue;
- webkit_dom_event_target_add_event_listener(
+ webkit_dom_event_target_add_event_listener (
WEBKIT_DOM_EVENT_TARGET (button), "click",
- G_CALLBACK (toggle_address_visibility), FALSE,
- (gpointer) addresses[i]);
+ G_CALLBACK (toggle_address_visibility), FALSE,
+ (gpointer) addresses[i]);
id = g_strconcat ("__evo-moreaddr-ellipsis-", addresses[i], NULL);
- button = webkit_dom_document_get_element_by_id (document, id);
- g_free (id);
+ button = webkit_dom_document_get_element_by_id (document, id);
+ g_free (id);
- if (!button)
- continue;
+ if (!button)
+ continue;
- webkit_dom_event_target_add_event_listener (
+ webkit_dom_event_target_add_event_listener (
WEBKIT_DOM_EVENT_TARGET (button), "click",
- G_CALLBACK (toggle_address_visibility), FALSE,
- (gpointer) addresses[i]);
- }
+ G_CALLBACK (toggle_address_visibility), FALSE,
+ (gpointer) addresses[i]);
+ }
}
static void
puri_bind_dom (GObject *object,
- GParamSpec *pspec,
- gpointer user_data)
+ GParamSpec *pspec,
+ gpointer user_data)
{
WebKitWebFrame *frame;
WebKitLoadStatus load_status;
WebKitWebView *web_view;
- WebKitDOMDocument *document;
+ WebKitDOMDocument *document;
EMailDisplay *display;
GList *iter;
EMFormat *emf;
@@ -1140,7 +1136,7 @@ puri_bind_dom (GObject *object,
emf->mail_part_table,
webkit_web_frame_get_name (frame));
- document = webkit_web_view_get_dom_document (web_view);
+ document = webkit_web_view_get_dom_document (web_view);
while (iter) {
@@ -1154,18 +1150,17 @@ puri_bind_dom (GObject *object,
break;
if (puri->bind_func) {
- WebKitDOMElement *el = find_element_by_id (document, puri->uri);
- if (el) {
+ WebKitDOMElement *el = find_element_by_id (document, puri->uri);
+ if (el) {
d(printf("bind_func for %s\n", puri->uri));
- puri->bind_func (el, puri);
- }
+ puri->bind_func (el, puri);
+ }
}
iter = iter->next;
}
}
-
static void
mail_display_frame_created (WebKitWebView *web_view,
WebKitWebFrame *frame,
@@ -1177,7 +1172,7 @@ mail_display_frame_created (WebKitWebView *web_view,
* related EAttachmentButton whenever content of this <iframe> is
* (re)loaded */
g_signal_connect (frame, "notify::load-status",
- G_CALLBACK (bind_attachment_iframe_visibility), NULL);
+ G_CALLBACK (bind_attachment_iframe_visibility), NULL);
/* Call bind_func of all PURIs written in this frame */
g_signal_connect (frame, "notify::load-status",
@@ -1248,46 +1243,46 @@ e_mail_display_class_init (EMailDisplayClass *class)
static void
e_mail_display_init (EMailDisplay *display)
{
- GtkUIManager *ui_manager;
- GError *error = NULL;
- SoupSession *session;
+ GtkUIManager *ui_manager;
+ GError *error = NULL;
+ SoupSession *session;
SoupSessionFeature *feature;
const gchar *user_cache_dir;
- WebKitWebSettings *settings;
- WebKitWebFrame *main_frame;
+ WebKitWebSettings *settings;
+ WebKitWebFrame *main_frame;
display->priv = E_MAIL_DISPLAY_GET_PRIVATE (display);
- display->priv->force_image_load = FALSE;
+ display->priv->force_image_load = FALSE;
display->priv->mailto_actions = gtk_action_group_new ("mailto");
- gtk_action_group_add_actions (display->priv->mailto_actions, mailto_entries,
+ 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");
- gtk_action_group_add_actions (display->priv->images_actions, image_entries,
- G_N_ELEMENTS (image_entries), NULL);
+ 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);
+ webkit_web_view_set_full_content_zoom (WEBKIT_WEB_VIEW (display), TRUE);
- settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (display));
+ settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (display));
g_object_set (settings, "enable-frame-flattening", TRUE, NULL);
g_signal_connect (display, "navigation-policy-decision-requested",
- G_CALLBACK (mail_display_link_clicked), NULL);
+ G_CALLBACK (mail_display_link_clicked), NULL);
g_signal_connect (display, "resource-request-starting",
- G_CALLBACK (mail_display_resource_requested), NULL);
+ G_CALLBACK (mail_display_resource_requested), NULL);
g_signal_connect (display, "process-mailto",
- G_CALLBACK (mail_display_process_mailto), NULL);
+ G_CALLBACK (mail_display_process_mailto), NULL);
g_signal_connect (display, "update-actions",
- G_CALLBACK (mail_display_webview_update_actions), NULL);
+ G_CALLBACK (mail_display_webview_update_actions), NULL);
g_signal_connect (display, "create-plugin-widget",
- G_CALLBACK (mail_display_plugin_widget_requested), NULL);
+ G_CALLBACK (mail_display_plugin_widget_requested), NULL);
g_signal_connect (display, "frame-created",
- G_CALLBACK (mail_display_frame_created), NULL);
+ G_CALLBACK (mail_display_frame_created), NULL);
- main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display));
+ main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display));
g_signal_connect (main_frame, "notify::load-status",
- G_CALLBACK (setup_DOM_bindings), NULL);
+ G_CALLBACK (setup_DOM_bindings), NULL);
main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display));
g_signal_connect (main_frame, "notify::load-status",
G_CALLBACK (puri_bind_dom), NULL);
@@ -1295,23 +1290,23 @@ e_mail_display_init (EMailDisplay *display)
/* Because we are loading from a hard-coded string, there is
* no chance of I/O errors. Failure here implies a malformed
* UI definition. Full stop. */
- ui_manager = e_web_view_get_ui_manager (E_WEB_VIEW (display));
- gtk_ui_manager_insert_action_group (ui_manager, display->priv->mailto_actions, 0);
- gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
+ ui_manager = e_web_view_get_ui_manager (E_WEB_VIEW (display));
+ gtk_ui_manager_insert_action_group (ui_manager, display->priv->mailto_actions, 0);
+ gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
- if (error != NULL) {
+ if (error != NULL) {
g_error ("%s", error->message);
- g_error_free (error);
- }
+ g_error_free (error);
+ }
- error = NULL;
- gtk_ui_manager_insert_action_group (ui_manager, display->priv->images_actions, 0);
- gtk_ui_manager_add_ui_from_string (ui_manager, image_ui, -1, &error);
+ error = NULL;
+ gtk_ui_manager_insert_action_group (ui_manager, display->priv->images_actions, 0);
+ gtk_ui_manager_add_ui_from_string (ui_manager, image_ui, -1, &error);
- if (error != NULL) {
+ if (error != NULL) {
g_error ("%s", error->message);
- g_error_free (error);
- }
+ g_error_free (error);
+ }
/* Register our own handler for our own mail:// protocol */
session = webkit_get_default_session ();
@@ -1324,8 +1319,8 @@ e_mail_display_init (EMailDisplay *display)
user_cache_dir = e_get_user_cache_dir ();
emd_global_http_cache = camel_data_cache_new (user_cache_dir, NULL);
if (emd_global_http_cache) {
- camel_data_cache_set_expire_age (emd_global_http_cache, 24*60*60);
- camel_data_cache_set_expire_access (emd_global_http_cache, 2*60*60);
+ camel_data_cache_set_expire_age (emd_global_http_cache, 24 * 60 * 60);
+ camel_data_cache_set_expire_access (emd_global_http_cache, 2 * 60 * 60);
}
}
@@ -1341,11 +1336,11 @@ void
e_mail_display_set_formatter (EMailDisplay *display,
EMFormatHTML *formatter)
{
- g_return_if_fail (E_IS_MAIL_DISPLAY (display));
+ g_return_if_fail (E_IS_MAIL_DISPLAY (display));
g_return_if_fail (EM_IS_FORMAT_HTML (formatter));
g_object_ref (formatter);
-
+
if (display->priv->formatter != NULL) {
/* The formatter might still exist after unrefing it, so
* we need to stop listening to it's request for redrawing */
@@ -1359,11 +1354,11 @@ e_mail_display_set_formatter (EMailDisplay *display,
mail_display_update_formatter_colors (display);
g_signal_connect (formatter, "notify::image-loading-policy",
- G_CALLBACK (formatter_image_loading_policy_changed_cb), display);
+ 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_CALLBACK (e_mail_display_reload), display);
+ G_CALLBACK (e_mail_display_reload), display);
g_object_notify (G_OBJECT (display), "formatter");
}
@@ -1379,7 +1374,7 @@ e_mail_display_get_mode (EMailDisplay *display)
void
e_mail_display_set_mode (EMailDisplay *display,
- EMFormatWriteMode mode)
+ EMFormatWriteMode mode)
{
g_return_if_fail (E_IS_MAIL_DISPLAY (display));
@@ -1388,7 +1383,7 @@ e_mail_display_set_mode (EMailDisplay *display,
display->priv->mode = mode;
- e_mail_display_reload (display);
+ e_mail_display_reload (display);
g_object_notify (G_OBJECT (display), "mode");
}
@@ -1403,7 +1398,7 @@ e_mail_display_get_headers_collapsable (EMailDisplay *display)
void
e_mail_display_set_headers_collapsable (EMailDisplay *display,
- gboolean collapsable)
+ gboolean collapsable)
{
g_return_if_fail (E_IS_MAIL_DISPLAY (display));
@@ -1429,7 +1424,7 @@ e_mail_display_get_headers_collapsed (EMailDisplay *display)
void
e_mail_display_set_headers_collapsed (EMailDisplay *display,
- gboolean collapsed)
+ gboolean collapsed)
{
g_return_if_fail (E_IS_MAIL_DISPLAY (display));
@@ -1443,39 +1438,39 @@ e_mail_display_set_headers_collapsed (EMailDisplay *display,
void
e_mail_display_load (EMailDisplay *display,
- const gchar *msg_uri)
+ const gchar *msg_uri)
{
- EMFormat *emf;
- gchar *uri;
+ EMFormat *emf;
+ gchar *uri;
- g_return_if_fail (E_IS_MAIL_DISPLAY (display));
+ g_return_if_fail (E_IS_MAIL_DISPLAY (display));
- display->priv->force_image_load = FALSE;
+ display->priv->force_image_load = FALSE;
- emf = EM_FORMAT (display->priv->formatter);
+ emf = EM_FORMAT (display->priv->formatter);
- uri = em_format_build_mail_uri (emf->folder, emf->message_uid,
+ 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,
- NULL);
+ NULL);
- e_web_view_load_uri (E_WEB_VIEW (display), uri);
+ e_web_view_load_uri (E_WEB_VIEW (display), uri);
- g_free (uri);
+ g_free (uri);
}
void
e_mail_display_reload (EMailDisplay *display)
{
- EWebView *web_view;
- const gchar *uri;
- gchar *base;
- GString *new_uri;
- GHashTable *table;
- GHashTableIter table_iter;
- gpointer key, val;
- char separator;
+ EWebView *web_view;
+ const gchar *uri;
+ gchar *base;
+ GString *new_uri;
+ GHashTable *table;
+ GHashTableIter table_iter;
+ gpointer key, val;
+ gchar separator;
g_return_if_fail (E_IS_MAIL_DISPLAY (display));
@@ -1505,7 +1500,7 @@ e_mail_display_reload (EMailDisplay *display)
g_string_append_printf (new_uri, "%c%s=%s", separator,
(gchar *) key, (gchar *) val);
- if (separator == '?')
+ if (separator == '?')
separator = '&';
}
@@ -1515,31 +1510,31 @@ e_mail_display_reload (EMailDisplay *display)
g_hash_table_destroy (table);
}
-GtkAction*
+GtkAction *
e_mail_display_get_action (EMailDisplay *display,
- const gchar *action_name)
+ const gchar *action_name)
{
- GtkAction *action;
+ GtkAction *action;
g_return_val_if_fail (E_IS_MAIL_DISPLAY (display), NULL);
g_return_val_if_fail (action_name != NULL, NULL);
action = gtk_action_group_get_action (display->priv->mailto_actions, action_name);
- if (!action)
- action = gtk_action_group_get_action (display->priv->images_actions, action_name);
+ if (!action)
+ action = gtk_action_group_get_action (display->priv->images_actions, action_name);
- return action;
+ return action;
}
void
e_mail_display_set_status (EMailDisplay *display,
- const gchar *status)
+ const gchar *status)
{
- gchar *str;
+ gchar *str;
g_return_if_fail (E_IS_MAIL_DISPLAY (display));
- str = g_strdup_printf(
+ str = g_strdup_printf (
"<!DOCTYPE>"
"<html>"
"<head><title>Evolution Mail Display</title></head>"
@@ -1554,15 +1549,15 @@ e_mail_display_set_status (EMailDisplay *display,
"</body>"
"</html>", status);
- e_web_view_load_string (E_WEB_VIEW (display), str);
- g_free (str);
+ e_web_view_load_string (E_WEB_VIEW (display), str);
+ g_free (str);
gtk_widget_show_all (GTK_WIDGET (display));
}
-gchar*
+gchar *
e_mail_display_get_selection_plain_text (EMailDisplay *display,
- gint *len)
+ gint *len)
{
EWebView *web_view;
WebKitWebFrame *frame;
@@ -1589,19 +1584,19 @@ e_mail_display_get_selection_plain_text (EMailDisplay *display,
}
void
-e_mail_display_load_images (EMailDisplay * display)
+e_mail_display_load_images (EMailDisplay *display)
{
- g_return_if_fail (E_IS_MAIL_DISPLAY (display));
+ g_return_if_fail (E_IS_MAIL_DISPLAY (display));
- display->priv->force_image_load = TRUE;
- e_web_view_reload (E_WEB_VIEW (display));
+ display->priv->force_image_load = TRUE;
+ e_web_view_reload (E_WEB_VIEW (display));
}
void
e_mail_display_set_force_load_images (EMailDisplay *display,
gboolean force_load_images)
{
- g_return_if_fail (E_IS_MAIL_DISPLAY (display));
+ g_return_if_fail (E_IS_MAIL_DISPLAY (display));
- display->priv->force_image_load = force_load_images;
+ display->priv->force_image_load = force_load_images;
}
diff --git a/mail/e-mail-display.h b/mail/e-mail-display.h
index 0cf9645..cbac1e3 100644
--- a/mail/e-mail-display.h
+++ b/mail/e-mail-display.h
@@ -64,7 +64,7 @@ struct _EMailDisplayClass {
GType e_mail_display_get_type (void);
EMFormatHTML * e_mail_display_get_formatter (EMailDisplay *display);
void e_mail_display_set_formatter (EMailDisplay *display,
- EMFormatHTML *formatter);
+ EMFormatHTML *formatter);
void e_mail_display_set_mode (EMailDisplay *display,
EMFormatWriteMode mode);
@@ -81,7 +81,7 @@ gboolean e_mail_display_get_headers_collapsed
(EMailDisplay *display);
void e_mail_display_load (EMailDisplay *display,
- const gchar *msg_uri);
+ const gchar *msg_uri);
void e_mail_display_reload (EMailDisplay *display);
GtkAction * e_mail_display_get_action (EMailDisplay *display,
@@ -90,7 +90,7 @@ GtkAction * e_mail_display_get_action (EMailDisplay *display,
void e_mail_display_set_status (EMailDisplay *display,
const gchar *status);
-gchar* e_mail_display_get_selection_plain_text
+gchar * e_mail_display_get_selection_plain_text
(EMailDisplay *display,
gint *len);
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 4b27b09..5c7b356 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -680,10 +680,10 @@ mail_paned_view_constructed (GObject *object)
container = priv->paned;
- widget = e_preview_pane_new (E_WEB_VIEW (priv->display));
+ widget = e_preview_pane_new (E_WEB_VIEW (priv->display));
gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, FALSE);
priv->preview_pane = g_object_ref (widget);
- gtk_widget_show (GTK_WIDGET (priv->display));
+ gtk_widget_show (GTK_WIDGET (priv->display));
gtk_widget_show (widget);
g_object_bind_property (
@@ -729,17 +729,17 @@ mail_paned_view_set_search_strings (EMailView *view,
GSList *search_strings)
{
EMailDisplay *display;
- EWebView *web_view;
- EMailReader *reader;
+ EWebView *web_view;
+ EMailReader *reader;
reader = E_MAIL_READER (view);
display = e_mail_reader_get_mail_display (reader);
- if (!display)
- return;
+ if (!display)
+ return;
- web_view = E_WEB_VIEW (display);
+ web_view = E_WEB_VIEW (display);
- e_web_view_clear_highlights (web_view);
+ e_web_view_clear_highlights (web_view);
while (search_strings != NULL) {
e_web_view_add_highlight (web_view, search_strings->data);
diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c
index aaa8609..3c37672 100644
--- a/mail/e-mail-printer.c
+++ b/mail/e-mail-printer.c
@@ -63,8 +63,8 @@ struct _EMailPrinterPrivate {
};
G_DEFINE_TYPE (
- EMailPrinter,
- e_mail_printer,
+ EMailPrinter,
+ e_mail_printer,
G_TYPE_OBJECT);
enum {
@@ -85,17 +85,17 @@ enum {
LAST_COLUMN
};
-static guint signals[LAST_SIGNAL];
+static guint signals[LAST_SIGNAL];
static gint
emp_header_name_equal (const EMFormatHeader *h1,
- const EMFormatHeader *h2)
+ const EMFormatHeader *h2)
{
if ((h2->value == NULL) || (h1->value == NULL)) {
return g_strcmp0 (h1->name, h2->name);
} else {
- if ((g_strcmp0 (h1->name, h2->name) == 0) &&
- (g_strcmp0 (h1->value, h2->value) == 0))
+ if ((g_strcmp0 (h1->name, h2->name) == 0) &&
+ (g_strcmp0 (h1->value, h2->value) == 0))
return 0;
else
return 1;
@@ -114,7 +114,7 @@ emp_draw_footer (GtkPrintOperation *operation,
gchar *text;
cairo_t *cr;
- cr = gtk_print_context_get_cairo_context (context);
+ cr = gtk_print_context_get_cairo_context (context);
width = gtk_print_context_get_width (context);
height = gtk_print_context_get_height (context);
@@ -141,8 +141,8 @@ emp_draw_footer (GtkPrintOperation *operation,
static void
emp_printing_done (GtkPrintOperation *operation,
- GtkPrintOperationResult result,
- gpointer user_data)
+ GtkPrintOperationResult result,
+ gpointer user_data)
{
EMailPrinter *emp = user_data;
@@ -154,31 +154,31 @@ emp_start_printing (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
- WebKitWebView *web_view;
- WebKitWebFrame *frame;
- WebKitLoadStatus load_status;
- EMailPrinter *emp = user_data;
-
- web_view = WEBKIT_WEB_VIEW (object);
- load_status = webkit_web_view_get_load_status (web_view);
-
- if (load_status != WEBKIT_LOAD_FINISHED)
- return;
-
- frame = webkit_web_view_get_main_frame (web_view);
-
- if (emp->priv->export_mode) {
- gtk_print_operation_set_export_filename (
- emp->priv->operation,
- emp->priv->efhp->export_filename);
- webkit_web_frame_print_full (
- frame, emp->priv->operation,
- GTK_PRINT_OPERATION_ACTION_EXPORT, NULL);
- } else {
- webkit_web_frame_print_full
- (frame, emp->priv->operation,
- GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, NULL);
- }
+ WebKitWebView *web_view;
+ WebKitWebFrame *frame;
+ WebKitLoadStatus load_status;
+ EMailPrinter *emp = user_data;
+
+ web_view = WEBKIT_WEB_VIEW (object);
+ load_status = webkit_web_view_get_load_status (web_view);
+
+ if (load_status != WEBKIT_LOAD_FINISHED)
+ return;
+
+ frame = webkit_web_view_get_main_frame (web_view);
+
+ if (emp->priv->export_mode) {
+ gtk_print_operation_set_export_filename (
+ emp->priv->operation,
+ emp->priv->efhp->export_filename);
+ webkit_web_frame_print_full (
+ frame, emp->priv->operation,
+ GTK_PRINT_OPERATION_ACTION_EXPORT, NULL);
+ } else {
+ webkit_web_frame_print_full
+ (frame, emp->priv->operation,
+ GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, NULL);
+ }
}
@@ -201,34 +201,34 @@ emp_run_print_operation (EMailPrinter *emp)
g_hash_table_insert (formatters, g_strdup (mail_uri), emp->priv->efhp);
/* Print_layout is a special EMPart created by EMFormatHTMLPrint */
- if (emp->priv->uri)
- g_free (emp->priv->uri);
+ 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);
- if (emp->priv->webview == NULL) {
+ if (emp->priv->webview == NULL) {
emp->priv->webview = g_object_new (E_TYPE_MAIL_DISPLAY, NULL);
- e_web_view_set_enable_frame_flattening (E_WEB_VIEW (emp->priv->webview), FALSE);
- e_mail_display_set_force_load_images (
- E_MAIL_DISPLAY (emp->priv->webview), TRUE);
- g_object_ref_sink (emp->priv->webview);
+ e_web_view_set_enable_frame_flattening (E_WEB_VIEW (emp->priv->webview), FALSE);
+ 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_CALLBACK (emp_start_printing), emp);
-
- w({
- GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- GtkWidget *sw = gtk_scrolled_window_new (NULL, NULL);
- gtk_container_add (GTK_CONTAINER (window), sw);
- gtk_container_add (GTK_CONTAINER (sw),
- GTK_WIDGET (emp->priv->webview));
- gtk_widget_show_all (window);
- });
+ G_CALLBACK (emp_start_printing), emp);
+
+ w ({
+ GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ GtkWidget *sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_container_add (GTK_CONTAINER (window), sw);
+ gtk_container_add (GTK_CONTAINER (sw),
+ GTK_WIDGET (emp->priv->webview));
+ gtk_widget_show_all (window);
+ });
}
e_mail_display_set_formatter (E_MAIL_DISPLAY (emp->priv->webview),
- (EMFormatHTML *) emp->priv->efhp);
+ (EMFormatHTML *) emp->priv->efhp);
- webkit_web_view_load_uri (emp->priv->webview, emp->priv->uri);
+ webkit_web_view_load_uri (emp->priv->webview, emp->priv->uri);
g_free (mail_uri);
}
@@ -239,26 +239,26 @@ set_header_visible (EMailPrinter *emp,
gint index,
gboolean visible)
{
- WebKitDOMDocument *document;
- WebKitDOMNodeList *headers;
- WebKitDOMElement *element;
- WebKitDOMCSSStyleDeclaration *style;
+ WebKitDOMDocument *document;
+ WebKitDOMNodeList *headers;
+ WebKitDOMElement *element;
+ WebKitDOMCSSStyleDeclaration *style;
- document = webkit_web_view_get_dom_document (emp->priv->webview);
+ document = webkit_web_view_get_dom_document (emp->priv->webview);
headers = webkit_dom_document_get_elements_by_class_name (document, "header-item");
- g_return_if_fail (index < webkit_dom_node_list_get_length (headers));
+ 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,
+ 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);
}
static void
header_active_renderer_toggled_cb (GtkCellRendererToggle *renderer,
- gchar *path,
- EMailPrinter *emp)
+ gchar *path,
+ EMailPrinter *emp)
{
GtkTreeIter iter;
GtkTreePath *p;
@@ -271,256 +271,256 @@ header_active_renderer_toggled_cb (GtkCellRendererToggle *renderer,
gtk_tree_model_get (GTK_TREE_MODEL (emp->priv->headers), &iter,
COLUMN_ACTIVE, &active, -1);
- gtk_tree_model_get (GTK_TREE_MODEL (emp->priv->headers), &iter,
+ gtk_tree_model_get (GTK_TREE_MODEL (emp->priv->headers), &iter,
COLUMN_HEADER_STRUCT, &header, -1);
- gtk_list_store_set (GTK_LIST_STORE (emp->priv->headers), &iter,
+ gtk_list_store_set (GTK_LIST_STORE (emp->priv->headers), &iter,
COLUMN_ACTIVE, !active, -1);
- p = gtk_tree_path_new_from_string (path);
- indices = gtk_tree_path_get_indices (p);
- set_header_visible (emp, header, indices[0], !active);
- gtk_tree_path_free (p);
+ p = gtk_tree_path_new_from_string (path);
+ indices = gtk_tree_path_get_indices (p);
+ set_header_visible (emp, header, indices[0], !active);
+ gtk_tree_path_free (p);
}
static void
emp_headers_tab_toggle_selection (GtkWidget *button,
gpointer user_data)
{
- EMailPrinter *emp = user_data;
- GtkTreeIter iter;
- gboolean select;
-
- if (button == emp->priv->buttons[BUTTON_SELECT_ALL])
- select = TRUE;
- else if (button == emp->priv->buttons[BUTTON_SELECT_NONE])
- select = FALSE;
- else
- return;
-
- if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (emp->priv->headers), &iter))
- return;
-
- do {
- EMFormatHeader *header;
- GtkTreePath *path;
- gint *indices;
-
- gtk_tree_model_get (GTK_TREE_MODEL (emp->priv->headers), &iter,
- COLUMN_HEADER_STRUCT, &header, -1);
- gtk_list_store_set (GTK_LIST_STORE (emp->priv->headers), &iter,
- COLUMN_ACTIVE, select, -1);
-
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (emp->priv->headers), &iter);
- indices = gtk_tree_path_get_indices (path);
- set_header_visible (emp, header, indices[0], select);
- gtk_tree_path_free (path);
-
- } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (emp->priv->headers), &iter));
+ EMailPrinter *emp = user_data;
+ GtkTreeIter iter;
+ gboolean select;
+
+ if (button == emp->priv->buttons[BUTTON_SELECT_ALL])
+ select = TRUE;
+ else if (button == emp->priv->buttons[BUTTON_SELECT_NONE])
+ select = FALSE;
+ else
+ return;
+
+ if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (emp->priv->headers), &iter))
+ return;
+
+ do {
+ EMFormatHeader *header;
+ GtkTreePath *path;
+ gint *indices;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (emp->priv->headers), &iter,
+ COLUMN_HEADER_STRUCT, &header, -1);
+ gtk_list_store_set (GTK_LIST_STORE (emp->priv->headers), &iter,
+ COLUMN_ACTIVE, select, -1);
+
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (emp->priv->headers), &iter);
+ indices = gtk_tree_path_get_indices (path);
+ set_header_visible (emp, header, indices[0], select);
+ gtk_tree_path_free (path);
+
+ } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (emp->priv->headers), &iter));
}
static void
emp_headers_tab_selection_changed (GtkTreeSelection *selection,
gpointer user_data)
{
- EMailPrinter *emp = user_data;
- gboolean enabled;
- GList *selected_rows;
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkTreePath *path;
-
- if (gtk_tree_selection_count_selected_rows (selection) == 0) {
- gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_TOP], FALSE);
- gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_UP], FALSE);
- gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_DOWN], FALSE);
- gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_BOTTOM], FALSE);
-
- return;
- }
-
- model = GTK_TREE_MODEL (emp->priv->headers);
- selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
-
- path = gtk_tree_path_copy (selected_rows->data);
- enabled = gtk_tree_path_prev (path);
- gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_TOP], enabled);
- gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_UP], enabled);
-
- gtk_tree_model_get_iter (model, &iter, g_list_last (selected_rows)->data);
- enabled = gtk_tree_model_iter_next (model, &iter);
- gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_DOWN], enabled);
- gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_BOTTOM], enabled);
-
- g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (selected_rows);
- gtk_tree_path_free (path);
+ EMailPrinter *emp = user_data;
+ gboolean enabled;
+ GList *selected_rows;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+
+ if (gtk_tree_selection_count_selected_rows (selection) == 0) {
+ gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_TOP], FALSE);
+ gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_UP], FALSE);
+ gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_DOWN], FALSE);
+ gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_BOTTOM], FALSE);
+
+ return;
+ }
+
+ model = GTK_TREE_MODEL (emp->priv->headers);
+ selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
+
+ path = gtk_tree_path_copy (selected_rows->data);
+ enabled = gtk_tree_path_prev (path);
+ gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_TOP], enabled);
+ gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_UP], enabled);
+
+ gtk_tree_model_get_iter (model, &iter, g_list_last (selected_rows)->data);
+ enabled = gtk_tree_model_iter_next (model, &iter);
+ gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_DOWN], enabled);
+ gtk_widget_set_sensitive (emp->priv->buttons[BUTTON_BOTTOM], enabled);
+
+ g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (selected_rows);
+ gtk_tree_path_free (path);
}
static void
emp_headers_tab_move (GtkWidget *button,
gpointer user_data)
{
- EMailPrinter *emp = user_data;
- GtkTreeSelection *selection;
- GList *selected_rows, *references, *l;
- GtkTreePath *path;
- GtkTreeModel *model;
- GtkTreeIter iter;
- GtkTreeRowReference *selection_middle;
- gint *indices;
-
- WebKitDOMDocument *document;
- WebKitDOMNodeList *headers;
- WebKitDOMNode *header, *parent;
-
- model = GTK_TREE_MODEL (emp->priv->headers);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (emp->priv->treeview));
- selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
+ EMailPrinter *emp = user_data;
+ GtkTreeSelection *selection;
+ GList *selected_rows, *references, *l;
+ GtkTreePath *path;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreeRowReference *selection_middle;
+ gint *indices;
+
+ WebKitDOMDocument *document;
+ WebKitDOMNodeList *headers;
+ WebKitDOMNode *header, *parent;
+
+ model = GTK_TREE_MODEL (emp->priv->headers);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (emp->priv->treeview));
+ selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
/* 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);
+ 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");
- l = g_list_nth (selected_rows, g_list_length (selected_rows) / 2);
- selection_middle = gtk_tree_row_reference_new (model, l->data);
+ l = g_list_nth (selected_rows, g_list_length (selected_rows) / 2);
+ selection_middle = gtk_tree_row_reference_new (model, l->data);
- for (l = selected_rows; l; l = l->next) {
- references = g_list_prepend (references,
- gtk_tree_row_reference_new (model, l->data));
- }
+ for (l = selected_rows; l; l = l->next) {
+ references = g_list_prepend (references,
+ gtk_tree_row_reference_new (model, l->data));
+ }
- if (button == emp->priv->buttons[BUTTON_TOP]) {
+ if (button == emp->priv->buttons[BUTTON_TOP]) {
- for (l = references; l; l = l->next) {
+ for (l = references; l; l = l->next) {
/* Move the rows in the view */
- path = gtk_tree_row_reference_get_path (l->data);
- gtk_tree_model_get_iter (model, &iter, path);
- gtk_list_store_move_after (emp->priv->headers, &iter, NULL);
+ path = gtk_tree_row_reference_get_path (l->data);
+ gtk_tree_model_get_iter (model, &iter, path);
+ gtk_list_store_move_after (emp->priv->headers, &iter, NULL);
/* Move the header row in HTML document */
- indices = gtk_tree_path_get_indices (path);
- header = webkit_dom_node_list_item (headers, indices[0]);
- parent = webkit_dom_node_get_parent_node (header);
- webkit_dom_node_remove_child (parent, header, NULL);
- webkit_dom_node_insert_before (parent, header,
- webkit_dom_node_get_first_child (parent), NULL);
+ indices = gtk_tree_path_get_indices (path);
+ header = webkit_dom_node_list_item (headers, indices[0]);
+ parent = webkit_dom_node_get_parent_node (header);
+ webkit_dom_node_remove_child (parent, header, NULL);
+ webkit_dom_node_insert_before (parent, header,
+ webkit_dom_node_get_first_child (parent), NULL);
- gtk_tree_path_free (path);
- }
+ gtk_tree_path_free (path);
+ }
} else if (button == emp->priv->buttons[BUTTON_UP]) {
- GtkTreeIter *iter_prev;
- WebKitDOMNode *node2;
+ GtkTreeIter *iter_prev;
+ WebKitDOMNode *node2;
- references = g_list_reverse (references);
+ references = g_list_reverse (references);
- for (l = references; l; l = l->next) {
+ for (l = references; l; l = l->next) {
- path = gtk_tree_row_reference_get_path (l->data);
- gtk_tree_model_get_iter (model, &iter, path);
- iter_prev = gtk_tree_iter_copy (&iter);
- gtk_tree_model_iter_previous (model, iter_prev);
+ path = gtk_tree_row_reference_get_path (l->data);
+ gtk_tree_model_get_iter (model, &iter, path);
+ iter_prev = gtk_tree_iter_copy (&iter);
+ gtk_tree_model_iter_previous (model, iter_prev);
- gtk_list_store_move_before (emp->priv->headers, &iter, iter_prev);
+ gtk_list_store_move_before (emp->priv->headers, &iter, iter_prev);
- indices = gtk_tree_path_get_indices (path);
- header = webkit_dom_node_list_item (headers, indices[0]);
- node2 = webkit_dom_node_get_previous_sibling (header);
- parent = webkit_dom_node_get_parent_node (header);
+ indices = gtk_tree_path_get_indices (path);
+ header = webkit_dom_node_list_item (headers, indices[0]);
+ node2 = webkit_dom_node_get_previous_sibling (header);
+ parent = webkit_dom_node_get_parent_node (header);
- webkit_dom_node_remove_child (parent, header, NULL);
- webkit_dom_node_insert_before (parent, header, node2, NULL);
+ webkit_dom_node_remove_child (parent, header, NULL);
+ webkit_dom_node_insert_before (parent, header, node2, NULL);
- gtk_tree_path_free (path);
- gtk_tree_iter_free (iter_prev);
- }
+ gtk_tree_path_free (path);
+ gtk_tree_iter_free (iter_prev);
+ }
- } else if (button == emp->priv->buttons[BUTTON_DOWN]) {
+ } else if (button == emp->priv->buttons[BUTTON_DOWN]) {
- GtkTreeIter *iter_next;
- WebKitDOMNode *node2;
+ GtkTreeIter *iter_next;
+ WebKitDOMNode *node2;
- for (l = references; l; l = l->next) {
+ for (l = references; l; l = l->next) {
- path = gtk_tree_row_reference_get_path (l->data);
- gtk_tree_model_get_iter (model, &iter, path);
- iter_next = gtk_tree_iter_copy (&iter);
- gtk_tree_model_iter_next (model, iter_next);
+ path = gtk_tree_row_reference_get_path (l->data);
+ gtk_tree_model_get_iter (model, &iter, path);
+ iter_next = gtk_tree_iter_copy (&iter);
+ gtk_tree_model_iter_next (model, iter_next);
- gtk_list_store_move_after (emp->priv->headers, &iter, iter_next);
+ gtk_list_store_move_after (emp->priv->headers, &iter, iter_next);
- indices = gtk_tree_path_get_indices (path);
- header = webkit_dom_node_list_item (headers, indices[0]);
- node2 = webkit_dom_node_get_next_sibling (header);
- parent = webkit_dom_node_get_parent_node (header);
+ indices = gtk_tree_path_get_indices (path);
+ header = webkit_dom_node_list_item (headers, indices[0]);
+ node2 = webkit_dom_node_get_next_sibling (header);
+ parent = webkit_dom_node_get_parent_node (header);
- webkit_dom_node_remove_child (parent, header, NULL);
- webkit_dom_node_insert_before (parent, header,
- webkit_dom_node_get_next_sibling (node2), NULL);
+ webkit_dom_node_remove_child (parent, header, NULL);
+ webkit_dom_node_insert_before (parent, header,
+ webkit_dom_node_get_next_sibling (node2), NULL);
- gtk_tree_path_free (path);
- gtk_tree_iter_free (iter_next);
- }
+ gtk_tree_path_free (path);
+ gtk_tree_iter_free (iter_next);
+ }
- } else if (button == emp->priv->buttons[BUTTON_BOTTOM]) {
+ } else if (button == emp->priv->buttons[BUTTON_BOTTOM]) {
- references = g_list_reverse (references);
+ references = g_list_reverse (references);
- for (l = references; l; l = l->next) {
- path = gtk_tree_row_reference_get_path (l->data);
- gtk_tree_model_get_iter (model, &iter, path);
- gtk_list_store_move_before (emp->priv->headers, &iter, NULL);
+ for (l = references; l; l = l->next) {
+ path = gtk_tree_row_reference_get_path (l->data);
+ gtk_tree_model_get_iter (model, &iter, path);
+ gtk_list_store_move_before (emp->priv->headers, &iter, NULL);
/* Move the header row in HTML document */
- indices = gtk_tree_path_get_indices (path);
- header = webkit_dom_node_list_item (headers, indices[0]);
- parent = webkit_dom_node_get_parent_node (header);
- webkit_dom_node_remove_child (parent, header, NULL);
- webkit_dom_node_append_child (parent, header, NULL);
+ indices = gtk_tree_path_get_indices (path);
+ header = webkit_dom_node_list_item (headers, indices[0]);
+ parent = webkit_dom_node_get_parent_node (header);
+ webkit_dom_node_remove_child (parent, header, NULL);
+ webkit_dom_node_append_child (parent, header, NULL);
- gtk_tree_path_free (path);
- }
- };
+ gtk_tree_path_free (path);
+ }
+ };
- g_list_foreach (references, (GFunc) gtk_tree_row_reference_free, NULL);
- g_list_free (references);
+ g_list_foreach (references, (GFunc) gtk_tree_row_reference_free, NULL);
+ g_list_free (references);
/* Keep the selection in middle of the screen */
- path = gtk_tree_row_reference_get_path (selection_middle);
- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (emp->priv->treeview),
- path, COLUMN_ACTIVE, TRUE, 0.5, 0.5);
- gtk_tree_path_free (path);
- gtk_tree_row_reference_free (selection_middle);
+ path = gtk_tree_row_reference_get_path (selection_middle);
+ gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (emp->priv->treeview),
+ path, COLUMN_ACTIVE, TRUE, 0.5, 0.5);
+ gtk_tree_path_free (path);
+ gtk_tree_row_reference_free (selection_middle);
- g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (selected_rows);
+ g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (selected_rows);
- emp_headers_tab_selection_changed (selection, user_data);
+ emp_headers_tab_selection_changed (selection, user_data);
}
-static GtkWidget*
+static GtkWidget *
emp_create_headers_tab (GtkPrintOperation *operation,
EMailPrinter *emp)
{
GtkWidget *vbox, *hbox, *scw, *button;
GtkTreeView *view;
- GtkTreeSelection *selection;
+ GtkTreeSelection *selection;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
- gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 5);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+ gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 5);
- emp->priv->treeview = gtk_tree_view_new_with_model (
- GTK_TREE_MODEL (emp->priv->headers));
- view = GTK_TREE_VIEW (emp->priv->treeview);
- selection = gtk_tree_view_get_selection (view);
- gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+ emp->priv->treeview = gtk_tree_view_new_with_model (
+ GTK_TREE_MODEL (emp->priv->headers));
+ 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_CALLBACK (emp_headers_tab_selection_changed), emp);
+ G_CALLBACK (emp_headers_tab_selection_changed), emp);
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, "toggled",
@@ -544,63 +544,63 @@ emp_create_headers_tab (GtkPrintOperation *operation,
scw = gtk_scrolled_window_new (NULL, NULL);
gtk_container_add (GTK_CONTAINER (scw), GTK_WIDGET (view));
- gtk_box_pack_start (GTK_BOX (hbox), scw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), scw, TRUE, TRUE, 0);
- button = gtk_button_new_from_stock (GTK_STOCK_SELECT_ALL);
- emp->priv->buttons[BUTTON_SELECT_ALL] = button;
+ button = gtk_button_new_from_stock (GTK_STOCK_SELECT_ALL);
+ emp->priv->buttons[BUTTON_SELECT_ALL] = button;
g_signal_connect (button, "clicked",
- G_CALLBACK (emp_headers_tab_toggle_selection), emp);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
+ 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;
+ button = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
+ emp->priv->buttons[BUTTON_SELECT_NONE] = button;
g_signal_connect (button, "clicked",
- G_CALLBACK (emp_headers_tab_toggle_selection), emp);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
+ 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);
+ 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_CALLBACK (emp_headers_tab_move), emp);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
+ 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);
+ 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_CALLBACK (emp_headers_tab_move), emp);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
+ 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);
+ 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_CALLBACK (emp_headers_tab_move), emp);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
+ 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);
+ 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_CALLBACK (emp_headers_tab_move), emp);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
+ G_CALLBACK (emp_headers_tab_move), emp);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 5);
gtk_print_operation_set_custom_tab_label (operation, _("Headers"));
- gtk_widget_show_all (hbox);
+ gtk_widget_show_all (hbox);
- return hbox;
+ return hbox;
}
static void
emp_set_formatter (EMailPrinter *emp,
- EMFormatHTMLPrint *formatter)
+ EMFormatHTMLPrint *formatter)
{
EMFormat *emf = (EMFormat *) formatter;
CamelMediumHeader *header;
GArray *headers;
gint i;
- GtkTreeIter last_known;
+ GtkTreeIter last_known;
g_return_if_fail (EM_IS_FORMAT_HTML_PRINT (formatter));
@@ -613,12 +613,12 @@ emp_set_formatter (EMailPrinter *emp,
if (emp->priv->headers)
g_object_unref (emp->priv->headers);
- emp->priv->headers = gtk_list_store_new (5,
+ emp->priv->headers = gtk_list_store_new (5,
G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
headers = camel_medium_get_headers (CAMEL_MEDIUM (emf->message));
- if (!headers)
- return;
+ if (!headers)
+ return;
for (i = 0; i < headers->len; i++) {
GtkTreeIter iter;
@@ -631,18 +631,18 @@ emp_set_formatter (EMailPrinter *emp,
found_header = g_queue_find_custom (&EM_FORMAT (formatter)->header_list,
emfh, (GCompareFunc) emp_header_name_equal);
- if (!found_header) {
- emfh->flags |= EM_FORMAT_HTML_HEADER_HIDDEN;
- em_format_add_header_struct (EM_FORMAT (formatter), emfh);
- gtk_list_store_append (emp->priv->headers, &iter);
- } else {
- if (gtk_list_store_iter_is_valid (emp->priv->headers, &last_known))
- gtk_list_store_insert_after (emp->priv->headers, &iter, &last_known);
- else
- gtk_list_store_insert_after (emp->priv->headers, &iter, NULL);
+ if (!found_header) {
+ emfh->flags |= EM_FORMAT_HTML_HEADER_HIDDEN;
+ em_format_add_header_struct (EM_FORMAT (formatter), emfh);
+ gtk_list_store_append (emp->priv->headers, &iter);
+ } else {
+ if (gtk_list_store_iter_is_valid (emp->priv->headers, &last_known))
+ gtk_list_store_insert_after (emp->priv->headers, &iter, &last_known);
+ else
+ gtk_list_store_insert_after (emp->priv->headers, &iter, NULL);
- last_known = iter;
- }
+ last_known = iter;
+ }
gtk_list_store_set (emp->priv->headers, &iter,
COLUMN_ACTIVE, (found_header != NULL),
@@ -674,9 +674,9 @@ emp_set_property (GObject *object,
static void
emp_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
EMailPrinter *emp = E_MAIL_PRINTER (object);
@@ -705,13 +705,13 @@ emp_finalize (GObject *object)
GtkTreeIter iter;
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->headers), &iter)) {
- do {
- EMFormatHeader *header = NULL;
- gtk_tree_model_get (GTK_TREE_MODEL (priv->headers), &iter,
- COLUMN_HEADER_STRUCT, &header, -1);
- em_format_header_free (header);
- } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->headers), &iter));
- }
+ do {
+ EMFormatHeader *header = NULL;
+ gtk_tree_model_get (GTK_TREE_MODEL (priv->headers), &iter,
+ COLUMN_HEADER_STRUCT, &header, -1);
+ em_format_header_free (header);
+ } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->headers), &iter));
+ }
g_object_unref (priv->headers);
priv->headers = NULL;
}
@@ -722,14 +722,14 @@ emp_finalize (GObject *object)
}
if (priv->uri) {
- g_free (priv->uri);
- priv->uri = NULL;
- }
+ g_free (priv->uri);
+ priv->uri = NULL;
+ }
- if (priv->operation) {
- g_object_unref (priv->operation);
- priv->operation = NULL;
- }
+ if (priv->operation) {
+ g_object_unref (priv->operation);
+ priv->operation = NULL;
+ }
/* Chain up to parent's finalize() method. */
G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -756,7 +756,7 @@ e_mail_printer_class_init (EMailPrinterClass *klass)
NULL,
NULL,
EM_TYPE_FORMAT_HTML_PRINT,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
signals[SIGNAL_DONE] = g_signal_new ("done",
G_TYPE_FROM_CLASS (klass),
@@ -779,8 +779,8 @@ e_mail_printer_init (EMailPrinter *emp)
emp->priv->webview = NULL;
}
-EMailPrinter*
-e_mail_printer_new (EMFormatHTML* source)
+EMailPrinter *
+e_mail_printer_new (EMFormatHTML * source)
{
EMailPrinter *emp;
EMFormatHTMLPrint *efhp;
@@ -797,15 +797,15 @@ e_mail_printer_new (EMFormatHTML* source)
void
e_mail_printer_print (EMailPrinter *emp,
- gboolean export_mode,
- GCancellable *cancellable)
+ gboolean export_mode,
+ GCancellable *cancellable)
{
g_return_if_fail (E_IS_MAIL_PRINTER (emp));
- if (emp->priv->operation)
- g_object_unref (emp->priv->operation);
- emp->priv->operation = e_print_operation_new ();
- gtk_print_operation_set_unit (emp->priv->operation, GTK_UNIT_PIXEL);
+ if (emp->priv->operation)
+ g_object_unref (emp->priv->operation);
+ emp->priv->operation = e_print_operation_new ();
+ gtk_print_operation_set_unit (emp->priv->operation, GTK_UNIT_PIXEL);
gtk_print_operation_set_show_progress (emp->priv->operation, TRUE);
g_signal_connect (emp->priv->operation, "create-custom-widget",
@@ -813,44 +813,42 @@ e_mail_printer_print (EMailPrinter *emp,
g_signal_connect (emp->priv->operation, "done",
G_CALLBACK (emp_printing_done), emp);
g_signal_connect (emp->priv->operation, "draw-page",
- G_CALLBACK (emp_draw_footer), NULL);
+ G_CALLBACK (emp_draw_footer), NULL);
- emp->priv->export_mode = export_mode;
+ emp->priv->export_mode = export_mode;
- if (cancellable)
+ if (cancellable)
g_signal_connect_swapped (cancellable, "cancelled",
- G_CALLBACK (gtk_print_operation_cancel), emp->priv->operation);
+ G_CALLBACK (gtk_print_operation_cancel), emp->priv->operation);
emp_run_print_operation (emp);
}
-const gchar*
-e_mail_printer_get_export_filename (EMailPrinter * printer)
+const gchar *
+e_mail_printer_get_export_filename (EMailPrinter *printer)
{
- g_return_val_if_fail (E_IS_MAIL_PRINTER (printer), NULL);
+ g_return_val_if_fail (E_IS_MAIL_PRINTER (printer), NULL);
- if (!printer->priv->efhp)
- return NULL;
+ if (!printer->priv->efhp)
+ return NULL;
- return printer->priv->efhp->export_filename;
+ return printer->priv->efhp->export_filename;
}
void
-e_mail_printer_set_export_filename (EMailPrinter * printer,
- const gchar * filename)
+e_mail_printer_set_export_filename (EMailPrinter *printer,
+ const gchar *filename)
{
- g_return_if_fail (E_IS_MAIL_PRINTER (printer));
- g_return_if_fail (printer->priv->efhp != NULL);
+ g_return_if_fail (E_IS_MAIL_PRINTER (printer));
+ g_return_if_fail (printer->priv->efhp != NULL);
- if (printer->priv->efhp->export_filename && *printer->priv->efhp->export_filename)
- g_free (printer->priv->efhp->export_filename);
+ if (printer->priv->efhp->export_filename && *printer->priv->efhp->export_filename)
+ g_free (printer->priv->efhp->export_filename);
- printer->priv->efhp->export_filename = g_strdup (filename);
+ printer->priv->efhp->export_filename = g_strdup (filename);
}
-
-
-EMFormatHTMLPrint*
+EMFormatHTMLPrint *
e_mail_printer_get_print_formatter (EMailPrinter *emp)
{
g_return_val_if_fail (E_IS_MAIL_PRINTER (emp), NULL);
diff --git a/mail/e-mail-printer.h b/mail/e-mail-printer.h
index f0ebb0a..fcd163e 100644
--- a/mail/e-mail-printer.h
+++ b/mail/e-mail-printer.h
@@ -55,10 +55,10 @@ struct _EMailPrinter {
struct _EMailPrinterClass {
GObjectClass parent_class;
- void (*done) (EMailPrinter *printer,
+ void (*done) (EMailPrinter *printer,
GtkPrintOperation *operation,
- GtkPrintOperationResult *result,
- gpointer user_data);
+ GtkPrintOperationResult *result,
+ gpointer user_data);
};
GType e_mail_printer_get_type (void);
@@ -69,14 +69,13 @@ void e_mail_printer_print (EMailPrinter *printer,
gboolean export,
GCancellable *cancellable);
-void e_mail_printer_set_export_filename
+void e_mail_printer_set_export_filename
(EMailPrinter *printer,
const gchar *filename);
-const gchar* e_mail_printer_get_export_filename
+const gchar * e_mail_printer_get_export_filename
(EMailPrinter *printer);
-
EMFormatHTMLPrint *
e_mail_printer_get_print_formatter
(EMailPrinter *printer);
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index d34894e..5956ab2 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -435,16 +435,16 @@ e_mail_reader_open_selected (EMailReader *reader)
static gboolean
destroy_printing_activity (EActivity *activity)
{
- g_object_unref (activity);
+ g_object_unref (activity);
- return FALSE;
+ return FALSE;
}
static void
printing_done_cb (EMailPrinter *printer,
- GtkPrintOperation *operation,
- GtkPrintOperationResult result,
- gpointer user_data)
+ GtkPrintOperation *operation,
+ GtkPrintOperationResult result,
+ gpointer user_data)
{
EActivity *activity = user_data;
@@ -468,9 +468,9 @@ printing_done_cb (EMailPrinter *printer,
}
/* Set activity as completed, and keep it displayed for a few seconds
- so that user can actually see the the printing was sucesfully finished. */
+ * so that user can actually see the the printing was sucesfully finished. */
e_activity_set_state (activity, E_ACTIVITY_COMPLETED);
- g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 3,
+ g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 3,
(GSourceFunc) destroy_printing_activity, activity, NULL);
g_object_unref (printer);
@@ -871,8 +871,8 @@ e_mail_reader_reply_to_message (EMailReader *reader,
if (!e_web_view_is_selection_active (web_view))
goto whole_message;
- selection = e_web_view_get_selection_html (web_view);
- length = strlen (selection);
+ selection = e_web_view_get_selection_html (web_view);
+ length = strlen (selection);
if (selection == NULL || *selection == '\0')
goto whole_message;
@@ -1443,7 +1443,7 @@ remove_header_notify_cb (gpointer data)
**/
void
e_mail_reader_connect_headers (EMailReader *reader,
- EMFormat *emf)
+ EMFormat *emf)
{
GConfClient *client;
guint notify_id;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index de5e5e2..e7bccb9 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -128,10 +128,10 @@ G_DEFINE_INTERFACE (EMailReader, e_mail_reader, G_TYPE_INITIALLY_UNOWNED)
static void
mail_reader_set_display_formatter_for_message (EMailReader *reader,
- EMailDisplay *display,
- const gchar *message_uid,
- CamelMimeMessage *message,
- CamelFolder *folder);
+ EMailDisplay *display,
+ const gchar *message_uid,
+ CamelMimeMessage *message,
+ CamelFolder *folder);
static void
mail_reader_closure_free (EMailReaderClosure *closure)
@@ -221,7 +221,7 @@ action_add_to_address_book_cb (GtkAction *action,
backend = e_mail_reader_get_backend (reader);
web_view = E_WEB_VIEW (e_mail_reader_get_mail_display (reader));
- if (!web_view)
+ if (!web_view)
return;
uri = e_web_view_get_selected_uri (web_view);
@@ -260,111 +260,111 @@ attachment_load_finish (EAttachment *attachment,
GAsyncResult *result,
GFile *file)
{
- EShell *shell;
- GtkWindow *parent;
+ EShell *shell;
+ GtkWindow *parent;
- e_attachment_load_finish (attachment, result, NULL);
+ e_attachment_load_finish (attachment, result, NULL);
- shell = e_shell_get_default ();
- parent = e_shell_get_active_window (shell);
+ shell = e_shell_get_default ();
+ parent = e_shell_get_active_window (shell);
- e_attachment_save_async (
- attachment, file, (GAsyncReadyCallback)
- e_attachment_save_handle_error, parent);
+ e_attachment_save_async (
+ attachment, file, (GAsyncReadyCallback)
+ e_attachment_save_handle_error, parent);
- g_object_unref (file);
+ g_object_unref (file);
}
static void
action_mail_image_save_cb (GtkAction *action,
EMailReader *reader)
{
- EMailDisplay *display;
- EWebView *web_view;
- EMFormat *emf;
- const gchar *image_src;
- CamelMimePart *part;
- EAttachment *attachment;
- GFile *file;
+ EMailDisplay *display;
+ EWebView *web_view;
+ EMFormat *emf;
+ const gchar *image_src;
+ CamelMimePart *part;
+ EAttachment *attachment;
+ GFile *file;
- display = e_mail_reader_get_mail_display (reader);
- web_view = E_WEB_VIEW (display);
+ display = e_mail_reader_get_mail_display (reader);
+ web_view = E_WEB_VIEW (display);
- if (!E_IS_WEB_VIEW (web_view))
- return;
+ if (!E_IS_WEB_VIEW (web_view))
+ return;
- image_src = e_web_view_get_cursor_image_src (web_view);
- if (!image_src)
- return;
+ image_src = e_web_view_get_cursor_image_src (web_view);
+ if (!image_src)
+ return;
- emf = EM_FORMAT (e_mail_display_get_formatter (display));
- g_return_if_fail (emf != NULL);
- g_return_if_fail (emf->message != NULL);
+ emf = EM_FORMAT (e_mail_display_get_formatter (display));
+ g_return_if_fail (emf != NULL);
+ g_return_if_fail (emf->message != NULL);
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);
-
- g_object_ref (part);
- } else {
- CamelStream *image_stream;
- CamelDataWrapper *dw;
- CamelDataCache *cache;
- const gchar *filename;
- const gchar *user_cache_dir;
+ part = camel_mime_message_get_part_by_content_id (
+ emf->message, image_src + 4);
+ g_return_if_fail (part != NULL);
+
+ g_object_ref (part);
+ } else {
+ CamelStream *image_stream;
+ CamelDataWrapper *dw;
+ CamelDataCache *cache;
+ const gchar *filename;
+ const gchar *user_cache_dir;
/* Open cache and find the file there */
- user_cache_dir = e_get_user_cache_dir ();
- cache = camel_data_cache_new (user_cache_dir, NULL);
+ 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);
- if (!image_stream) {
- g_object_unref (cache);
- return;
- }
-
- filename = strrchr (image_src, '/');
- if (filename && strchr (filename, '?'))
- filename = NULL;
- else if (filename)
- filename = filename + 1;
-
- part = camel_mime_part_new ();
- if (filename)
- camel_mime_part_set_filename (part, filename);
-
- dw = camel_data_wrapper_new ();
- camel_data_wrapper_set_mime_type (
+ if (!image_stream) {
+ g_object_unref (cache);
+ return;
+ }
+
+ filename = strrchr (image_src, '/');
+ if (filename && strchr (filename, '?'))
+ filename = NULL;
+ else if (filename)
+ filename = filename + 1;
+
+ part = camel_mime_part_new ();
+ if (filename)
+ camel_mime_part_set_filename (part, filename);
+
+ dw = camel_data_wrapper_new ();
+ camel_data_wrapper_set_mime_type (
dw, "application/octet-stream");
- camel_data_wrapper_construct_from_stream_sync (
- dw, image_stream, NULL, NULL);
- camel_medium_set_content (CAMEL_MEDIUM (part), dw);
- g_object_unref (dw);
+ camel_data_wrapper_construct_from_stream_sync (
+ dw, image_stream, NULL, NULL);
+ camel_medium_set_content (CAMEL_MEDIUM (part), dw);
+ g_object_unref (dw);
- camel_mime_part_set_encoding (
- part, CAMEL_TRANSFER_ENCODING_BASE64);
+ camel_mime_part_set_encoding (
+ part, CAMEL_TRANSFER_ENCODING_BASE64);
- g_object_unref (image_stream);
- g_object_unref (cache);
- }
+ g_object_unref (image_stream);
+ g_object_unref (cache);
+ }
- file = e_shell_run_save_dialog (
- e_shell_get_default (),
+ file = e_shell_run_save_dialog (
+ e_shell_get_default (),
_("Save Image"), camel_mime_part_get_filename (part),
- NULL, NULL, NULL);
- if (file == NULL) {
- g_object_unref (part);
- return;
- }
+ NULL, NULL, NULL);
+ if (file == NULL) {
+ g_object_unref (part);
+ return;
+ }
- attachment = e_attachment_new ();
- e_attachment_set_mime_part (attachment, part);
+ attachment = e_attachment_new ();
+ e_attachment_set_mime_part (attachment, part);
- e_attachment_load_async (
- attachment, (GAsyncReadyCallback)
- attachment_load_finish, file);
+ e_attachment_load_async (
+ attachment, (GAsyncReadyCallback)
+ attachment_load_finish, file);
- g_object_unref (part);
+ g_object_unref (part);
}
static void
@@ -791,7 +791,7 @@ action_mail_load_images_cb (GtkAction *action,
display = e_mail_reader_get_mail_display (reader);
- e_mail_display_load_images (display);
+ e_mail_display_load_images (display);
}
static void
@@ -1805,7 +1805,7 @@ action_mail_zoom_in_cb (GtkAction *action,
display = e_mail_reader_get_mail_display (reader);
- webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (display));
+ webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (display));
}
static void
@@ -1816,7 +1816,7 @@ action_mail_zoom_out_cb (GtkAction *action,
display = e_mail_reader_get_mail_display (reader);
- webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (display));
+ webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (display));
}
static void
@@ -2610,7 +2610,6 @@ mail_reader_message_seen_cb (EMailReaderClosure *closure)
reader = closure->reader;
message_uid = closure->message_uid;
-
display = e_mail_reader_get_mail_display (reader);
formatter = e_mail_display_get_formatter (display);
message_list = e_mail_reader_get_message_list (reader);
@@ -2621,10 +2620,10 @@ mail_reader_message_seen_cb (EMailReaderClosure *closure)
current_uid = MESSAGE_LIST (message_list)->cursor_uid;
uid_is_current &= (g_strcmp0 (current_uid, message_uid) == 0);
- if (formatter)
- message = EM_FORMAT (formatter)->message;
- else
- message = NULL;
+ if (formatter)
+ message = EM_FORMAT (formatter)->message;
+ else
+ message = NULL;
if (uid_is_current && message != NULL)
g_signal_emit (
@@ -2645,8 +2644,8 @@ schedule_timeout_mark_seen (EMailReader *reader)
gboolean schedule_timeout;
gint timeout_interval;
const gchar *message_uid;
- backend = e_mail_reader_get_backend (reader);
- message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader));
+ backend = e_mail_reader_get_backend (reader);
+ message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader));
shell_backend = E_SHELL_BACKEND (backend);
shell = e_shell_backend_get_shell (shell_backend);
shell_settings = e_shell_get_shell_settings (shell);
@@ -3034,7 +3033,7 @@ struct _formatter_weak_ref_closure {
static void
formatter_weak_ref_cb (struct _formatter_weak_ref_closure *data,
- EMFormat *formatter)
+ EMFormat *formatter)
{
/* When this callback is called, the formatter is being finalized
* so we only remove it from the formatters table. */
@@ -3060,29 +3059,29 @@ format_parser_async_done_cb (GObject *source,
GAsyncResult *result,
gpointer user_data)
{
- EMFormat *emf = EM_FORMAT (source);
- struct format_parser_async_closure_ *closure = user_data;
+ EMFormat *emf = EM_FORMAT (source);
+ struct format_parser_async_closure_ *closure = user_data;
- e_mail_display_set_formatter (closure->display, EM_FORMAT_HTML (emf));
- e_mail_display_load (closure->display, emf->uri_base);
+ e_mail_display_set_formatter (closure->display, EM_FORMAT_HTML (emf));
+ e_mail_display_load (closure->display, emf->uri_base);
- g_object_unref (closure->activity);
- g_object_unref (closure->display);
- g_free (closure);
+ g_object_unref (closure->activity);
+ g_object_unref (closure->display);
+ g_free (closure);
- g_object_unref (result);
+ g_object_unref (result);
/* Remove the reference added when formatter was created,
* so that only owners are EMailDisplays */
- g_object_unref (emf);
+ g_object_unref (emf);
}
static void
mail_reader_set_display_formatter_for_message (EMailReader *reader,
- EMailDisplay *display,
- const gchar *message_uid,
- CamelMimeMessage *message,
- CamelFolder *folder)
+ EMailDisplay *display,
+ const gchar *message_uid,
+ CamelMimeMessage *message,
+ CamelFolder *folder)
{
SoupSession *session;
GHashTable *formatters;
@@ -3178,7 +3177,6 @@ mail_reader_message_loaded (EMailReader *reader,
(EEvent *) event, "message.reading",
(EEventTarget *) target);
-
mail_reader_set_display_formatter_for_message (
reader, display, message_uid, message, folder);
@@ -3814,7 +3812,7 @@ e_mail_reader_init (EMailReader *reader,
g_return_if_fail (E_IS_MAIL_READER (reader));
message_list = e_mail_reader_get_message_list (reader);
- display = e_mail_reader_get_mail_display (reader);
+ display = e_mail_reader_get_mail_display (reader);
if (!init_actions)
goto connect_signals;
@@ -3981,10 +3979,10 @@ e_mail_reader_init (EMailReader *reader,
G_CALLBACK (action_search_folder_sender_cb), reader);
action_name = "image-save";
- action = e_mail_display_get_action (display, action_name);
- g_signal_connect (
+ action = e_mail_display_get_action (display, action_name);
+ g_signal_connect (
action, "activate",
- G_CALLBACK (action_mail_image_save_cb), reader);
+ G_CALLBACK (action_mail_image_save_cb), reader);
#ifndef G_OS_WIN32
/* Lockdown integration. */
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index d380ae2..5357174 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -36,7 +36,7 @@ struct _EMailRequestPrivate {
static void
handle_mail_request (GSimpleAsyncResult *res,
GObject *object,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
EMailRequest *request = E_MAIL_REQUEST (object);
EMFormatHTML *efh = request->priv->efh;
@@ -71,7 +71,7 @@ handle_mail_request (GSimpleAsyncResult *res,
part_id = g_hash_table_lookup (request->priv->uri_query, "part_id");
if (part_id) {
/* original part_id is owned by the GHashTable */
- part_id = soup_uri_decode (part_id);
+ part_id = soup_uri_decode (part_id);
request->priv->puri = em_format_find_puri (emf, part_id);
if (request->priv->puri) {
@@ -84,26 +84,26 @@ handle_mail_request (GSimpleAsyncResult *res,
g_free (part_id);
} else {
- em_format_write (emf, request->priv->output_stream, &info, NULL);
- }
+ em_format_write (emf, request->priv->output_stream, &info, NULL);
+ }
/* Convert the GString to GInputStream and send it back to WebKit */
ba = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (request->priv->output_stream));
if (!ba->data) {
gchar *data = g_strdup_printf(_("Failed to load part '%s'"), part_id);
dd(printf("%s", data));
- g_byte_array_append (ba, (guchar*) data, strlen (data));
+ g_byte_array_append (ba, (guchar *) data, strlen (data));
g_free (data);
} else {
- dd({
- gchar *d = g_strndup ((gchar *) ba->data, ba->len);
+ dd ({
+ gchar *d = g_strndup ((gchar *) ba->data, ba->len);
printf("%s", d);
- g_free (d);
- });
+ g_free (d);
+ });
}
stream = g_memory_input_stream_new_from_data (
- (gchar*) ba->data, ba->len, NULL);
+ (gchar *) ba->data, ba->len, NULL);
g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
}
@@ -129,7 +129,7 @@ handle_file_request (GSimpleAsyncResult *res,
request->priv->content_length = length;
stream = g_memory_input_stream_new_from_data (
- contents, length, (GDestroyNotify) g_free);
+ contents, length, (GDestroyNotify) g_free);
g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
}
}
@@ -153,40 +153,40 @@ http_request_write_to_cache (GInputStream *stream,
GAsyncResult *res,
struct http_request_async_data *data)
{
- GError *error;
- gssize len;
+ GError *error;
+ gssize len;
- error = NULL;
- len = g_input_stream_read_finish (stream, res, &error);
+ error = NULL;
+ len = g_input_stream_read_finish (stream, res, &error);
/* Error while reading data */
- if (len == -1) {
+ if (len == -1) {
g_message ("Error while reading input stream: %s",
error ? error->message : "Unknown error");
- g_clear_error (&error);
+ g_clear_error (&error);
- g_main_loop_quit(data->loop);
+ g_main_loop_quit (data->loop);
if (data->buff)
- g_free (data->buff);
+ g_free (data->buff);
/* Don't keep broken data in cache */
camel_data_cache_remove (data->cache, "http", data->cache_key, NULL);
- return;
- }
+ return;
+ }
/* EOF */
- if (len == 0) {
- camel_stream_close (data->cache_stream, data->cancellable, NULL);
+ if (len == 0) {
+ camel_stream_close (data->cache_stream, data->cancellable, NULL);
- if (data->buff)
+ if (data->buff)
g_free (data->buff);
g_main_loop_quit (data->loop);
- return;
- }
+ return;
+ }
- if (!data->cache_stream) {
+ if (!data->cache_stream) {
if (data->buff)
g_free (data->buff);
@@ -196,12 +196,12 @@ http_request_write_to_cache (GInputStream *stream,
}
/* Write chunk to cache and read another block of data. */
- camel_stream_write (data->cache_stream, data->buff, len,
- data->cancellable, NULL);
+ camel_stream_write (data->cache_stream, data->buff, len,
+ data->cancellable, NULL);
- g_input_stream_read_async (stream, data->buff, 4096,
- G_PRIORITY_DEFAULT, data->cancellable,
- (GAsyncReadyCallback) http_request_write_to_cache, data);
+ g_input_stream_read_async (stream, data->buff, 4096,
+ G_PRIORITY_DEFAULT, data->cancellable,
+ (GAsyncReadyCallback) http_request_write_to_cache, data);
}
static void
@@ -209,41 +209,41 @@ http_request_finished (SoupRequest *request,
GAsyncResult *res,
struct http_request_async_data *data)
{
- GError *error;
- SoupMessage *message;
+ GError *error;
+ SoupMessage *message;
- error = NULL;
- data->stream = soup_request_send_finish (request, res, &error);
+ error = NULL;
+ data->stream = soup_request_send_finish (request, res, &error);
- if (!data->stream) {
+ if (!data->stream) {
g_warning("HTTP request failed: %s", error ? error->message: "Unknown error");
- g_clear_error (&error);
- g_main_loop_quit (data->loop);
- return;
- }
+ g_clear_error (&error);
+ g_main_loop_quit (data->loop);
+ return;
+ }
- message = soup_request_http_get_message (SOUP_REQUEST_HTTP (request));
- if (!SOUP_STATUS_IS_SUCCESSFUL (message->status_code)) {
+ message = soup_request_http_get_message (SOUP_REQUEST_HTTP (request));
+ if (!SOUP_STATUS_IS_SUCCESSFUL (message->status_code)) {
g_warning ("HTTP request failed: HTTP code %d", message->status_code);
- g_main_loop_quit (data->loop);
- g_object_unref (message);
- return;
- }
+ g_main_loop_quit (data->loop);
+ g_object_unref (message);
+ return;
+ }
- g_object_unref (message);
+ g_object_unref (message);
- data->content_length = soup_request_get_content_length (request);
- data->content_type = g_strdup (soup_request_get_content_type (request));
+ data->content_length = soup_request_get_content_length (request);
+ data->content_type = g_strdup (soup_request_get_content_type (request));
if (!data->cache_stream) {
g_main_loop_quit (data->loop);
return;
}
- data->buff = g_malloc (4096);
- g_input_stream_read_async (data->stream, data->buff, 4096,
- G_PRIORITY_DEFAULT, data->cancellable,
- (GAsyncReadyCallback) http_request_write_to_cache, data);
+ data->buff = g_malloc (4096);
+ g_input_stream_read_async (data->stream, data->buff, 4096,
+ G_PRIORITY_DEFAULT, data->cancellable,
+ (GAsyncReadyCallback) http_request_write_to_cache, data);
}
@@ -252,43 +252,43 @@ handle_http_request (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
- EMailRequest *request = E_MAIL_REQUEST (object);
- SoupURI *soup_uri;
- gchar *evo_uri, *uri;
- GInputStream *stream;
- gboolean force_load_images = FALSE;
+ EMailRequest *request = E_MAIL_REQUEST (object);
+ SoupURI *soup_uri;
+ gchar *evo_uri, *uri;
+ GInputStream *stream;
+ gboolean force_load_images = FALSE;
gchar *uri_md5;
- const gchar *user_cache_dir;
- CamelDataCache *cache;
- CamelStream *cache_stream;
+ const gchar *user_cache_dir;
+ CamelDataCache *cache;
+ CamelStream *cache_stream;
- gssize len;
- gchar *buff;
+ gssize len;
+ gchar *buff;
- GHashTable *query;
+ GHashTable *query;
/* Remove the __evo-mail query */
- soup_uri = soup_request_get_uri (SOUP_REQUEST (request));
- query = soup_form_decode (soup_uri->query);
+ soup_uri = soup_request_get_uri (SOUP_REQUEST (request));
+ query = soup_form_decode (soup_uri->query);
g_hash_table_remove (query, "__evo-mail");
/* Remove __evo-load-images if present (and in such case set
* force_load_images to TRUE) */
force_load_images = g_hash_table_remove (query, "__evo-load-images");
- soup_uri_set_query_from_form (soup_uri, query);
- g_hash_table_unref (query);
+ soup_uri_set_query_from_form (soup_uri, query);
+ g_hash_table_unref (query);
- evo_uri = soup_uri_to_string (soup_uri, FALSE);
+ evo_uri = soup_uri_to_string (soup_uri, FALSE);
/* Remove the "evo-" prefix from scheme */
- if (evo_uri && (strlen (evo_uri) > 5)) {
- uri = g_strdup (&evo_uri[4]);
- g_free (evo_uri);
- }
+ if (evo_uri && (strlen (evo_uri) > 5)) {
+ uri = g_strdup (&evo_uri[4]);
+ g_free (evo_uri);
+ }
- g_return_if_fail (uri && *uri);
+ g_return_if_fail (uri && *uri);
/* Use MD5 hash of the URI as a filname of the resourec cache file.
* We were previously using the URI as a filename but the URI is
@@ -296,93 +296,93 @@ handle_http_request (GSimpleAsyncResult *res,
uri_md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
/* Open Evolution's cache */
- user_cache_dir = e_get_user_cache_dir ();
- cache = camel_data_cache_new (user_cache_dir, NULL);
- if (cache) {
- camel_data_cache_set_expire_age (cache, 24*60*60);
- camel_data_cache_set_expire_access (cache, 2*60*60);
- }
+ user_cache_dir = e_get_user_cache_dir ();
+ cache = camel_data_cache_new (user_cache_dir, NULL);
+ if (cache) {
+ camel_data_cache_set_expire_age (cache, 24 * 60 * 60);
+ camel_data_cache_set_expire_access (cache, 2 * 60 * 60);
+ }
/* Found item in cache! */
cache_stream = camel_data_cache_get (cache, "http", uri_md5, NULL);
- if (cache_stream) {
+ if (cache_stream) {
- stream = g_memory_input_stream_new ();
+ stream = g_memory_input_stream_new ();
- request->priv->content_length = 0;
+ request->priv->content_length = 0;
- buff = g_malloc (4096);
- while ((len = camel_stream_read (cache_stream, buff, 4096,
- cancellable, NULL)) > 0) {
+ buff = g_malloc (4096);
+ while ((len = camel_stream_read (cache_stream, buff, 4096,
+ cancellable, NULL)) > 0) {
- g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (stream),
- buff, len, g_free);
- request->priv->content_length += len;
+ g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (stream),
+ buff, len, g_free);
+ request->priv->content_length += len;
- buff = g_malloc (4096);
- }
+ buff = g_malloc (4096);
+ }
- g_object_unref (cache_stream);
+ g_object_unref (cache_stream);
/* When succesfully read some data from cache then
* get mimetype and return the stream to WebKit.
* Otherwise try to fetch the resource again from the network. */
- if ((len != -1) && (request->priv->content_length > 0)) {
- GFile *file;
- GFileInfo *info;
- gchar *path;
+ if ((len != -1) && (request->priv->content_length > 0)) {
+ GFile *file;
+ GFileInfo *info;
+ gchar *path;
path = camel_data_cache_get_filename (cache, "http", uri_md5, NULL);
- file = g_file_new_for_path (path);
- info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
- 0, cancellable, NULL);
+ file = g_file_new_for_path (path);
+ info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ 0, cancellable, NULL);
- request->priv->mime_type = g_strdup (
- g_file_info_get_content_type (info));
+ request->priv->mime_type = g_strdup (
+ g_file_info_get_content_type (info));
d(printf ("'%s' found in cache (%d bytes, %s)\n",
- uri, request->priv->content_length,
- request->priv->mime_type));
+ uri, request->priv->content_length,
+ request->priv->mime_type));
- g_object_unref (info);
- g_object_unref (file);
- g_free (path);
+ g_object_unref (info);
+ g_object_unref (file);
+ g_free (path);
/* Set result and quit the thread */
- g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
+ g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
- goto cleanup;
- } else {
+ goto cleanup;
+ } else {
d(printf("Failed to load '%s' from cache.\n", uri));
- }
- }
+ }
+ }
/* Item not found in cache, but image loading policy allows us to fetch
* it from the interwebs */
- if (force_load_images || em_format_html_can_load_images (request->priv->efh)) {
+ if (force_load_images || em_format_html_can_load_images (request->priv->efh)) {
- SoupRequester *requester;
- SoupRequest *http_request;
- SoupSession *session;
- GMainContext *context;
+ SoupRequester *requester;
+ SoupRequest *http_request;
+ SoupSession *session;
+ GMainContext *context;
GError *error;
- struct http_request_async_data data;
+ struct http_request_async_data data;
- context = g_main_context_get_thread_default ();
- session = soup_session_async_new_with_options (
- SOUP_SESSION_ASYNC_CONTEXT, context, NULL);
+ context = g_main_context_get_thread_default ();
+ session = soup_session_async_new_with_options (
+ SOUP_SESSION_ASYNC_CONTEXT, context, NULL);
- requester = soup_requester_new ();
- soup_session_add_feature (session, SOUP_SESSION_FEATURE (requester));
+ requester = soup_requester_new ();
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (requester));
- http_request = soup_requester_request (requester, uri, NULL);
+ http_request = soup_requester_request (requester, uri, NULL);
error = NULL;
- data.loop = g_main_loop_new (context, TRUE);
- data.cancellable = cancellable;
- data.cache = cache;
- data.cache_key = uri_md5;
+ data.loop = g_main_loop_new (context, TRUE);
+ data.cancellable = cancellable;
+ data.cache = cache;
+ data.cache_key = uri_md5;
data.cache_stream = camel_data_cache_add (cache, "http", uri_md5, &error);
if (!data.cache_stream) {
@@ -394,35 +394,35 @@ handle_http_request (GSimpleAsyncResult *res,
/* Send the request and waint in mainloop until it's finished
* and copied to cache */
d(printf(" '%s' not in cache, sending HTTP request\n", uri));
- soup_request_send_async (http_request, cancellable,
- (GAsyncReadyCallback) http_request_finished, &data);
+ soup_request_send_async (http_request, cancellable,
+ (GAsyncReadyCallback) http_request_finished, &data);
- g_main_loop_run (data.loop);
+ g_main_loop_run (data.loop);
d(printf (" '%s' fetched from internet and (hopefully) stored in"
" cache\n", uri));
- g_main_loop_unref (data.loop);
+ g_main_loop_unref (data.loop);
- g_object_unref (session);
+ g_object_unref (session);
- g_object_unref (http_request);
- g_object_unref (requester);
+ g_object_unref (http_request);
+ g_object_unref (requester);
- stream = data.stream;
- if (!stream)
- goto cleanup;
+ stream = data.stream;
+ if (!stream)
+ goto cleanup;
- request->priv->content_length = data.content_length;
- request->priv->mime_type = data.content_type;
+ request->priv->content_length = data.content_length;
+ request->priv->mime_type = data.content_type;
- g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
+ g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
- goto cleanup;
+ goto cleanup;
- }
+ }
cleanup:
- g_free (uri);
+ g_free (uri);
g_free (uri_md5);
}
@@ -431,105 +431,105 @@ handle_stock_request (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
- EMailRequest *request;
- SoupURI *uri;
- GtkIconTheme *icon_theme;
- GtkIconInfo *icon_info;
- const gchar *file;
- gchar *a_size;
- gssize size;
- gchar *buffer;
- gsize buff_len;
- GtkStyleContext *context;
- GtkWidgetPath *path;
- GtkIconSet *set;
-
- request = E_MAIL_REQUEST (object);
- uri = soup_request_get_uri (SOUP_REQUEST (object));
-
- if (request->priv->uri_query) {
+ EMailRequest *request;
+ SoupURI *uri;
+ GtkIconTheme *icon_theme;
+ GtkIconInfo *icon_info;
+ const gchar *file;
+ gchar *a_size;
+ gssize size;
+ gchar *buffer;
+ gsize buff_len;
+ GtkStyleContext *context;
+ GtkWidgetPath *path;
+ GtkIconSet *set;
+
+ request = E_MAIL_REQUEST (object);
+ uri = soup_request_get_uri (SOUP_REQUEST (object));
+
+ if (request->priv->uri_query) {
a_size = g_hash_table_lookup (request->priv->uri_query, "size");
- } else {
- a_size = NULL;
- }
+ } else {
+ a_size = NULL;
+ }
- if (!a_size) {
- size = GTK_ICON_SIZE_BUTTON;
- } else {
- size = atoi(a_size);
- }
+ if (!a_size) {
+ size = GTK_ICON_SIZE_BUTTON;
+ } else {
+ size = atoi (a_size);
+ }
/* Try style context first */
- context = gtk_style_context_new ();
- path = gtk_widget_path_new ();
- gtk_widget_path_append_type (path, GTK_TYPE_WINDOW);
- gtk_widget_path_append_type (path, GTK_TYPE_BUTTON);
- gtk_style_context_set_path (context, path);
-
- set = gtk_style_context_lookup_icon_set (context, uri->host);
- if (!set) {
+ context = gtk_style_context_new ();
+ path = gtk_widget_path_new ();
+ gtk_widget_path_append_type (path, GTK_TYPE_WINDOW);
+ gtk_widget_path_append_type (path, GTK_TYPE_BUTTON);
+ gtk_style_context_set_path (context, path);
+
+ set = gtk_style_context_lookup_icon_set (context, uri->host);
+ if (!set) {
/* Fallback to icon theme */
- icon_theme = gtk_icon_theme_get_default ();
- icon_info = gtk_icon_theme_lookup_icon (
- icon_theme, uri->host, size,
- GTK_ICON_LOOKUP_USE_BUILTIN);
- if (!icon_info) {
- gtk_widget_path_free (path);
- g_object_unref (context);
- return;
- }
-
- file = gtk_icon_info_get_filename (icon_info);
- buffer = NULL;
- if (file) {
- if (g_file_get_contents (file, &buffer, &buff_len, NULL)) {
-
- request->priv->mime_type =
- g_content_type_guess (file, NULL, 0, NULL);
- request->priv->content_length = buff_len;
- }
-
- } else {
- GdkPixbuf *pixbuf;
-
- pixbuf = gtk_icon_info_get_builtin_pixbuf (icon_info);
- if (pixbuf) {
- gdk_pixbuf_save_to_buffer (
- pixbuf, &buffer,
+ icon_theme = gtk_icon_theme_get_default ();
+ icon_info = gtk_icon_theme_lookup_icon (
+ icon_theme, uri->host, size,
+ GTK_ICON_LOOKUP_USE_BUILTIN);
+ if (!icon_info) {
+ gtk_widget_path_free (path);
+ g_object_unref (context);
+ return;
+ }
+
+ file = gtk_icon_info_get_filename (icon_info);
+ buffer = NULL;
+ if (file) {
+ if (g_file_get_contents (file, &buffer, &buff_len, NULL)) {
+
+ request->priv->mime_type =
+ g_content_type_guess (file, NULL, 0, NULL);
+ request->priv->content_length = buff_len;
+ }
+
+ } else {
+ GdkPixbuf *pixbuf;
+
+ pixbuf = gtk_icon_info_get_builtin_pixbuf (icon_info);
+ if (pixbuf) {
+ gdk_pixbuf_save_to_buffer (
+ pixbuf, &buffer,
&buff_len, "png", NULL, NULL);
request->priv->mime_type = g_strdup("image/png");
- request->priv->content_length = buff_len;
+ request->priv->content_length = buff_len;
- g_object_unref (pixbuf);
- }
- }
+ g_object_unref (pixbuf);
+ }
+ }
- gtk_icon_info_free (icon_info);
+ gtk_icon_info_free (icon_info);
- } else {
- GdkPixbuf *pixbuf;
+ } else {
+ GdkPixbuf *pixbuf;
- pixbuf = gtk_icon_set_render_icon_pixbuf (set, context, size);
- gdk_pixbuf_save_to_buffer (
- pixbuf, &buffer,
+ pixbuf = gtk_icon_set_render_icon_pixbuf (set, context, size);
+ gdk_pixbuf_save_to_buffer (
+ pixbuf, &buffer,
&buff_len, "png", NULL, NULL);
request->priv->mime_type = g_strdup("image/png");
- request->priv->content_length = buff_len;
+ request->priv->content_length = buff_len;
- g_object_unref (pixbuf);
- }
+ g_object_unref (pixbuf);
+ }
- if (buffer) {
- GInputStream *stream;
- stream = g_memory_input_stream_new_from_data (
- buffer, buff_len, (GDestroyNotify) g_free);
- g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
- }
+ if (buffer) {
+ GInputStream *stream;
+ stream = g_memory_input_stream_new_from_data (
+ buffer, buff_len, (GDestroyNotify) g_free);
+ g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
+ }
- gtk_widget_path_free (path);
- g_object_unref (context);
+ gtk_widget_path_free (path);
+ g_object_unref (context);
}
@@ -537,7 +537,7 @@ static void
e_mail_request_init (EMailRequest *request)
{
request->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- request, E_TYPE_MAIL_REQUEST, EMailRequestPrivate);
+ request, E_TYPE_MAIL_REQUEST, EMailRequestPrivate);
request->priv->efh = NULL;
request->priv->output_stream = NULL;
@@ -568,15 +568,15 @@ mail_request_finalize (GObject *object)
}
if (request->priv->ret_mime_type) {
- g_free (request->priv->ret_mime_type);
- request->priv->ret_mime_type = NULL;
- }
+ g_free (request->priv->ret_mime_type);
+ request->priv->ret_mime_type = NULL;
+ }
G_OBJECT_CLASS (e_mail_request_parent_class)->finalize (object);
}
static gboolean
-mail_request_check_uri(SoupRequest *request,
+mail_request_check_uri (SoupRequest *request,
SoupURI *uri,
GError **error)
{
@@ -589,15 +589,15 @@ mail_request_check_uri(SoupRequest *request,
static void
mail_request_send_async (SoupRequest *request,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
SoupSession *session;
EMailRequest *emr = E_MAIL_REQUEST (request);
GSimpleAsyncResult *result;
SoupURI *uri;
- GHashTable *formatters;
+ GHashTable *formatters;
session = soup_request_get_session (request);
uri = soup_request_get_uri (request);
@@ -610,41 +610,39 @@ mail_request_send_async (SoupRequest *request,
* oridnary file:// */
if (g_strcmp0 (uri->scheme, "evo-file") == 0) {
- result = g_simple_async_result_new (G_OBJECT (request), callback,
- user_data, mail_request_send_async);
- g_simple_async_result_run_in_thread (result, handle_file_request,
- G_PRIORITY_DEFAULT, cancellable);
-
- return;
- }
-
- if (uri->query) {
- emr->priv->uri_query = soup_form_decode (uri->query);
- } else {
- emr->priv->uri_query = NULL;
- }
+ result = g_simple_async_result_new (G_OBJECT (request), callback,
+ user_data, mail_request_send_async);
+ g_simple_async_result_run_in_thread (result, handle_file_request,
+ G_PRIORITY_DEFAULT, cancellable);
+ return;
+ }
+ if (uri->query) {
+ emr->priv->uri_query = soup_form_decode (uri->query);
+ } else {
+ emr->priv->uri_query = NULL;
+ }
formatters = g_object_get_data (G_OBJECT (session), "formatters");
- g_return_if_fail (formatters != NULL);
+ g_return_if_fail (formatters != NULL);
/* Get HTML content of given PURI part */
if (g_strcmp0 (uri->scheme, "mail") == 0) {
- gchar *uri_str;
+ gchar *uri_str;
uri_str = g_strdup_printf ("%s://%s%s", uri->scheme, uri->host, uri->path);
- emr->priv->efh = g_hash_table_lookup (formatters, uri_str);
- g_free (uri_str);
+ emr->priv->efh = g_hash_table_lookup (formatters, uri_str);
+ g_free (uri_str);
- g_return_if_fail (emr->priv->efh);
+ g_return_if_fail (emr->priv->efh);
result = g_simple_async_result_new (G_OBJECT (request), callback,
- user_data, mail_request_send_async);
+ user_data, mail_request_send_async);
g_simple_async_result_run_in_thread (result, handle_mail_request,
- G_PRIORITY_DEFAULT, cancellable);
+ G_PRIORITY_DEFAULT, cancellable);
- return;
+ return;
/* For http and https requests we have this evo-http(s) protocol.
* We first try to lookup the data in local cache and when not found,
@@ -653,41 +651,41 @@ mail_request_send_async (SoupRequest *request,
} else if ((g_strcmp0 (uri->scheme, "evo-http") == 0) ||
(g_strcmp0 (uri->scheme, "evo-https") == 0)) {
- gchar *mail_uri;
- const gchar *enc = g_hash_table_lookup (emr->priv->uri_query,
+ gchar *mail_uri;
+ const gchar *enc = g_hash_table_lookup (emr->priv->uri_query,
"__evo-mail");
- g_return_if_fail (enc && *enc);
+ g_return_if_fail (enc && *enc);
- mail_uri = soup_uri_decode (enc);
+ mail_uri = soup_uri_decode (enc);
- emr->priv->efh = g_hash_table_lookup (formatters, mail_uri);
- g_free (mail_uri);
+ emr->priv->efh = g_hash_table_lookup (formatters, mail_uri);
+ g_free (mail_uri);
- g_return_if_fail (emr->priv->efh);
+ g_return_if_fail (emr->priv->efh);
- result = g_simple_async_result_new (G_OBJECT (request), callback,
- user_data, mail_request_send_async);
- g_simple_async_result_run_in_thread (result, handle_http_request,
- G_PRIORITY_DEFAULT, cancellable);
+ result = g_simple_async_result_new (G_OBJECT (request), callback,
+ user_data, mail_request_send_async);
+ g_simple_async_result_run_in_thread (result, handle_http_request,
+ G_PRIORITY_DEFAULT, cancellable);
- return;
+ return;
} else if ((g_strcmp0 (uri->scheme, "gtk-stock") == 0)) {
- result = g_simple_async_result_new (G_OBJECT (request), callback,
- user_data, mail_request_send_async);
- g_simple_async_result_run_in_thread (result, handle_stock_request,
- G_PRIORITY_DEFAULT, cancellable);
+ result = g_simple_async_result_new (G_OBJECT (request), callback,
+ user_data, mail_request_send_async);
+ g_simple_async_result_run_in_thread (result, handle_stock_request,
+ G_PRIORITY_DEFAULT, cancellable);
- return;
- }
+ return;
+ }
}
-static GInputStream*
+static GInputStream *
mail_request_send_finish (SoupRequest *request,
- GAsyncResult *result,
- GError **error)
+ GAsyncResult *result,
+ GError **error)
{
GInputStream *stream;
@@ -696,7 +694,7 @@ mail_request_send_finish (SoupRequest *request,
/* Reset the stream before passing it back to webkit */
if (stream)
- g_seekable_seek (G_SEEKABLE (stream), 0, G_SEEK_SET, NULL, NULL);
+ g_seekable_seek (G_SEEKABLE (stream), 0, G_SEEK_SET, NULL, NULL);
else /* We must always return something */
stream = g_memory_input_stream_new ();
@@ -723,7 +721,7 @@ mail_request_get_content_length (SoupRequest *request)
return content_length;
}
-static const gchar*
+static const gchar *
mail_request_get_content_type (SoupRequest *request)
{
EMailRequest *emr = E_MAIL_REQUEST (request);
@@ -742,14 +740,14 @@ mail_request_get_content_type (SoupRequest *request)
if (g_strcmp0 (mime_type, "text/html") == 0) {
emr->priv->ret_mime_type = g_strconcat (mime_type, "; charset=\"UTF-8\"", NULL);
- g_free (mime_type);
- } else {
- emr->priv->ret_mime_type = mime_type;
- }
+ g_free (mime_type);
+ } else {
+ emr->priv->ret_mime_type = mime_type;
+ }
d(printf("Content-Type: %s\n", emr->priv->ret_mime_type));
- return emr->priv->ret_mime_type;
+ return emr->priv->ret_mime_type;
}
static const char *data_schemes[] = { "mail", "evo-file", "evo-http", "evo-https", "gtk-stock", NULL };
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index d53289d..74a3d5b 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2523,9 +2523,9 @@ emae_refresh_providers (EMAccountEditor *emae,
GTK_COMBO_BOX (combo_box), service->protocol);
/* make sure at least something is selected;
- this applies for cases when user changed from provider which was
- store and transport together, to a store provider only (like from
- exchange to imap provider), which left unselected transport type
+ * this applies for cases when user changed from provider which was
+ * store and transport together, to a store provider only (like from
+ * exchange to imap provider), which left unselected transport type
*/
if (gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box)) == -1)
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index c5b99cc..f4b8560 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -936,9 +936,9 @@ composer_print_done_cb (EMailPrinter *emp,
GtkPrintOperationResult result,
gpointer user_data)
{
- EMFormat *emf = user_data;
- g_object_unref (emf);
- g_object_unref (emp);
+ EMFormat *emf = user_data;
+ g_object_unref (emf);
+ g_object_unref (emp);
}
static void
@@ -948,21 +948,21 @@ em_utils_composer_print_cb (EMsgComposer *composer,
EActivity *activity,
EMailSession *session)
{
- EMailPrinter *emp;
- EMFormatHTMLDisplay *efhd;
+ EMailPrinter *emp;
+ EMFormatHTMLDisplay *efhd;
efhd = em_format_html_display_new ();
- ((EMFormat *) efhd)->message_uid = g_strdup (camel_mime_message_get_message_id (message));
+ ((EMFormat *) efhd)->message_uid = g_strdup (camel_mime_message_get_message_id (message));
/* Parse the message */
- em_format_parse ((EMFormat *) efhd, message, NULL, NULL);
+ em_format_parse ((EMFormat *) efhd, message, NULL, NULL);
/* Use EMailPrinter and WebKit to print the message */
- emp = e_mail_printer_new ((EMFormatHTML *) efhd);
+ emp = e_mail_printer_new ((EMFormatHTML *) efhd);
g_signal_connect (emp, "done",
- G_CALLBACK (composer_print_done_cb), efhd);
+ G_CALLBACK (composer_print_done_cb), efhd);
- e_mail_printer_print (emp, FALSE, NULL);
+ e_mail_printer_print (emp, FALSE, NULL);
}
/* Composing messages... */
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 812d17e..7ceeb20 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -62,10 +62,10 @@ G_DEFINE_TYPE (EMFormatHook, em_format_hook, E_TYPE_PLUGIN_HOOK)
static void
emfh_parse_part (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
struct _EMFormatHookItem *item = (EMFormatHookItem *) info->handler;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index ee861bd..8f20169 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -109,15 +109,15 @@ static const GdkRGBA smime_sign_colour[5] = {
{ 0 }, { 0.53, 0.73, 0.53, 1 }, { 0.73, 0.53, 0.53, 1 }, { 0.91, 0.82, 0.13, 1 }, { 0 },
};
-static void efhd_message_prefix (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
+static void efhd_message_prefix (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
static void efhd_message_add_bar (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
static void efhd_parse_attachment (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
static void efhd_parse_secure (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
static void efhd_parse_optional (EMFormat *emf, CamelMimePart *part, GString *part_id, EMFormatParserInfo *info, GCancellable *cancellable);
-static GtkWidget* efhd_attachment_bar (EMFormat *emf, EMFormatPURI *puri, GCancellable *cancellable);
-static GtkWidget* efhd_attachment_button (EMFormat *emf, EMFormatPURI *puri, GCancellable *cancellable);
-static GtkWidget* efhd_attachment_optional (EMFormat *emf, EMFormatPURI *puri, GCancellable *cancellable);
+static GtkWidget * efhd_attachment_bar (EMFormat *emf, EMFormatPURI *puri, GCancellable *cancellable);
+static GtkWidget * efhd_attachment_button (EMFormat *emf, EMFormatPURI *puri, GCancellable *cancellable);
+static GtkWidget * efhd_attachment_optional (EMFormat *emf, EMFormatPURI *puri, GCancellable *cancellable);
static void efhd_write_attachment_bar (EMFormat *emf, EMFormatPURI *emp, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
static void efhd_write_attachment (EMFormat *emf, EMFormatPURI *emp, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
@@ -129,13 +129,14 @@ static void efhd_builtin_init (EMFormatHTMLDisplayClass *efhc);
static gpointer parent_class;
-static EAttachmentStore*
-find_parent_attachment_store (EMFormatHTMLDisplay *efhd, const gchar *part_id)
+static EAttachmentStore *
+find_parent_attachment_store (EMFormatHTMLDisplay *efhd,
+ const gchar *part_id)
{
EMFormat *emf = (EMFormat *) efhd;
EMFormatAttachmentBarPURI *abp;
gchar *tmp, *pos;
- GList *item;
+ GList *item;
tmp = g_strdup (part_id);
@@ -160,10 +161,10 @@ find_parent_attachment_store (EMFormatHTMLDisplay *efhd, const gchar *part_id)
abp = (EMFormatAttachmentBarPURI *) item->data;
- if (abp)
- return abp->store;
- else
- return NULL;
+ if (abp)
+ return abp->store;
+ else
+ return NULL;
}
static void
@@ -383,12 +384,12 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
g_signal_connect (
po->widget, "response",
- G_CALLBACK(efhd_xpkcs7mime_info_response), po);
+ G_CALLBACK (efhd_xpkcs7mime_info_response), po);
gtk_widget_show (po->widget);
}
-static GtkWidget*
+static GtkWidget *
efhd_xpkcs7mime_button (EMFormat *emf,
EMFormatPURI *puri,
GCancellable *cancellable)
@@ -435,19 +436,19 @@ struct attachment_load_data {
static void
attachment_loaded (EAttachment *attachment,
- GAsyncResult *res,
- gpointer user_data)
+ GAsyncResult *res,
+ gpointer user_data)
{
struct attachment_load_data *data = user_data;
EShell *shell;
GtkWindow *window;
-
+
shell = e_shell_get_default ();
window = e_shell_get_active_window (shell);
if (!E_IS_SHELL_WINDOW (window))
window = NULL;
-
- e_attachment_load_handle_error (data->attachment, res, window);
+
+ e_attachment_load_handle_error (data->attachment, res, window);
e_flag_set (data->flag);
}
@@ -459,10 +460,9 @@ load_attachment_idle (struct attachment_load_data *data)
e_attachment_load_async (data->attachment,
(GAsyncReadyCallback) attachment_loaded, data);
- return FALSE;
+ return FALSE;
}
-
static void
efhd_parse_attachment (EMFormat *emf,
CamelMimePart *part,
@@ -504,7 +504,7 @@ efhd_parse_attachment (EMFormat *emf,
g_free (text);
g_free (mime_type);
- puri = (EMFormatAttachmentPURI*) em_format_puri_new (
+ puri = (EMFormatAttachmentPURI *) em_format_puri_new (
emf, sizeof (EMFormatAttachmentPURI), part, part_id->str);
puri->puri.free = efhd_free_attach_puri_data;
puri->puri.write_func = efhd_write_attachment;
@@ -515,38 +515,38 @@ efhd_parse_attachment (EMFormat *emf,
puri->attachment_view_part_id = NULL;
puri->description = html;
puri->handle = handler;
- if (info->validity)
- puri->puri.validity = camel_cipher_validity_clone (info->validity);
+ if (info->validity)
+ puri->puri.validity = camel_cipher_validity_clone (info->validity);
cid = camel_mime_part_get_content_id (part);
if (cid)
puri->puri.cid = g_strdup_printf ("cid:%s", cid);
if (handler) {
- CamelContentType *ct;
+ CamelContentType *ct;
/* This mime_type is important for WebKit to determine content type.
* We have converted text/ * to text/html, other (binary) formats remained
* untouched. */
- ct = camel_content_type_decode (handler->mime_type);
+ ct = camel_content_type_decode (handler->mime_type);
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);
- }
+ else
+ puri->puri.mime_type = camel_content_type_simple (ct);
+ camel_content_type_unref (ct);
+ }
em_format_add_puri (emf, (EMFormatPURI *) puri);
/* Though it is an attachment, we still might be able to parse it and
* so discover some parts that we might be even able to display. */
- if (handler && handler->parse_func && (handler->parse_func != efhd_parse_attachment)&&
- ((handler->flags & EM_FORMAT_HANDLER_COMPOUND_TYPE) ||
- (handler->flags & EM_FORMAT_HANDLER_INLINE_DISPOSITION))) {
+ if (handler && handler->parse_func && (handler->parse_func != efhd_parse_attachment) &&
+ ((handler->flags & EM_FORMAT_HANDLER_COMPOUND_TYPE) ||
+ (handler->flags & EM_FORMAT_HANDLER_INLINE_DISPOSITION))) {
GList *i;
- EMFormatParserInfo attachment_info = { .handler = handler,
- .is_attachment = TRUE };
- handler->parse_func (emf, puri->puri.part, part_id, &attachment_info, cancellable);
+ EMFormatParserInfo attachment_info = { .handler = handler,
+ .is_attachment = TRUE };
+ handler->parse_func (emf, puri->puri.part, part_id, &attachment_info, cancellable);
i = g_hash_table_lookup (emf->mail_part_table, part_id->str);
if (i->next && i->next->data) {
@@ -554,14 +554,14 @@ efhd_parse_attachment (EMFormat *emf,
puri->attachment_view_part_id = g_strdup (p->uri);
can_show = TRUE;
}
- }
+ }
e_attachment_set_mime_part (puri->attachment, part);
e_attachment_set_shown (puri->attachment, puri->shown);
- if (puri->puri.validity) {
- e_attachment_set_signed (puri->attachment, puri->puri.validity->sign.status);
- e_attachment_set_encrypted (puri->attachment, puri->puri.validity->encrypt.status);
- }
+ if (puri->puri.validity) {
+ e_attachment_set_signed (puri->attachment, puri->puri.validity->sign.status);
+ e_attachment_set_encrypted (puri->attachment, puri->puri.validity->encrypt.status);
+ }
e_attachment_set_can_show (puri->attachment,
can_show || (puri->handle && puri->handle->write_func));
@@ -569,31 +569,31 @@ efhd_parse_attachment (EMFormat *emf,
e_attachment_store_add_attachment (store, puri->attachment);
if (emf->folder && emf->folder->summary && emf->message_uid) {
- CamelDataWrapper *dw = camel_medium_get_content (CAMEL_MEDIUM (puri->puri.part));
- GByteArray *ba;
- ba = camel_data_wrapper_get_byte_array (dw);
- if (ba) {
- size = ba->len;
-
- if (camel_mime_part_get_encoding (puri->puri.part) == CAMEL_TRANSFER_ENCODING_BASE64)
- size = size / 1.37;
- }
+ CamelDataWrapper *dw = camel_medium_get_content (CAMEL_MEDIUM (puri->puri.part));
+ GByteArray *ba;
+ ba = camel_data_wrapper_get_byte_array (dw);
+ if (ba) {
+ size = ba->len;
+
+ if (camel_mime_part_get_encoding (puri->puri.part) == CAMEL_TRANSFER_ENCODING_BASE64)
+ size = size / 1.37;
+ }
}
load_data = g_new0 (struct attachment_load_data, 1);
load_data->attachment = g_object_ref (puri->attachment);
load_data->flag = e_flag_new ();
- e_flag_clear (load_data->flag);
+ e_flag_clear (load_data->flag);
/* e_attachment_load_async must be called from main thread */
- g_idle_add ((GSourceFunc) load_attachment_idle, load_data);
+ g_idle_add ((GSourceFunc) load_attachment_idle, load_data);
e_flag_wait (load_data->flag);
- e_flag_free (load_data->flag);
- g_object_unref (load_data->attachment);
- g_free (load_data);
+ e_flag_free (load_data->flag);
+ g_object_unref (load_data->attachment);
+ g_free (load_data);
if (size != 0) {
GFileInfo *fileinfo;
@@ -614,9 +614,9 @@ efhd_parse_optional (EMFormat *emf,
GCancellable *cancellable)
{
EMFormatAttachmentPURI *puri;
- gint len;
+ gint len;
- len = part_id->len;
+ len = part_id->len;
g_string_append (part_id, ".optional");
puri = (EMFormatAttachmentPURI *) em_format_puri_new (
@@ -633,9 +633,9 @@ efhd_parse_optional (EMFormat *emf,
puri->description = g_strdup(_("Evolution cannot render this email as it is too "
"large to process. You can view it unformatted or "
"with an external text editor."));
-
+
puri->mstream = CAMEL_STREAM_MEM (camel_stream_mem_new ());
- camel_data_wrapper_decode_to_stream_sync ((CamelDataWrapper *) part,
+ camel_data_wrapper_decode_to_stream_sync ((CamelDataWrapper *) part,
(CamelStream *) puri->mstream, cancellable, NULL);
if (info->validity) {
@@ -649,10 +649,10 @@ efhd_parse_optional (EMFormat *emf,
static void
efhd_parse_secure (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
if (info->validity
&& (info->validity->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE
@@ -667,7 +667,7 @@ efhd_parse_secure (EMFormat *emf,
pobj->puri.widget_func = efhd_xpkcs7mime_button;
pobj->puri.write_func = efhd_write_secure_button;
- em_format_add_puri (emf, (EMFormatPURI*) pobj);
+ em_format_add_puri (emf, (EMFormatPURI *) pobj);
buffer = g_string_new ("");
@@ -703,19 +703,19 @@ efhd_parse_secure (EMFormat *emf,
/******************************************************************************/
static void
efhd_write_attachment_bar (EMFormat *emf,
- EMFormatPURI *puri,
+ EMFormatPURI *puri,
CamelStream *stream,
EMFormatWriterInfo *info,
GCancellable *cancellable)
{
- EMFormatAttachmentBarPURI *efab = (EMFormatAttachmentBarPURI *) puri;
- gchar *str;
+ EMFormatAttachmentBarPURI *efab = (EMFormatAttachmentBarPURI *) puri;
+ gchar *str;
- if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING)
- return;
+ if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING)
+ return;
- if (e_attachment_store_get_num_attachments (efab->store) == 0)
- return;
+ if (e_attachment_store_get_num_attachments (efab->store) == 0)
+ return;
str = g_strdup_printf (
"<object type=\"application/x-attachment-bar\" "
@@ -724,47 +724,47 @@ efhd_write_attachment_bar (EMFormat *emf,
camel_stream_write_string (stream, str, cancellable, NULL);
- g_free (str);
+ g_free (str);
}
static void
efhd_write_attachment (EMFormat *emf,
- EMFormatPURI *puri,
+ EMFormatPURI *puri,
CamelStream *stream,
EMFormatWriterInfo *info,
GCancellable *cancellable)
{
- gchar *str, *desc;
- const gchar *mime_type;
- gchar *button_id;
+ gchar *str, *desc;
+ const gchar *mime_type;
+ gchar *button_id;
- EMFormatAttachmentPURI *efa = (EMFormatAttachmentPURI *) puri;
+ EMFormatAttachmentPURI *efa = (EMFormatAttachmentPURI *) puri;
/* If the attachment is requested as RAW, then call the handler directly
* and do not append any other code. */
- if ((info->mode == EM_FORMAT_WRITE_MODE_RAW) &&
- efa->handle && efa->handle->write_func) {
+ if ((info->mode == EM_FORMAT_WRITE_MODE_RAW) &&
+ efa->handle && efa->handle->write_func) {
- efa->handle->write_func (emf, puri, stream, info, cancellable);
- return;
- }
+ efa->handle->write_func (emf, puri, stream, info, cancellable);
+ return;
+ }
- if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING) {
+ if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING) {
- if (efa->handle && efa->handle->write_func)
- efa->handle->write_func (emf, puri, stream, info, cancellable);
+ if (efa->handle && efa->handle->write_func)
+ efa->handle->write_func (emf, puri, stream, info, cancellable);
- return;
- }
+ return;
+ }
- if (efa->handle)
- mime_type = efa->handle->mime_type;
- else
- mime_type = efa->snoop_mime_type;
+ if (efa->handle)
+ mime_type = efa->handle->mime_type;
+ else
+ mime_type = efa->snoop_mime_type;
button_id = g_strconcat (puri->uri, ".attachment_button", NULL);
- desc = em_format_describe_part (puri->part, mime_type);
+ desc = em_format_describe_part (puri->part, mime_type);
str = g_strdup_printf (
"<div class=\"attachment\">"
"<table width=\"100%%\" border=\"0\">"
@@ -776,22 +776,22 @@ efhd_write_attachment (EMFormat *emf,
"<td align=\"left\">%s</td>"
"</tr>", puri->uri, button_id, desc);
- camel_stream_write_string (stream, str, cancellable, NULL);
- g_free (desc);
- g_free (button_id);
- g_free (str);
+ camel_stream_write_string (stream, str, cancellable, NULL);
+ g_free (desc);
+ g_free (button_id);
+ g_free (str);
/* If we know how to write the attachment, then do it */
- if ((efa->handle && efa->handle->write_func) ||
+ if ((efa->handle && efa->handle->write_func) ||
(efa->attachment_view_part_id)) {
- str = g_strdup_printf (
+ str = g_strdup_printf (
"<tr><td colspan=\"2\">"
"<div class=\"attachment-wrapper\" id=\"%s\">",
- puri->uri);
+ puri->uri);
- camel_stream_write_string (stream, str, cancellable, NULL);
- g_free (str);
+ camel_stream_write_string (stream, str, cancellable, NULL);
+ g_free (str);
if (efa->handle->write_func) {
efa->handle->write_func (
@@ -806,32 +806,32 @@ efhd_write_attachment (EMFormat *emf,
}
camel_stream_write_string (stream, "</div></td></tr>", cancellable, NULL);
- }
+ }
camel_stream_write_string (stream, "</table></div>", cancellable, NULL);
}
static void
efhd_write_secure_button (EMFormat *emf,
- EMFormatPURI *puri,
+ EMFormatPURI *puri,
CamelStream *stream,
EMFormatWriterInfo *info,
GCancellable *cancellable)
{
- gchar *str;
+ gchar *str;
- if ((info->mode != EM_FORMAT_WRITE_MODE_NORMAL) &&
- (info->mode != EM_FORMAT_WRITE_MODE_RAW))
- return;
+ if ((info->mode != EM_FORMAT_WRITE_MODE_NORMAL) &&
+ (info->mode != EM_FORMAT_WRITE_MODE_RAW))
+ return;
- str = g_strdup_printf (
+ str = g_strdup_printf (
"<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);
+ camel_stream_write_string (stream, str, cancellable, NULL);
- g_free (str);
+ g_free (str);
}
static void
@@ -849,9 +849,9 @@ efhd_finalize (GObject *object)
static void
efhd_preparse (EMFormat *emf)
{
- EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *) emf;
+ EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *) emf;
- efhd->priv->last_view = NULL;
+ efhd->priv->last_view = NULL;
}
static void
@@ -859,7 +859,7 @@ efhd_class_init (EMFormatHTMLDisplayClass *class)
{
GObjectClass *object_class;
EMFormatHTMLClass *format_html_class;
- EMFormatClass *format_class;
+ EMFormatClass *format_class;
parent_class = g_type_class_peek_parent (class);
g_type_class_add_private (class, sizeof (EMFormatHTMLDisplayPrivate));
@@ -870,8 +870,8 @@ efhd_class_init (EMFormatHTMLDisplayClass *class)
format_html_class = EM_FORMAT_HTML_CLASS (class);
format_html_class->html_widget_type = E_TYPE_MAIL_DISPLAY;
- format_class = EM_FORMAT_CLASS (class);
- format_class->preparse = efhd_preparse;
+ format_class = EM_FORMAT_CLASS (class);
+ format_class->preparse = efhd_preparse;
efhd_builtin_init (class);
}
@@ -1021,10 +1021,10 @@ efhd_message_prefix (EMFormat *emf,
/* ********************************************************************** */
/* attachment button callback */
-static GtkWidget*
+static GtkWidget *
efhd_attachment_button (EMFormat *emf,
- EMFormatPURI *puri,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ GCancellable *cancellable)
{
EMFormatAttachmentPURI *info = (EMFormatAttachmentPURI *) puri;
GtkWidget *widget;
@@ -1044,9 +1044,9 @@ efhd_attachment_button (EMFormat *emf,
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 (
- E_ATTACHMENT_BUTTON (widget),
- EM_FORMAT_HTML_DISPLAY (emf)->priv->last_view);
+ e_attachment_button_set_view (
+ E_ATTACHMENT_BUTTON (widget),
+ EM_FORMAT_HTML_DISPLAY (emf)->priv->last_view);
gtk_widget_set_can_focus (widget, TRUE);
gtk_widget_show (widget);
@@ -1054,16 +1054,16 @@ efhd_attachment_button (EMFormat *emf,
return widget;
}
-static GtkWidget*
+static GtkWidget *
efhd_attachment_bar (EMFormat *emf,
- EMFormatPURI *puri,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ GCancellable *cancellable)
{
EMFormatAttachmentBarPURI *abp = (EMFormatAttachmentBarPURI *) puri;
GtkWidget *widget;
- widget = e_mail_attachment_bar_new (abp->store);
- EM_FORMAT_HTML_DISPLAY (emf)->priv->last_view = (EAttachmentView *) widget;
+ widget = e_mail_attachment_bar_new (abp->store);
+ EM_FORMAT_HTML_DISPLAY (emf)->priv->last_view = (EAttachmentView *) widget;
return widget;
}
@@ -1090,7 +1090,7 @@ efhd_message_add_bar (EMFormat *emf,
puri->puri.free = efhd_attachment_bar_puri_free;
puri->store = E_ATTACHMENT_STORE (e_attachment_store_new ());
- em_format_add_puri (emf, (EMFormatPURI*) puri);
+ em_format_add_puri (emf, (EMFormatPURI *) puri);
g_string_truncate (part_id, len);
}
@@ -1110,12 +1110,11 @@ efhd_optional_button_show (GtkWidget *widget,
}
}
-
/* optional render attachment button callback */
-static GtkWidget*
+static GtkWidget *
efhd_attachment_optional (EMFormat *efh,
- EMFormatPURI *puri,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ GCancellable *cancellable)
{
GtkWidget *hbox, *vbox, *button, *mainbox, *scroll, *label, *img;
AtkObject *a11y;
diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h
index cf3cac4..c1b22ee 100644
--- a/mail/em-format-html-display.h
+++ b/mail/em-format-html-display.h
@@ -71,7 +71,7 @@ struct _EMFormatAttachmentPURI {
/* for the > and V buttons */
GtkWidget *forward, *down;
- guint shown:1;
+ guint shown : 1;
/* Attachment */
EAttachment *attachment;
@@ -98,7 +98,6 @@ struct _EMFormatSMIMEPURI {
GtkWidget *widget;
};
-
struct _EMFormatHTMLDisplay {
EMFormatHTML parent;
EMFormatHTMLDisplayPrivate *priv;
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index 6364177..b17cc3c 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -60,7 +60,7 @@ enum {
static void efhp_write_print_layout (EMFormat *emf, EMFormatPURI *puri, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
static void efhp_write_headers (EMFormat *emf, EMFormatPURI *puri, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
-static void efhp_write_inline_attachment(EMFormat *emf, EMFormatPURI *puri, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
+static void efhp_write_inline_attachment (EMFormat *emf, EMFormatPURI *puri, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
static void
efhp_write_attachments_list (EMFormatHTMLPrint *efhp,
@@ -68,65 +68,65 @@ efhp_write_attachments_list (EMFormatHTMLPrint *efhp,
EMFormatWriterInfo *info,
GCancellable *cancellable)
{
- GString *str;
- GList *iter;
+ GString *str;
+ GList *iter;
- if (!efhp->priv->attachments)
- return;
+ if (!efhp->priv->attachments)
+ return;
- str = g_string_new (
+ str = g_string_new (
"<table border=\"0\" cellspacing=\"5\" cellpadding=\"0\" "
"class=\"attachments-list\" >\n");
- g_string_append_printf (str,
+ 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"));
- for (iter = efhp->priv->attachments; iter; iter = iter->next) {
- EMFormatPURI *puri = iter->data;
- EAttachment *attachment;
- GFileInfo *fi;
- gchar *name, *size;
- GByteArray *ba;
- CamelDataWrapper *dw;
-
- attachment = ((EMFormatAttachmentPURI *) puri)->attachment;
- fi = e_attachment_get_file_info (attachment);
- if (!fi)
- continue;
+ for (iter = efhp->priv->attachments; iter; iter = iter->next) {
+ EMFormatPURI *puri = iter->data;
+ EAttachment *attachment;
+ GFileInfo *fi;
+ gchar *name, *size;
+ GByteArray *ba;
+ CamelDataWrapper *dw;
+
+ attachment = ((EMFormatAttachmentPURI *) puri)->attachment;
+ fi = e_attachment_get_file_info (attachment);
+ if (!fi)
+ continue;
- if (e_attachment_get_description (attachment) &&
+ if (e_attachment_get_description (attachment) &&
*e_attachment_get_description (attachment)) {
name = g_strdup_printf ("%s (%s)",
- e_attachment_get_description (attachment),
- g_file_info_get_display_name (fi));
- } else {
- name = g_strdup (g_file_info_get_display_name (fi));
- }
+ e_attachment_get_description (attachment),
+ g_file_info_get_display_name (fi));
+ } else {
+ name = g_strdup (g_file_info_get_display_name (fi));
+ }
- dw = camel_medium_get_content ((CamelMedium *) puri->part);
- ba = camel_data_wrapper_get_byte_array (dw);
- size = g_format_size (ba->len);
+ dw = camel_medium_get_content ((CamelMedium *) puri->part);
+ 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",
- name, size);
+ name, size);
- g_free (name);
- g_free (size);
- }
+ g_free (name);
+ g_free (size);
+ }
g_string_append (str, "</table>\n");
- camel_stream_write_string (stream, str->str, cancellable, NULL);
- g_string_free (str, TRUE);
+ camel_stream_write_string (stream, str->str, cancellable, NULL);
+ g_string_free (str, TRUE);
}
static void
efhp_write_headers (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
struct _camel_header_raw raw_header;
GString *str, *tmp;
@@ -135,14 +135,14 @@ efhp_write_headers (EMFormat *emf,
EMFormatPURI *p;
GList *iter;
gint attachments_count;
- gchar *puri_prefix;
+ gchar *puri_prefix;
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");
g_string_append_printf (
- str,
+ str,
"<tr class=\"header-item\">"
"<td colspan=\"2\"><h1>%s</h1></td>"
"</tr>\n",
@@ -191,11 +191,11 @@ efhp_write_headers (EMFormat *emf,
p = iter->data;
- if (p->validity_type == 0)
- continue;
+ if (p->validity_type == 0)
+ continue;
- if (!g_str_has_prefix (p->uri, puri_prefix))
- continue;
+ if (!g_str_has_prefix (p->uri, puri_prefix))
+ continue;
if ((p->validity_type & EM_FORMAT_VALIDITY_FOUND_PGP) &&
(p->validity_type & EM_FORMAT_VALIDITY_FOUND_SIGNED)) {
@@ -236,19 +236,19 @@ efhp_write_headers (EMFormat *emf,
p = iter->data;
- if (!g_str_has_prefix (p->uri, puri_prefix))
- continue;
+ if (!g_str_has_prefix (p->uri, puri_prefix))
+ continue;
if ((p->is_attachment || g_str_has_suffix(p->uri, ".attachment")) &&
- (!p->cid)) {
+ (!p->cid)) {
attachments_count++;
/* EFHD sometimes creates two PURIs per attachment! */
- if (iter->next && iter->next->data) {
- EMFormatPURI *p2 = iter->next->data;
- if (g_str_has_prefix (p2->uri, p->uri))
- iter = iter->next;
- }
- }
+ if (iter->next && iter->next->data) {
+ EMFormatPURI *p2 = iter->next->data;
+ if (g_str_has_prefix (p2->uri, p->uri))
+ iter = iter->next;
+ }
+ }
}
if (attachments_count > 0) {
raw_header.name = _("Attachments");
@@ -262,7 +262,7 @@ efhp_write_headers (EMFormat *emf,
camel_stream_write_string (stream, str->str, cancellable, NULL);
g_string_free (str, TRUE);
- g_free (puri_prefix);
+ g_free (puri_prefix);
}
static void
@@ -272,42 +272,42 @@ efhp_write_inline_attachment (EMFormat *emf,
EMFormatWriterInfo *info,
GCancellable *cancellable)
{
- gchar *name;
- EMFormatAttachmentPURI *att_puri = (EMFormatAttachmentPURI *) puri;
- EAttachment *attachment;
- GFileInfo *fi;
+ gchar *name;
+ EMFormatAttachmentPURI *att_puri = (EMFormatAttachmentPURI *) puri;
+ EAttachment *attachment;
+ GFileInfo *fi;
- attachment = att_puri->attachment;
- fi = e_attachment_get_file_info (attachment);
+ attachment = att_puri->attachment;
+ fi = e_attachment_get_file_info (attachment);
- if (e_attachment_get_description (attachment) &&
+ if (e_attachment_get_description (attachment) &&
*e_attachment_get_description (attachment)) {
name = g_strdup_printf ("<h2>Attachment: %s (%s)</h2>\n",
- e_attachment_get_description (attachment),
- g_file_info_get_display_name (fi));
- } else {
+ e_attachment_get_description (attachment),
+ g_file_info_get_display_name (fi));
+ } else {
name = g_strdup_printf ("<h2>Attachment: %s</h2>\n",
- g_file_info_get_display_name (fi));
- }
+ g_file_info_get_display_name (fi));
+ }
- camel_stream_write_string (stream, name, cancellable, NULL);
- g_free (name);
+ camel_stream_write_string (stream, name, cancellable, NULL);
+ g_free (name);
}
static void
efhp_write_print_layout (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
GList *iter;
EMFormatWriterInfo print_info = {
EM_FORMAT_WRITE_MODE_PRINTING, FALSE, FALSE };
- EMFormatHTMLPrint *efhp = EM_FORMAT_HTML_PRINT (emf);
+ EMFormatHTMLPrint *efhp = EM_FORMAT_HTML_PRINT (emf);
- g_list_free (efhp->priv->attachments);
- efhp->priv->attachments = NULL;
+ g_list_free (efhp->priv->attachments);
+ efhp->priv->attachments = NULL;
camel_stream_write_string (stream,
"<!DOCTYPE HTML>\n<html>\n"
@@ -317,7 +317,7 @@ efhp_write_print_layout (EMFormat *emf,
"href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview-print.css\" />\n"
"</head>\n"
"<body style=\"background: #FFF; color: #000;\">",
- cancellable, NULL);
+ cancellable, NULL);
for (iter = emf->mail_part_list; iter != NULL; iter = iter ? iter->next : iter) {
@@ -336,17 +336,17 @@ efhp_write_print_layout (EMFormat *emf,
while (iter && !g_str_has_suffix (puri->uri, ".rfc822.end")) {
- iter = iter->next;
- if (iter)
- puri = iter->data;
- }
+ iter = iter->next;
+ if (iter)
+ puri = iter->data;
+ }
- if (!iter)
- break;
+ if (!iter)
+ break;
- continue;
+ continue;
- }
+ }
if (puri->is_attachment || g_str_has_suffix (puri->uri, ".attachment")) {
const EMFormatHandler *handler;
@@ -354,62 +354,61 @@ efhp_write_print_layout (EMFormat *emf,
gchar *mime_type;
if (puri->cid && g_ascii_strncasecmp (puri->cid, "cid:", 4) == 0)
- continue;
+ continue;
- ct = camel_mime_part_get_content_type (puri->part);
- mime_type = camel_content_type_simple (ct);
+ 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)"));
- g_free (mime_type);
+ g_free (mime_type);
- efhp->priv->attachments =
- g_list_append (efhp->priv->attachments, puri);
+ efhp->priv->attachments =
+ g_list_append (efhp->priv->attachments, puri);
/* If we can't inline this attachment, skip it */
if (handler && puri->write_func) {
- efhp_write_inline_attachment (puri->emf, puri,
- stream, &print_info, cancellable);
+ efhp_write_inline_attachment (puri->emf, puri,
+ stream, &print_info, cancellable);
- if (iter->next && iter->next->data) {
- EMFormatPURI *p;
- p = iter->next->data;
+ if (iter->next && iter->next->data) {
+ EMFormatPURI *p;
+ p = iter->next->data;
/* Has the next PURI the same prefix? */
- if (p->write_func &&
- g_str_has_prefix (p->uri, puri->uri)) {
- p->write_func (emf, p, stream,
- &print_info, cancellable);
- iter = iter->next;
- } else {
- if (puri->write_func) {
- puri->write_func (emf, puri,
- stream, &print_info,
- cancellable);
- }
- }
- }
- }
-
- continue;
+ if (p->write_func &&
+ g_str_has_prefix (p->uri, puri->uri)) {
+ p->write_func (emf, p, stream,
+ &print_info, cancellable);
+ iter = iter->next;
+ } else {
+ if (puri->write_func) {
+ puri->write_func (emf, puri,
+ stream, &print_info,
+ cancellable);
+ }
+ }
+ }
+ }
+
+ continue;
}
/* Ignore widget parts and unwritable non-attachment parts */
- if (puri->write_func == NULL)
- continue;
+ if (puri->write_func == NULL)
+ continue;
/* Passed all tests, probably a regular part - display it */
- puri->write_func(puri->emf, puri, stream, &print_info, cancellable);
+ puri->write_func (puri->emf, puri, stream, &print_info, cancellable);
- }
+ }
- efhp_write_attachments_list (efhp, stream, &print_info, cancellable);
+ efhp_write_attachments_list (efhp, stream, &print_info, cancellable);
camel_stream_write_string (stream, "</body></html>", cancellable, NULL);
}
-
static void
efhp_finalize (GObject *object)
{
@@ -426,9 +425,9 @@ efhp_finalize (GObject *object)
}
if (efhp->priv->attachments) {
- g_list_free (efhp->priv->attachments);
- efhp->priv->attachments = NULL;
- }
+ g_list_free (efhp->priv->attachments);
+ efhp->priv->attachments = NULL;
+ }
/* Chain up to parent's finalize() method. */
G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -446,7 +445,7 @@ efhp_is_inline (EMFormat *emf,
static void
efhp_set_orig_formatter (EMFormatHTMLPrint *efhp,
- EMFormat *formatter)
+ EMFormat *formatter)
{
EMFormat *emfp, *emfs;
EMFormatPURI *puri;
@@ -462,21 +461,21 @@ efhp_set_orig_formatter (EMFormatHTMLPrint *efhp,
/* Make a shallow copy of the table. This table will NOT destroy
* the PURIs when free'd! */
- if (emfp->mail_part_table)
- g_hash_table_unref (emfp->mail_part_table);
+ if (emfp->mail_part_table)
+ g_hash_table_unref (emfp->mail_part_table);
emfp->mail_part_table = g_hash_table_new (g_str_hash, g_str_equal);
g_hash_table_iter_init (&iter, emfs->mail_part_table);
while (g_hash_table_iter_next (&iter, &key, &value))
g_hash_table_insert (emfp->mail_part_table, key, value);
- if (emfs->folder)
- emfp->folder = g_object_ref (emfs->folder);
+ if (emfs->folder)
+ emfp->folder = g_object_ref (emfs->folder);
emfp->message_uid = g_strdup (emfs->message_uid);
emfp->message = g_object_ref (emfs->message);
/* Add a generic PURI that will write a HTML layout
- for all the parts */
+ * for all the parts */
puri = em_format_puri_new (EM_FORMAT (efhp),
sizeof (EMFormatPURI), NULL, "print_layout");
puri->write_func = efhp_write_print_layout;
@@ -504,9 +503,9 @@ efhp_builtin_init (EMFormatHTMLPrintClass *efhc)
static void
efhp_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
switch (prop_id) {
@@ -522,9 +521,9 @@ efhp_set_property (GObject *object,
static void
efhp_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
EMFormatHTMLPrintPrivate *priv;
@@ -582,7 +581,7 @@ em_format_html_print_init (EMFormatHTMLPrint *efhp)
efhp->priv = G_TYPE_INSTANCE_GET_PRIVATE (
efhp, EM_TYPE_FORMAT_HTML_PRINT, EMFormatHTMLPrintPrivate);
- efhp->priv->attachments = NULL;
+ efhp->priv->attachments = NULL;
efhp->export_filename = NULL;
}
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 2623db2..5694b9b 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -125,18 +125,18 @@ static void efh_write_attachment (EMFormat *emf, EMFormatPURI *puri, CamelStrea
static void efh_write_error (EMFormat *emf, EMFormatPURI *puri, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
static void efh_write_message_rfc822 (EMFormat *emf, EMFormatPURI *puri, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
-static void efh_format_full_headers (EMFormatHTML *efh, GString *buffer, CamelMedium *part, gboolean all_headers, gboolean visible, GCancellable *cancellable);
-static void efh_format_short_headers (EMFormatHTML *efh, GString *buffer, CamelMedium *part, gboolean visible, GCancellable *cancellable);
+static void efh_format_full_headers (EMFormatHTML *efh, GString *buffer, CamelMedium *part, gboolean all_headers, gboolean visible, GCancellable *cancellable);
+static void efh_format_short_headers (EMFormatHTML *efh, GString *buffer, CamelMedium *part, gboolean visible, GCancellable *cancellable);
static void efh_write_message (EMFormat *emf, GList *puris, CamelStream *stream, EMFormatWriterInfo *info, GCancellable *cancellable);
/*****************************************************************************/
static void
efh_parse_image (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
const gchar *tmp;
@@ -146,10 +146,9 @@ efh_parse_image (EMFormat *emf,
if (g_cancellable_is_cancelled (cancellable))
return;
-
tmp = camel_mime_part_get_content_id (part);
if (!tmp) {
- em_format_parse_part_as (emf, part, part_id, info,
+ em_format_parse_part_as (emf, part, part_id, info,
"x-evolution/message/attachment", cancellable);
return;
}
@@ -171,10 +170,10 @@ efh_parse_image (EMFormat *emf,
static void
efh_parse_text_enriched (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
const gchar *tmp;
@@ -199,7 +198,7 @@ efh_parse_text_enriched (EMFormat *emf,
puri->write_func = efh_write_text_enriched;
puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
puri->validity_type = info->validity_type;
- puri->is_attachment = info->is_attachment;
+ puri->is_attachment = info->is_attachment;
em_format_add_puri (emf, puri);
g_string_truncate (part_id, len);
@@ -207,10 +206,10 @@ efh_parse_text_enriched (EMFormat *emf,
static void
efh_parse_text_plain (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
CamelStream *filtered_stream, *null;
@@ -230,15 +229,15 @@ efh_parse_text_plain (EMFormat *emf,
return;
/* This scans the text part for inline-encoded data, creates
- a multipart of all the parts inside it. */
+ * a multipart of all the parts inside it. */
/* FIXME: We should discard this multipart if it only contains
- the original text, but it makes this hash lookup more complex */
+ * the original text, but it makes this hash lookup more complex */
/* TODO: We could probably put this in the superclass, since
- no knowledge of html is required - but this messes with
- filters a bit. Perhaps the superclass should just deal with
- html anyway and be done with it ... */
+ * no knowledge of html is required - but this messes with
+ * filters a bit. Perhaps the superclass should just deal with
+ * html anyway and be done with it ... */
if (!dw->mime_type)
snoop_type = em_format_snoop_type (part);
@@ -280,7 +279,7 @@ efh_parse_text_plain (EMFormat *emf,
/* We handle our made-up multipart here, so we don't recursively call ourselves */
len = part_id->len;
count = camel_multipart_get_number (mp);
- for (i=0;i<count;i++) {
+ for (i = 0; i < count; i++) {
CamelMimePart *newpart = camel_multipart_get_part (mp, i);
if (!newpart)
@@ -296,7 +295,7 @@ efh_parse_text_plain (EMFormat *emf,
puri->mime_type = g_strdup ("text/html");
puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
puri->validity_type = info->validity_type;
- puri->is_attachment = info->is_attachment;
+ puri->is_attachment = info->is_attachment;
g_string_truncate (part_id, s_len);
em_format_add_puri (emf, puri);
} else {
@@ -311,10 +310,10 @@ efh_parse_text_plain (EMFormat *emf,
static void
efh_parse_text_html (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
const gchar *location;
@@ -350,7 +349,7 @@ efh_parse_text_html (EMFormat *emf,
puri->write_func = efh_write_text_html;
puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
puri->validity_type = info->validity_type;
- puri->is_attachment = info->is_attachment;
+ puri->is_attachment = info->is_attachment;
em_format_add_puri (emf, puri);
g_string_truncate (part_id, len);
@@ -361,10 +360,10 @@ efh_parse_text_html (EMFormat *emf,
static void
efh_parse_message_external (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
CamelMimePart *newpart;
@@ -442,7 +441,7 @@ efh_parse_message_external (EMFormat *emf,
url = g_strdup (urlparam);
s = d = url;
while (*s) {
- if (!isspace ((guchar)*s))
+ if (!isspace ((guchar) * s))
*d++ = *s;
s++;
}
@@ -478,10 +477,10 @@ addPart:
static void
efh_parse_message_deliverystatus (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
EMFormatPURI *puri;
gint len;
@@ -496,7 +495,7 @@ efh_parse_message_deliverystatus (EMFormat *emf,
puri->mime_type = g_strdup ("text/html");
puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
puri->validity_type = info->validity_type;
- puri->is_attachment = info->is_attachment;
+ puri->is_attachment = info->is_attachment;
em_format_add_puri (emf, puri);
g_string_truncate (part_id, len);
@@ -504,10 +503,10 @@ efh_parse_message_deliverystatus (EMFormat *emf,
static void
efh_parse_message_rfc822 (EMFormat *emf,
- CamelMimePart *part,
- GString *part_id,
- EMFormatParserInfo *info,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ EMFormatParserInfo *info,
+ GCancellable *cancellable)
{
CamelDataWrapper *dw;
CamelMimePart *opart;
@@ -521,11 +520,11 @@ efh_parse_message_rfc822 (EMFormat *emf,
g_string_append (part_id, ".rfc822");
/* 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 = 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->is_attachment = info->is_attachment;
- em_format_add_puri (emf, puri);
+ puri->is_attachment = info->is_attachment;
+ em_format_add_puri (emf, puri);
/* Now parse the message, creating multiple sub-PURIs */
stream = camel_stream_mem_new ();
@@ -546,8 +545,8 @@ efh_parse_message_rfc822 (EMFormat *emf,
* 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");
- puri = em_format_puri_new (emf, sizeof (EMFormatPURI), NULL, part_id->str);
- em_format_add_puri (emf, puri);
+ puri = em_format_puri_new (emf, sizeof (EMFormatPURI), NULL, part_id->str);
+ em_format_add_puri (emf, puri);
g_string_truncate (part_id, len);
@@ -556,25 +555,24 @@ efh_parse_message_rfc822 (EMFormat *emf,
g_object_unref (stream);
}
-
/*****************************************************************************/
static void
efh_write_image (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
gchar *content;
- EMFormatHTML *efh;
+ EMFormatHTML *efh;
CamelDataWrapper *dw;
GByteArray *ba;
if (g_cancellable_is_cancelled (cancellable))
return;
- efh = (EMFormatHTML *) emf;
+ efh = (EMFormatHTML *) emf;
dw = camel_medium_get_content (CAMEL_MEDIUM (puri->part));
g_return_if_fail (dw);
@@ -583,84 +581,84 @@ efh_write_image (EMFormat *emf,
if (info->mode == EM_FORMAT_WRITE_MODE_RAW) {
- if (!efh->priv->animate_images) {
-
- gchar *buff;
- gsize len;
- gchar *data;
- GByteArray anim;
-
- data = g_strndup ((gchar *) ba->data, (gsize) ba->len);
- anim.data = g_base64_decode (data, (gsize *) &(anim.len));
- g_free (data);
+ if (!efh->priv->animate_images) {
- em_format_html_animation_extract_frame (&anim, &buff, &len);
+ gchar *buff;
+ gsize len;
+ gchar *data;
+ GByteArray anim;
- camel_stream_write (stream, buff, len, cancellable, NULL);
+ data = g_strndup ((gchar *) ba->data, (gsize) ba->len);
+ anim.data = g_base64_decode (data, (gsize *) &(anim.len));
+ g_free (data);
- g_free (buff);
- g_free (anim.data);
+ em_format_html_animation_extract_frame (&anim, &buff, &len);
- } else {
- CamelStream *stream_filter;
- CamelMimeFilter *filter;
+ camel_stream_write (stream, buff, len, cancellable, NULL);
- stream_filter = camel_stream_filter_new (stream);
- filter = camel_mime_filter_basic_new (
- CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
+ g_free (buff);
+ g_free (anim.data);
- camel_stream_write (
- stream_filter,
- (gchar *) ba->data, ba->len,
- cancellable, NULL);
- g_object_unref (stream_filter);
- g_object_unref (filter);
- }
+ } else {
+ CamelStream *stream_filter;
+ CamelMimeFilter *filter;
+
+ stream_filter = camel_stream_filter_new (stream);
+ filter = camel_mime_filter_basic_new (
+ CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
+
+ camel_stream_write (
+ stream_filter,
+ (gchar *) ba->data, ba->len,
+ cancellable, NULL);
+ g_object_unref (stream_filter);
+ g_object_unref (filter);
+ }
} else {
gchar *buffer;
- if (!efh->priv->animate_images) {
+ if (!efh->priv->animate_images) {
- gchar *buff;
- gsize len;
- gchar *data;
- GByteArray raw_data;
+ gchar *buff;
+ gsize len;
+ gchar *data;
+ GByteArray raw_data;
- data = g_strndup ((gchar *) ba->data, ba->len);
- raw_data.data = (guint8 *) g_base64_decode (
- data, (gsize *) &(raw_data.len));
- g_free (data);
+ data = g_strndup ((gchar *) ba->data, ba->len);
+ raw_data.data = (guint8 *) g_base64_decode (
+ data, (gsize *) &(raw_data.len));
+ g_free (data);
- em_format_html_animation_extract_frame (&raw_data, &buff, &len);
+ em_format_html_animation_extract_frame (&raw_data, &buff, &len);
- content = g_base64_encode ((guchar *) buff, len);
- g_free (buff);
- g_free (raw_data.data);
+ content = g_base64_encode ((guchar *) buff, len);
+ g_free (buff);
+ g_free (raw_data.data);
- } else {
- content = g_strndup ((gchar *) ba->data, ba->len);
- }
+ } else {
+ content = g_strndup ((gchar *) ba->data, ba->len);
+ }
/* The image is already base64-encrypted so we can directly
- paste it to the output */
+ * paste it to the output */
buffer = g_strdup_printf (
"<img src=\"data:%s;base64,%s\" style=\"max-width: 100%%;\" />",
puri->mime_type ? puri->mime_type : "image/*", content);
camel_stream_write_string (stream, buffer, cancellable, NULL);
g_free (buffer);
- g_free (content);
+ g_free (content);
}
}
static void
efh_write_text_enriched (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
EMFormatHTML *efh = EM_FORMAT_HTML (emf);
CamelStream *filtered_stream;
@@ -724,15 +722,15 @@ efh_write_text_enriched (EMFormat *emf,
static void
efh_write_text_plain (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
CamelDataWrapper *dw;
CamelStream *filtered_stream;
CamelMimeFilter *html_filter;
- EMFormatHTML *efh = (EMFormatHTML*) emf;
+ EMFormatHTML *efh = (EMFormatHTML *) emf;
gchar *content;
const gchar *format;
guint32 flags;
@@ -779,10 +777,10 @@ efh_write_text_plain (EMFormat *emf,
camel_stream_write_string (stream, "</div></div>\n", cancellable, NULL);
}
-static gchar*
+static gchar *
get_tag (const gchar *tag_name,
- gchar *opening,
- gchar *closing)
+ gchar *opening,
+ gchar *closing)
{
gchar *t;
gboolean has_end;
@@ -824,14 +822,14 @@ get_tag (const gchar *tag_name,
if ((*t != ' ') && (*t != '/'))
break;
- t++;
+ t++;
} while (t && *t);
if (g_strncasecmp (t, tag_name, strlen (tag_name)) == 0) {
closing = strstr (t, ">");
- return g_strndup (opening, closing - opening + strlen(tag_name));
+ return g_strndup (opening, closing - opening + strlen (tag_name));
}
/* Broken HTML? */
@@ -840,21 +838,21 @@ get_tag (const gchar *tag_name,
static void
efh_write_text_html (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
- EMFormatHTML *efh = (EMFormatHTML *) emf;
+ EMFormatHTML *efh = (EMFormatHTML *) emf;
if (g_cancellable_is_cancelled (cancellable))
return;
- if (info->mode == EM_FORMAT_WRITE_MODE_RAW) {
- em_format_format_text (emf, stream,
- (CamelDataWrapper *) puri->part, cancellable);
+ if (info->mode == EM_FORMAT_WRITE_MODE_RAW) {
+ em_format_format_text (emf, stream,
+ (CamelDataWrapper *) puri->part, cancellable);
- } else if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING) {
+ } else if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING) {
GString *string;
CamelDataWrapper *dw;
GByteArray *ba;
@@ -865,17 +863,17 @@ efh_write_text_html (EMFormat *emf,
const gchar *document_end;
gint length;
gint i;
- CamelStream *decoded_stream;
+ CamelStream *decoded_stream;
- decoded_stream = camel_stream_mem_new ();
- em_format_format_text (emf, decoded_stream,
- (CamelDataWrapper *) puri->part, cancellable);
- g_seekable_seek (G_SEEKABLE (decoded_stream), 0, G_SEEK_SET, cancellable, NULL);
+ decoded_stream = camel_stream_mem_new ();
+ em_format_format_text (emf, decoded_stream,
+ (CamelDataWrapper *) puri->part, cancellable);
+ g_seekable_seek (G_SEEKABLE (decoded_stream), 0, G_SEEK_SET, cancellable, NULL);
- ba = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (decoded_stream));
+ ba = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (decoded_stream));
string = g_string_new_len ((gchar *) ba->data, ba->len);
- g_object_unref (decoded_stream);
+ g_object_unref (decoded_stream);
tags = NULL;
pos = string->str;
@@ -942,7 +940,7 @@ efh_write_text_html (EMFormat *emf,
i = 0;
valid = FALSE;
while (i < length - 1) {
- gchar c;
+ gchar c;
if (g_ascii_isspace (*tag)) {
tag--;
@@ -950,9 +948,9 @@ efh_write_text_html (EMFormat *emf,
}
if ((*tag >= 'A') && (*tag <= 'Z'))
- c = *tag + 32;
- else
- c = *tag;
+ c = *tag + 32;
+ else
+ c = *tag;
if (c == document_end[i]) {
tag--;
@@ -975,10 +973,10 @@ efh_write_text_html (EMFormat *emf,
gchar *uri;
uri = em_format_build_mail_uri (
- emf->folder, emf->message_uid,
+ emf->folder, emf->message_uid,
"part_id", G_TYPE_STRING, puri->uri,
"mode", G_TYPE_INT, EM_FORMAT_WRITE_MODE_RAW,
- NULL);
+ NULL);
str = g_strdup_printf (
"<div class=\"part-container\" style=\"border-color: #%06x; "
@@ -987,8 +985,8 @@ efh_write_text_html (EMFormat *emf,
"<iframe width=\"100%%\" height=\"auto\""
" frameborder=\"0\" src=\"%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]),
+ 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);
camel_stream_write_string (stream, str, cancellable, NULL);
@@ -1000,10 +998,10 @@ efh_write_text_html (EMFormat *emf,
static void
efh_write_source (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
EMFormatHTML *efh = (EMFormatHTML *) emf;
GString *buffer;
@@ -1047,10 +1045,10 @@ efh_write_source (EMFormat *emf,
static void
efh_write_headers (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
GString *buffer;
EMFormatHTML *efh = (EMFormatHTML *) emf;
@@ -1063,7 +1061,7 @@ efh_write_headers (EMFormat *emf,
if (info->mode & EM_FORMAT_WRITE_MODE_PRINTING) {
GdkColor white = { 0, G_MAXUINT16, G_MAXUINT16, G_MAXUINT16 };
- bg_color = e_color_to_value(&white);
+ bg_color = e_color_to_value (&white);
} else {
bg_color = e_color_to_value (&efh->priv->colors[EM_FORMAT_HTML_COLOR_BODY]);
}
@@ -1103,10 +1101,10 @@ efh_write_headers (EMFormat *emf,
static void
efh_write_error (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
CamelStream *filtered_stream;
CamelMimeFilter *filter;
@@ -1136,116 +1134,116 @@ efh_write_message_rfc822 (EMFormat *emf,
EMFormatWriterInfo *info,
GCancellable *cancellable)
{
- if (info->mode == EM_FORMAT_WRITE_MODE_RAW) {
+ if (info->mode == EM_FORMAT_WRITE_MODE_RAW) {
- GList *puris;
- GList *iter;
+ GList *puris;
+ GList *iter;
/* Create a new fake list of PURIs which will contain only
* PURIs from this message. */
- iter = g_hash_table_lookup (emf->mail_part_table, puri->uri);
- if (!iter || !iter->next)
- return;
+ iter = g_hash_table_lookup (emf->mail_part_table, puri->uri);
+ if (!iter || !iter->next)
+ return;
- iter = iter->next;
- puris = NULL;
- while (iter) {
+ iter = iter->next;
+ puris = NULL;
+ while (iter) {
- EMFormatPURI *p;
- p = iter->data;
+ EMFormatPURI *p;
+ p = iter->data;
if (g_str_has_suffix (p->uri, ".rfc822.end"))
- break;
+ break;
- puris = g_list_append (puris, p);
- iter = iter->next;
+ puris = g_list_append (puris, p);
+ iter = iter->next;
- };
+ };
- efh_write_message (emf, puris, stream, info, cancellable);
+ efh_write_message (emf, puris, stream, info, cancellable);
- g_list_free (puris);
+ g_list_free (puris);
- } else if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING) {
+ } else if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING) {
- GList *iter;
- gboolean can_write = FALSE;
+ GList *iter;
+ gboolean can_write = FALSE;
- iter = g_hash_table_lookup (emf->mail_part_table, puri->uri);
- if (!iter || !iter->next)
- return;
+ iter = g_hash_table_lookup (emf->mail_part_table, puri->uri);
+ if (!iter || !iter->next)
+ return;
/* Skip everything before attachment bar, inclusive */\
- iter = iter->next;
- while (iter) {
+ iter = iter->next;
+ while (iter) {
- EMFormatPURI *p = iter->data;
+ EMFormatPURI *p = iter->data;
/* EMFormatHTMLPrint has registered a special writer
* for headers, try to find it and use it. */
if (g_str_has_suffix (p->uri, ".headers")) {
- const EMFormatHandler *handler;
+ const EMFormatHandler *handler;
- handler = em_format_find_handler(
+ handler = em_format_find_handler (
emf, "x-evolution/message/headers");
- if (handler && handler->write_func)
- handler->write_func (emf, p, stream, info, cancellable);
+ if (handler && handler->write_func)
+ handler->write_func (emf, p, stream, info, cancellable);
- iter = iter->next;
- continue;
- }
+ iter = iter->next;
+ continue;
+ }
if (g_str_has_suffix (p->uri, ".rfc822.end"))
- break;
+ break;
if (g_str_has_suffix (p->uri, ".attachment-bar"))
- can_write = TRUE;
+ can_write = TRUE;
- if (can_write && p->write_func) {
- p->write_func (
- emf, p, stream, info, cancellable);
- }
+ if (can_write && p->write_func) {
+ p->write_func (
+ emf, p, stream, info, cancellable);
+ }
- iter = iter->next;
- }
+ iter = iter->next;
+ }
- } else {
- gchar *str;
- gchar *uri;
+ } else {
+ gchar *str;
+ gchar *uri;
- EMFormatHTML *efh = (EMFormatHTML *) emf;
- EMFormatPURI *p;
- GList *iter;
+ EMFormatHTML *efh = (EMFormatHTML *) emf;
+ EMFormatPURI *p;
+ GList *iter;
- iter = g_hash_table_lookup (emf->mail_part_table, puri->uri);
- if (!iter || !iter->next)
- return;
+ iter = g_hash_table_lookup (emf->mail_part_table, puri->uri);
+ if (!iter || !iter->next)
+ return;
- iter = iter->next;
- p = iter->data;
+ iter = iter->next;
+ p = iter->data;
- uri = em_format_build_mail_uri (emf->folder, emf->message_uid,
+ 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,
- NULL);
+ NULL);
- str = g_strdup_printf (
+ 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>",
- 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);
+ 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);
- camel_stream_write_string (stream, str, cancellable, NULL);
+ camel_stream_write_string (stream, str, cancellable, NULL);
- g_free (str);
- g_free (uri);
- }
+ g_free (str);
+ g_free (uri);
+ }
}
@@ -1288,8 +1286,8 @@ static EMFormatHandler type_builtin_table[] = {
{ (gchar *) "message/*", efh_parse_message_rfc822, 0, EM_FORMAT_HANDLER_INLINE },
/* This is where one adds those busted, non-registered types,
- that some idiot mailer writers out there decide to pull out
- of their proverbials at random. */
+ * that some idiot mailer writers out there decide to pull out
+ * of their proverbials at random. */
{ (gchar *) "image/jpg", efh_parse_image, efh_write_image, },
{ (gchar *) "image/pjpeg", efh_parse_image, efh_write_image, },
@@ -1393,11 +1391,11 @@ efh_set_property (GObject *object,
g_value_get_boxed (value));
return;
- case PROP_ANIMATE_IMAGES:
- em_format_html_set_animate_images (
- EM_FORMAT_HTML (object),
- g_value_get_boolean (value));
- return;
+ case PROP_ANIMATE_IMAGES:
+ em_format_html_set_animate_images (
+ EM_FORMAT_HTML (object),
+ g_value_get_boolean (value));
+ return;
}
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -1490,11 +1488,11 @@ efh_get_property (GObject *object,
&color);
g_value_set_boxed (value, &color);
return;
- case PROP_ANIMATE_IMAGES:
- g_value_set_boolean (
- value, em_format_html_get_animate_images (
- EM_FORMAT_HTML (object)));
- return;
+ case PROP_ANIMATE_IMAGES:
+ g_value_set_boolean (
+ value, em_format_html_get_animate_images (
+ EM_FORMAT_HTML (object)));
+ return;
}
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -1507,12 +1505,11 @@ efh_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
-
static void
efh_write_attachment (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
GCancellable *cancellable)
{
gchar *text, *html;
@@ -1559,17 +1556,17 @@ efh_write_attachment (EMFormat *emf,
static void
efh_preparse (EMFormat *emf)
{
- CamelInternetAddress *addr;
+ CamelInternetAddress *addr;
- EMFormatHTML *efh = EM_FORMAT_HTML (emf);
+ EMFormatHTML *efh = EM_FORMAT_HTML (emf);
if (!emf->message) {
efh->priv->can_load_images = FALSE;
return;
}
- addr = camel_mime_message_get_from (emf->message);
- efh->priv->can_load_images = em_utils_in_addressbook (addr, FALSE);
+ addr = camel_mime_message_get_from (emf->message);
+ efh->priv->can_load_images = em_utils_in_addressbook (addr, FALSE);
}
static void
@@ -1579,13 +1576,13 @@ efh_write_message (EMFormat *emf,
EMFormatWriterInfo *info,
GCancellable *cancellable)
{
- GList *iter;
- EMFormatHTML *efh;
- gchar *header;
+ GList *iter;
+ EMFormatHTML *efh;
+ gchar *header;
- efh = (EMFormatHTML *) emf;
+ efh = (EMFormatHTML *) emf;
- header = g_strdup_printf (
+ 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"
@@ -1594,27 +1591,27 @@ efh_write_message (EMFormat *emf,
" 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]));
+ e_color_to_value (&efh->priv->colors[
+ EM_FORMAT_HTML_COLOR_BODY]));
- camel_stream_write_string (stream, header, cancellable, NULL);
- g_free (header);
+ camel_stream_write_string (stream, header, cancellable, NULL);
+ g_free (header);
- if (info->mode == EM_FORMAT_WRITE_MODE_SOURCE) {
+ if (info->mode == EM_FORMAT_WRITE_MODE_SOURCE) {
- efh_write_source (emf, emf->mail_part_list->data,
- stream, info, cancellable);
+ efh_write_source (emf, emf->mail_part_list->data,
+ stream, info, cancellable);
camel_stream_write_string (stream, "</body></html>", cancellable, NULL);
- return;
- }
+ return;
+ }
- for (iter = puris; iter; iter = iter->next) {
+ for (iter = puris; iter; iter = iter->next) {
- EMFormatPURI *puri = iter->data;
+ EMFormatPURI *puri = iter->data;
- if (!puri)
- continue;
+ if (!puri)
+ continue;
/* If current PURI has suffix .rfc822 then iterate through all
* subsequent PURIs until PURI with suffix .rfc822.end is found.
@@ -1625,51 +1622,51 @@ efh_write_message (EMFormat *emf,
/* If the PURI is not an attachment, then we must
* inline it here otherwise it would not be displayed. */
- if (!puri->is_attachment && puri->write_func) {
+ if (!puri->is_attachment && puri->write_func) {
/* efh_write_message_rfc822 starts parsing _after_
* the passed PURI, so we must give it previous PURI here */
- EMFormatPURI *p;
+ EMFormatPURI *p;
if (!iter->prev)
continue;
p = iter->prev->data;
- puri->write_func (emf, p, stream, info, cancellable);
- }
+ puri->write_func (emf, p, stream, info, cancellable);
+ }
while (iter && !g_str_has_suffix (puri->uri, ".rfc822.end")) {
- iter = iter->next;
- if (iter)
- puri = iter->data;
+ iter = iter->next;
+ if (iter)
+ puri = iter->data;
d(printf(".rfc822 - skipping %s\n", puri->uri));
- }
+ }
/* Skip the .rfc822.end PURI as well. */
- if (!iter)
- break;
+ if (!iter)
+ break;
- continue;
- }
+ continue;
+ }
- if (puri->write_func && !puri->is_attachment) {
+ if (puri->write_func && !puri->is_attachment) {
puri->write_func (emf, puri, stream, info, cancellable);
d(printf("Writing PURI %s\n", puri->uri));
} else {
d(printf("Skipping PURI %s\n", puri->uri));
}
- }
+ }
camel_stream_write_string (stream, "</body></html>", cancellable, NULL);
}
static void
efh_write (EMFormat *emf,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
- efh_write_message (emf, emf->mail_part_list, stream, info, cancellable);
+ efh_write_message (emf, emf->mail_part_list, stream, info, cancellable);
}
static void
@@ -1682,13 +1679,13 @@ static void
efh_class_init (EMFormatHTMLClass *klass)
{
GObjectClass *object_class;
- EMFormatClass *emf_class;
+ EMFormatClass *emf_class;
parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (EMFormatHTMLPrivate));
- emf_class = EM_FORMAT_CLASS (klass);
- emf_class->preparse = efh_preparse;
+ emf_class = EM_FORMAT_CLASS (klass);
+ emf_class->preparse = efh_preparse;
emf_class->write = efh_write;
object_class = G_OBJECT_CLASS (klass);
@@ -1811,20 +1808,20 @@ efh_class_init (EMFormatHTMLClass *klass)
GDK_TYPE_COLOR,
G_PARAM_READWRITE));
- g_object_class_install_property (
- object_class,
- PROP_ANIMATE_IMAGES,
- g_param_spec_boolean (
+ g_object_class_install_property (
+ object_class,
+ PROP_ANIMATE_IMAGES,
+ g_param_spec_boolean (
"animate-images",
"Animate images",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
}
static void
efh_init (EMFormatHTML *efh,
- EMFormatHTMLClass *klass)
+ EMFormatHTMLClass *klass)
{
GdkColor *color;
@@ -2068,18 +2065,18 @@ em_format_html_set_show_real_date (EMFormatHTML *efh,
gboolean
em_format_html_get_animate_images (EMFormatHTML *efh)
{
- g_return_val_if_fail (EM_IS_FORMAT_HTML (efh), FALSE);
+ g_return_val_if_fail (EM_IS_FORMAT_HTML (efh), FALSE);
- return efh->priv->animate_images;
+ return efh->priv->animate_images;
}
void
em_format_html_set_animate_images (EMFormatHTML *efh,
gboolean animate_images)
{
- g_return_if_fail (EM_IS_FORMAT_HTML (efh));
+ g_return_if_fail (EM_IS_FORMAT_HTML (efh));
- efh->priv->animate_images = animate_images;
+ efh->priv->animate_images = animate_images;
g_object_notify (G_OBJECT (efh), "animate-images");
}
@@ -2117,7 +2114,7 @@ em_format_html_file_part (EMFormatHTML *efh,
void
em_format_html_format_cert_infos (GQueue *cert_infos,
- GString *output_buffer)
+ GString *output_buffer)
{
GQueue valid = G_QUEUE_INIT;
GList *head, *link;
@@ -2132,13 +2129,13 @@ em_format_html_format_cert_infos (GQueue *cert_infos,
* end up with "()". */
for (link = head; link != NULL; link = g_list_next (link)) {
CamelCipherCertInfo *cinfo = link->data;
-
+
if ((cinfo->name != NULL && *cinfo->name != '\0') ||
(cinfo->email != NULL && *cinfo->email != '\0')) {
g_queue_push_tail (&valid, cinfo);
}
}
-
+
if (g_queue_is_empty (&valid))
return;
@@ -2169,9 +2166,6 @@ em_format_html_format_cert_infos (GQueue *cert_infos,
g_string_append_c (output_buffer, ')');
}
-
-
-
static void
efh_format_text_header (EMFormatHTML *emfh,
GString *buffer,
@@ -2221,7 +2215,7 @@ efh_format_text_header (EMFormatHTML *emfh,
}
}
- g_string_append_printf (buffer, fmt,
+ g_string_append_printf (buffer, fmt,
(flags & EM_FORMAT_HTML_HEADER_HIDDEN ? "none" : "table-row"), label, html);
g_free (mhtml);
@@ -2238,7 +2232,7 @@ efh_format_address (EMFormatHTML *efh,
GString *out,
struct _camel_header_address *a,
gchar *field,
- gboolean no_links)
+ gboolean no_links)
{
guint32 flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
gchar *name, *mailto, *addr;
@@ -2378,11 +2372,11 @@ canon_header_name (gchar *name)
void
em_format_html_format_header (EMFormat *emf,
- GString *buffer,
- CamelMedium *part,
- struct _camel_header_raw *header,
- guint32 flags,
- const gchar *charset)
+ GString *buffer,
+ CamelMedium *part,
+ struct _camel_header_raw *header,
+ guint32 flags,
+ const gchar *charset)
{
EMFormatHTML *efh = EM_FORMAT_HTML (emf);
gchar *name, *buf, *value = NULL;
@@ -2412,7 +2406,7 @@ em_format_html_format_header (EMFormat *emf,
em_format_get_charset (emf) : em_format_get_default_charset (emf);
buf = camel_header_unfold (header->value);
- if (!(addrs = camel_header_address_decode (buf, charset))) {
+ if (!(addrs = camel_header_address_decode (buf, charset))) {
g_free (buf);
return;
}
@@ -2540,10 +2534,10 @@ em_format_html_format_header (EMFormat *emf,
static void
efh_format_short_headers (EMFormatHTML *efh,
- GString *buffer,
- CamelMedium *part,
- gboolean visible,
- GCancellable *cancellable)
+ GString *buffer,
+ CamelMedium *part,
+ gboolean visible,
+ GCancellable *cancellable)
{
EMFormat *emf = EM_FORMAT (efh);
const gchar *charset;
@@ -2554,7 +2548,7 @@ efh_format_short_headers (EMFormatHTML *efh,
struct _camel_header_address *addrs = NULL;
struct _camel_header_raw *header;
GString *from;
- gboolean is_rtl;
+ gboolean is_rtl;
if (cancellable && g_cancellable_is_cancelled (cancellable))
return;
@@ -2593,26 +2587,26 @@ efh_format_short_headers (EMFormatHTML *efh,
subject = camel_header_unfold (header->value);
buf = camel_header_decode_string (subject, hdr_charset);
g_free (subject);
- subject = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0);
- g_free (buf);
+ subject = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0);
+ g_free (buf);
}
header = header->next;
}
is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
- if (is_rtl) {
- g_string_append_printf (
- buffer,
+ 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)"));
- } else {
- g_string_append_printf (
- buffer,
+ } 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 ? ")" : "");
- }
+ }
g_string_append (buffer, "</table>");
@@ -2626,11 +2620,11 @@ efh_format_short_headers (EMFormatHTML *efh,
static void
efh_format_full_headers (EMFormatHTML *efh,
- GString *buffer,
- CamelMedium *part,
- gboolean all_headers,
- gboolean visible,
- GCancellable *cancellable)
+ GString *buffer,
+ CamelMedium *part,
+ gboolean all_headers,
+ gboolean visible,
+ GCancellable *cancellable)
{
EMFormat *emf = EM_FORMAT (efh);
const gchar *charset;
@@ -2915,11 +2909,11 @@ efh_format_full_headers (EMFormatHTML *efh,
gboolean
em_format_html_can_load_images (EMFormatHTML *efh)
{
- g_return_val_if_fail (EM_IS_FORMAT_HTML (efh), FALSE);
+ g_return_val_if_fail (EM_IS_FORMAT_HTML (efh), FALSE);
- return ((efh->priv->image_loading_policy == E_MAIL_IMAGE_LOADING_POLICY_ALWAYS) ||
- ((efh->priv->image_loading_policy == E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES) &&
- efh->priv->can_load_images));
+ return ((efh->priv->image_loading_policy == E_MAIL_IMAGE_LOADING_POLICY_ALWAYS) ||
+ ((efh->priv->image_loading_policy == E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES) &&
+ efh->priv->can_load_images));
}
void
@@ -2927,57 +2921,57 @@ em_format_html_animation_extract_frame (const GByteArray *anim,
gchar **frame,
gsize *len)
{
- GdkPixbufLoader *loader;
- GdkPixbufAnimation *animation;
- GdkPixbuf *frame_buf;
+ GdkPixbufLoader *loader;
+ GdkPixbufAnimation *animation;
+ GdkPixbuf *frame_buf;
/* GIF89a (GIF image signature) */
- const gchar GIF_HEADER[] = { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 };
- const int GIF_HEADER_LEN = sizeof (GIF_HEADER);
+ const gchar GIF_HEADER[] = { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 };
+ const gint GIF_HEADER_LEN = sizeof (GIF_HEADER);
/* NETSCAPE2.0 (extension describing animated GIF, starts on 0x310) */
- const gchar GIF_APPEXT[] = { 0x4E, 0x45, 0x54, 0x53, 0x43, 0x41,
- 0x50, 0x45, 0x32, 0x2E, 0x30 };
- const int GIF_APPEXT_LEN = sizeof (GIF_APPEXT);
+ const gchar GIF_APPEXT[] = { 0x4E, 0x45, 0x54, 0x53, 0x43, 0x41,
+ 0x50, 0x45, 0x32, 0x2E, 0x30 };
+ const gint GIF_APPEXT_LEN = sizeof (GIF_APPEXT);
/* Check if the image is an animated GIF. We don't care about any
* other animated formats (APNG or MNG) as WebKit does not support them
* and displays only the first frame. */
- if ((anim->len < 0x331)
- || (memcmp (anim->data, GIF_HEADER, GIF_HEADER_LEN) != 0)
- || (memcmp (&anim->data[0x310], GIF_APPEXT, GIF_APPEXT_LEN) != 0)) {
+ if ((anim->len < 0x331)
+ || (memcmp (anim->data, GIF_HEADER, GIF_HEADER_LEN) != 0)
+ || (memcmp (&anim->data[0x310], GIF_APPEXT, GIF_APPEXT_LEN) != 0)) {
*frame = g_memdup (anim->data, anim->len);
*len = anim->len;
- return;
- }
+ return;
+ }
- loader = gdk_pixbuf_loader_new ();
- gdk_pixbuf_loader_write (loader, (guchar *) anim->data, anim->len, NULL);
- gdk_pixbuf_loader_close (loader, NULL);
- animation = gdk_pixbuf_loader_get_animation (loader);
- if (!animation) {
+ loader = gdk_pixbuf_loader_new ();
+ gdk_pixbuf_loader_write (loader, (guchar *) anim->data, anim->len, NULL);
+ gdk_pixbuf_loader_close (loader, NULL);
+ animation = gdk_pixbuf_loader_get_animation (loader);
+ if (!animation) {
*frame = g_memdup (anim->data, anim->len);
*len = anim->len;
- g_object_unref (loader);
- return;
- }
+ g_object_unref (loader);
+ return;
+ }
/* Extract first frame */
- frame_buf = gdk_pixbuf_animation_get_static_image (animation);
- if (!frame_buf) {
+ frame_buf = gdk_pixbuf_animation_get_static_image (animation);
+ if (!frame_buf) {
*frame = g_memdup (anim->data, anim->len);
*len = anim->len;
- g_object_unref (loader);
- g_object_unref (animation);
- return;
- }
+ g_object_unref (loader);
+ g_object_unref (animation);
+ return;
+ }
/* 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);
- g_object_unref (loader);
+ g_object_unref (loader);
}
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index c264c47..9749c37 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -196,7 +196,7 @@ void em_format_html_format_message (EMFormatHTML *efh,
void em_format_html_format_message_part
(EMFormatHTML *efh,
const gchar *part_id,
- CamelStream *stream,
+ CamelStream *stream,
GCancellable *cancellable);
void em_format_html_format_headers (EMFormatHTML *efh,
@@ -208,7 +208,7 @@ void em_format_html_format_header (EMFormat *emf,
GString *buffer,
CamelMedium *part,
struct _camel_header_raw *header,
- guint32 flags,
+ guint32 flags,
const gchar *charset);
gboolean em_format_html_can_load_images (EMFormatHTML *efh);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index d6ef06b..a9b5712 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -620,8 +620,8 @@ em_utils_write_messages_to_stream (CamelFolder *folder,
static void
do_print_msg_to_file (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
EMFormatHTML *efh = EM_FORMAT_HTML (source);
@@ -630,11 +630,11 @@ do_print_msg_to_file (GObject *source,
EMailPrinter *printer;
printer = e_mail_printer_new (efh);
- e_mail_printer_set_export_filename (printer, filename);
+ e_mail_printer_set_export_filename (printer, filename);
g_signal_connect_swapped (printer, "done",
G_CALLBACK (g_object_unref), printer);
- e_mail_printer_print (printer, TRUE, NULL);
+ e_mail_printer_print (printer, TRUE, NULL);
g_object_unref (efh);
}
@@ -1220,7 +1220,7 @@ em_utils_message_to_html (CamelMimeMessage *message,
/* Return all found validities */
for (iter = emf->mail_part_list; iter; iter = iter->next) {
-
+
EMFormatPURI *puri = iter->data;
if (!puri)
continue;
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 274d07e..a30c024 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -840,13 +840,13 @@ message_parsed_cb (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
- EMFormatHTML *formatter = EM_FORMAT_HTML (source_object);
- GObject *preview = user_data;
- EMailDisplay *display;
+ EMFormatHTML *formatter = EM_FORMAT_HTML (source_object);
+ GObject *preview = user_data;
+ EMailDisplay *display;
display = g_object_get_data (preview, "mbox-imp-display");
- e_mail_display_set_formatter (display, formatter);
- e_mail_display_load (display, EM_FORMAT (formatter)->uri_base);
+ e_mail_display_set_formatter (display, formatter);
+ e_mail_display_load (display, EM_FORMAT (formatter)->uri_base);
}
/* utility functions for mbox importer */
@@ -859,9 +859,9 @@ mbox_create_preview_cb (GObject *preview,
g_return_if_fail (preview != NULL);
g_return_if_fail (preview_widget != NULL);
- display = g_object_new (E_TYPE_MAIL_DISPLAY, NULL);
+ display = g_object_new (E_TYPE_MAIL_DISPLAY, NULL);
g_object_set_data_full (preview, "mbox-imp-display",
- g_object_ref (display), g_object_unref);
+ g_object_ref (display), g_object_unref);
*preview_widget = GTK_WIDGET (display);
}
@@ -871,10 +871,10 @@ mbox_fill_preview_cb (GObject *preview,
CamelMimeMessage *msg)
{
EMailDisplay *display;
- EMFormat *formatter;
- GHashTable *formatters;
- SoupSession *session;
- gchar *mail_uri;
+ EMFormat *formatter;
+ GHashTable *formatters;
+ SoupSession *session;
+ gchar *mail_uri;
g_return_if_fail (preview != NULL);
g_return_if_fail (msg != NULL);
@@ -882,23 +882,23 @@ mbox_fill_preview_cb (GObject *preview,
display = g_object_get_data (preview, "mbox-imp-display");
g_return_if_fail (display != NULL);
- session = webkit_get_default_session ();
+ session = webkit_get_default_session ();
formatters = g_object_get_data (G_OBJECT (session), "formatters");
- if (!formatters) {
- formatters = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free, NULL);
+ if (!formatters) {
+ formatters = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free, NULL);
g_object_set_data (G_OBJECT (session), "formatters", formatters);
- }
+ }
- mail_uri = em_format_build_mail_uri (NULL, msg->message_id, NULL, NULL);
+ mail_uri = em_format_build_mail_uri (NULL, msg->message_id, NULL, NULL);
- formatter = EM_FORMAT (em_format_html_display_new ());
- formatter->message_uid = g_strdup (msg->message_id);
- formatter->uri_base = g_strdup (mail_uri);
+ formatter = EM_FORMAT (em_format_html_display_new ());
+ formatter->message_uid = g_strdup (msg->message_id);
+ formatter->uri_base = g_strdup (mail_uri);
/* Don't free the mail_uri!! */
- g_hash_table_insert (formatters, mail_uri, formatter);
+ g_hash_table_insert (formatters, mail_uri, formatter);
- em_format_parse_async (formatter, msg, NULL, NULL,
- message_parsed_cb, preview);
+ em_format_parse_async (formatter, msg, NULL, NULL,
+ message_parsed_cb, preview);
}
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 678dce7..1bf6d4e 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -308,7 +308,7 @@ mail_shell_content_get_backend (EMailReader *reader)
}
static EMailDisplay *
-mail_shell_content_get_mail_display(EMailReader *reader)
+mail_shell_content_get_mail_display (EMailReader *reader)
{
EMailShellContent *mail_shell_content;
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 15ab8ae..5487920 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -895,12 +895,12 @@ action_mail_smart_backward_cb (GtkAction *action,
EMailView *mail_view;
GtkWidget *message_list;
GtkToggleAction *toggle_action;
- GtkWidget *window;
- GtkAdjustment *adj;
+ GtkWidget *window;
+ GtkAdjustment *adj;
EMailDisplay *display;
gboolean caret_mode;
gboolean magic_spacebar;
- gdouble value;
+ gdouble value;
/* This implements the so-called "Magic Backspace". */
@@ -925,43 +925,43 @@ action_mail_smart_backward_cb (GtkAction *action,
toggle_action = GTK_TOGGLE_ACTION (ACTION (MAIL_CARET_MODE));
caret_mode = gtk_toggle_action_get_active (toggle_action);
- window = gtk_widget_get_parent (GTK_WIDGET (display));
- if (!GTK_IS_SCROLLED_WINDOW (window))
- return;
+ window = gtk_widget_get_parent (GTK_WIDGET (display));
+ if (!GTK_IS_SCROLLED_WINDOW (window))
+ return;
- adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (window));
- value = gtk_adjustment_get_value (adj);
- if (value == 0) {
+ adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (window));
+ value = gtk_adjustment_get_value (adj);
+ if (value == 0) {
- if (caret_mode || !magic_spacebar)
- return;
+ if (caret_mode || !magic_spacebar)
+ return;
/* XXX Are two separate calls really necessary? */
- if (message_list_select (
- MESSAGE_LIST (message_list),
- MESSAGE_LIST_SELECT_PREVIOUS,
- 0, CAMEL_MESSAGE_SEEN))
- return;
+ if (message_list_select (
+ MESSAGE_LIST (message_list),
+ MESSAGE_LIST_SELECT_PREVIOUS,
+ 0, CAMEL_MESSAGE_SEEN))
+ return;
- if (message_list_select (
- MESSAGE_LIST (message_list),
- MESSAGE_LIST_SELECT_PREVIOUS |
- MESSAGE_LIST_SELECT_WRAP,
- 0, CAMEL_MESSAGE_SEEN))
- return;
+ if (message_list_select (
+ MESSAGE_LIST (message_list),
+ MESSAGE_LIST_SELECT_PREVIOUS |
+ MESSAGE_LIST_SELECT_WRAP,
+ 0, CAMEL_MESSAGE_SEEN))
+ return;
- em_folder_tree_select_next_path (folder_tree, TRUE);
+ em_folder_tree_select_next_path (folder_tree, TRUE);
- gtk_widget_grab_focus (message_list);
+ gtk_widget_grab_focus (message_list);
- } else {
+ } else {
- gtk_adjustment_set_value (adj,
- value - gtk_adjustment_get_page_increment (adj));
+ gtk_adjustment_set_value (adj,
+ value - gtk_adjustment_get_page_increment (adj));
- return;
- }
+ return;
+ }
}
static void
@@ -978,14 +978,14 @@ action_mail_smart_forward_cb (GtkAction *action,
EMailReader *reader;
EMailView *mail_view;
GtkWidget *message_list;
- GtkWidget *window;
- GtkAdjustment *adj;
+ GtkWidget *window;
+ GtkAdjustment *adj;
GtkToggleAction *toggle_action;
EMailDisplay *display;
gboolean caret_mode;
gboolean magic_spacebar;
- gdouble value;
- gdouble upper;
+ gdouble value;
+ gdouble upper;
/* This implements the so-called "Magic Spacebar". */
@@ -1010,44 +1010,44 @@ action_mail_smart_forward_cb (GtkAction *action,
toggle_action = GTK_TOGGLE_ACTION (ACTION (MAIL_CARET_MODE));
caret_mode = gtk_toggle_action_get_active (toggle_action);
- window = gtk_widget_get_parent (GTK_WIDGET (display));
- if (!GTK_IS_SCROLLED_WINDOW (window))
- return;
+ window = gtk_widget_get_parent (GTK_WIDGET (display));
+ if (!GTK_IS_SCROLLED_WINDOW (window))
+ return;
- adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (window));
- value = gtk_adjustment_get_value (adj);
- upper = gtk_adjustment_get_upper (adj);
- if (value + gtk_adjustment_get_page_size (adj) >= upper) {
+ adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (window));
+ value = gtk_adjustment_get_value (adj);
+ upper = gtk_adjustment_get_upper (adj);
+ if (value + gtk_adjustment_get_page_size (adj) >= upper) {
- if (caret_mode || !magic_spacebar)
- return;
+ if (caret_mode || !magic_spacebar)
+ return;
/* XXX Are two separate calls really necessary? */
- if (message_list_select (
- MESSAGE_LIST (message_list),
- MESSAGE_LIST_SELECT_NEXT,
- 0, CAMEL_MESSAGE_SEEN))
- return;
+ if (message_list_select (
+ MESSAGE_LIST (message_list),
+ MESSAGE_LIST_SELECT_NEXT,
+ 0, CAMEL_MESSAGE_SEEN))
+ return;
- if (message_list_select (
- MESSAGE_LIST (message_list),
- MESSAGE_LIST_SELECT_NEXT |
- MESSAGE_LIST_SELECT_WRAP,
- 0, CAMEL_MESSAGE_SEEN))
- return;
+ if (message_list_select (
+ MESSAGE_LIST (message_list),
+ MESSAGE_LIST_SELECT_NEXT |
+ MESSAGE_LIST_SELECT_WRAP,
+ 0, CAMEL_MESSAGE_SEEN))
+ return;
- em_folder_tree_select_next_path (folder_tree, TRUE);
+ em_folder_tree_select_next_path (folder_tree, TRUE);
- gtk_widget_grab_focus (message_list);
+ gtk_widget_grab_focus (message_list);
- } else {
+ } else {
- gtk_adjustment_set_value (adj,
- value + gtk_adjustment_get_page_increment (adj));
+ gtk_adjustment_set_value (adj,
+ value + gtk_adjustment_get_page_increment (adj));
- return;
- }
+ return;
+ }
}
static void
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 788a365..45238db 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -100,7 +100,7 @@ org_gnome_audio_inline_pobject_free (EMFormatPURI *o)
static void
org_gnome_audio_inline_pause_clicked (GtkWidget *button,
- EMFormatPURI *puri)
+ EMFormatPURI *puri)
{
EMFormatInlineAudioPURI *po = (EMFormatInlineAudioPURI *) puri;
@@ -112,7 +112,7 @@ org_gnome_audio_inline_pause_clicked (GtkWidget *button,
static void
org_gnome_audio_inline_stop_clicked (GtkWidget *button,
- EMFormatPURI *puri)
+ EMFormatPURI *puri)
{
EMFormatInlineAudioPURI *po = (EMFormatInlineAudioPURI *) puri;
@@ -189,7 +189,7 @@ org_gnome_audio_inline_gst_callback (GstBus *bus,
static void
org_gnome_audio_inline_play_clicked (GtkWidget *button,
- EMFormatPURI *puri)
+ EMFormatPURI *puri)
{
EMFormatInlineAudioPURI *po = (EMFormatInlineAudioPURI *) puri;
GstState cur_state;
@@ -277,10 +277,10 @@ org_gnome_audio_inline_add_button (GtkWidget *box,
static void
write_button_panel (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
gchar *str;
@@ -293,10 +293,10 @@ write_button_panel (EMFormat *emf,
g_free (str);
}
-static GtkWidget*
+static GtkWidget *
org_gnome_audio_inline_button_panel (EMFormat *emf,
- EMFormatPURI *puri,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ GCancellable *cancellable)
{
GtkWidget *box;
EMFormatInlineAudioPURI *po = (EMFormatInlineAudioPURI *) puri;
@@ -326,7 +326,7 @@ org_gnome_audio_inline_format (gpointer ep,
d(printf ("audio inline formatter: format classid %s\n", t->part_id->str));
pobj = (EMFormatInlineAudioPURI *) em_format_puri_new (
- t->format, sizeof (EMFormatInlineAudioPURI),
+ t->format, sizeof (EMFormatInlineAudioPURI),
t->part, t->part_id->str);
pobj->puri.widget_func = org_gnome_audio_inline_button_panel;
pobj->puri.write_func = write_button_panel;
@@ -341,7 +341,7 @@ org_gnome_audio_inline_format (gpointer ep,
pobj->puri.free = org_gnome_audio_inline_pobject_free;
pobj->target_state = GST_STATE_NULL;
- em_format_add_puri (t->format, (EMFormatPURI *) pobj);
+ em_format_add_puri (t->format, (EMFormatPURI *) pobj);
g_string_truncate (t->part_id, len);
}
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index a628d15..b40a508 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -515,7 +515,7 @@ cal_opened_cb (GObject *source_object,
gpointer user_data)
{
ESource *source = E_SOURCE (source_object);
- ItipView *view = user_data;
+ ItipView *view = user_data;
ItipPURI *pitip = itip_view_get_puri (view);
ECalClientSourceType source_type;
EClient *client = NULL;
@@ -647,13 +647,13 @@ find_cal_update_ui (FormatItipFindData *fd,
ECalClient *cal_client)
{
ItipPURI *pitip;
- ItipView *view;
+ ItipView *view;
ESource *source;
g_return_if_fail (fd != NULL);
pitip = fd->puri;
- view = fd->view;
+ view = fd->view;
/* UI part gone */
if (g_cancellable_is_cancelled (fd->cancellable))
@@ -726,7 +726,7 @@ decrease_find_data (FormatItipFindData *fd)
if (fd->count == 0 && !g_cancellable_is_cancelled (fd->cancellable)) {
gboolean rsvp_enabled = FALSE;
ItipPURI *pitip = fd->puri;
- ItipView *view = fd->view;
+ ItipView *view = fd->view;
itip_view_remove_lower_info_item (view, pitip->progress_info_id);
pitip->progress_info_id = 0;
@@ -737,7 +737,7 @@ decrease_find_data (FormatItipFindData *fd)
* * invitiations (REQUEST), but not replies (REPLY).
* Replies only make sense for events with an organizer.
*/
- if ((!pitip->current_client || !e_cal_client_check_save_schedules (pitip->current_client)) &&
+ if ((!pitip->current_client || !e_cal_client_check_save_schedules (pitip->current_client)) &&
(pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) &&
pitip->has_organizer) {
rsvp_enabled = TRUE;
@@ -808,17 +808,17 @@ decrease_find_data (FormatItipFindData *fd)
switch (pitip->type) {
case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
itip_view_add_lower_info_item_printf (
- view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
_("Unable to find this meeting in any calendar"));
break;
case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
itip_view_add_lower_info_item_printf (
- view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
_("Unable to find this task in any task list"));
break;
case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
itip_view_add_lower_info_item_printf (
- view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
_("Unable to find this memo in any memo list"));
break;
default:
@@ -833,8 +833,8 @@ decrease_find_data (FormatItipFindData *fd)
g_object_unref (fd->cancellable);
g_free (fd->uid);
g_free (fd->rid);
- if (fd->sexp)
- g_free (fd->sexp);
+ if (fd->sexp)
+ g_free (fd->sexp);
g_free (fd);
}
}
@@ -990,7 +990,7 @@ find_cal_opened_cb (GObject *source_object,
ESource *source = E_SOURCE (source_object);
FormatItipFindData *fd = user_data;
ItipPURI *pitip = fd->puri;
- ItipView *view = fd->view;
+ ItipView *view = fd->view;
ECalClientSourceType source_type;
EClient *client = NULL;
ECalClient *cal_client;
@@ -1124,11 +1124,11 @@ find_server (ItipPURI *pitip,
l = sources_conflict;
pitip->progress_info_id = itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
_("Opening the calendar. Please wait..."));
} else {
pitip->progress_info_id = itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
_("Searching for an existing version of this appointment"));
l = all_sources;
@@ -1142,7 +1142,7 @@ find_server (ItipPURI *pitip,
fd = g_new0 (FormatItipFindData, 1);
fd->puri = pitip;
- fd->view = view;
+ fd->view = view;
fd->cancellable = g_object_ref (pitip->cancellable);
fd->conflicts = g_hash_table_new (g_direct_hash, g_direct_equal);
fd->uid = g_strdup (uid);
@@ -1380,10 +1380,10 @@ update_item_progress_info (ItipPURI *pitip,
if (message) {
itip_view_set_buttons_sensitive (view, FALSE);
pitip->update_item_progress_info_id =
- itip_view_add_lower_info_item (
- view,
- ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
- message);
+ itip_view_add_lower_info_item (
+ view,
+ ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
+ message);
}
}
@@ -1487,7 +1487,7 @@ receive_objects_ready_cb (GObject *ecalclient,
{
ECalClient *client = E_CAL_CLIENT (ecalclient);
ESource *source = e_client_get_source (E_CLIENT (client));
- ItipView *view = user_data;
+ ItipView *view = user_data;
ItipPURI *pitip = itip_view_get_puri (view);
gboolean save_schedules;
GError *error = NULL;
@@ -1497,8 +1497,8 @@ receive_objects_ready_cb (GObject *ecalclient,
!g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) {
update_item_progress_info (pitip, view, NULL);
pitip->update_item_error_info_id =
- itip_view_add_lower_info_item_printf (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ itip_view_add_lower_info_item_printf (
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Unable to send item to calendar '%s'. %s"),
e_source_peek_name (source), error ? error->message : _("Unknown error"));
}
@@ -1513,24 +1513,24 @@ receive_objects_ready_cb (GObject *ecalclient,
switch (pitip->update_item_response) {
case ITIP_VIEW_RESPONSE_ACCEPT:
itip_view_add_lower_info_item_printf (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Sent to calendar '%s' as accepted"), e_source_peek_name (source));
break;
case ITIP_VIEW_RESPONSE_TENTATIVE:
itip_view_add_lower_info_item_printf (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Sent to calendar '%s' as tentative"), e_source_peek_name (source));
break;
case ITIP_VIEW_RESPONSE_DECLINE:
/* 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,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Sent to calendar '%s' as declined"), e_source_peek_name (source));
break;
case ITIP_VIEW_RESPONSE_CANCEL:
/* 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,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Sent to calendar '%s' as canceled"), e_source_peek_name (source));
break;
default:
@@ -1728,11 +1728,11 @@ update_item (ItipPURI *pitip,
pitip->update_item_response = response;
e_cal_client_receive_objects (
- pitip->current_client,
- pitip->top_level,
- pitip->cancellable,
- receive_objects_ready_cb,
- view);
+ pitip->current_client,
+ pitip->top_level,
+ pitip->cancellable,
+ receive_objects_ready_cb,
+ view);
cleanup:
icalcomponent_remove_component (pitip->top_level, clone);
@@ -1830,19 +1830,19 @@ remove_delegate (ItipPURI *pitip,
/* send cancellation notice to delegate */
status = send_comp_to_attendee (
- E_CAL_COMPONENT_METHOD_CANCEL, pitip->comp,
- delegate, pitip->current_client, comment);
+ E_CAL_COMPONENT_METHOD_CANCEL, pitip->comp,
+ delegate, pitip->current_client, comment);
if (status)
send_comp_to_attendee (
- E_CAL_COMPONENT_METHOD_REQUEST, pitip->comp,
- delegator, pitip->current_client, comment);
+ E_CAL_COMPONENT_METHOD_REQUEST, pitip->comp,
+ delegator, pitip->current_client, comment);
if (status) {
itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Sent a cancelation notice to the delegate"));
} else
itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Could not send the cancelation notice to the delegate"));
g_free (comment);
@@ -1876,7 +1876,7 @@ modify_object_cb (GObject *ecalclient,
gpointer user_data)
{
ECalClient *client = E_CAL_CLIENT (ecalclient);
- ItipView *view = user_data;
+ ItipView *view = user_data;
ItipPURI *pitip = itip_view_get_puri (view);
GError *error = NULL;
@@ -1889,9 +1889,9 @@ modify_object_cb (GObject *ecalclient,
update_item_progress_info (pitip, view, NULL);
pitip->update_item_error_info_id =
- itip_view_add_lower_info_item_printf (
- view,
- ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
+ itip_view_add_lower_info_item_printf (
+ view,
+ ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
_("Unable to update attendee. %s"),
error ? error->message : _("Unknown error"));
@@ -1921,7 +1921,7 @@ update_attendee_status_icalcomp (ItipPURI *pitip,
icalcomponent_free (icalcomp);
itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
_("The meeting is invalid and cannot be updated"));
} else {
icalcomponent *org_icalcomp;
@@ -1933,7 +1933,7 @@ update_attendee_status_icalcomp (ItipPURI *pitip,
if (attendees != NULL) {
ECalComponentAttendee *a = attendees->data;
icalproperty *prop, *del_prop;
- EShell *shell = e_shell_get_default ();
+ EShell *shell = e_shell_get_default ();
prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
if ((a->status == ICAL_PARTSTAT_DELEGATED) && (del_prop = find_attendee (org_icalcomp, itip_strip_mailto (a->delto))) && !(find_attendee (icalcomp, itip_strip_mailto (a->delto)))) {
@@ -1969,7 +1969,7 @@ update_attendee_status_icalcomp (ItipPURI *pitip,
e_cal_component_rescan (comp);
} else if (response == GTK_RESPONSE_NO) {
remove_delegate (pitip,
- view,
+ view,
itip_strip_mailto (a->value),
itip_strip_mailto (a->delfrom),
comp);
@@ -1990,7 +1990,7 @@ update_attendee_status_icalcomp (ItipPURI *pitip,
}
} else if (a->status == ICAL_PARTSTAT_NONE || a->status == ICAL_PARTSTAT_X) {
itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
_("Attendee status could not be updated because the status is invalid"));
goto cleanup;
} else {
@@ -2021,11 +2021,11 @@ update_attendee_status_icalcomp (ItipPURI *pitip,
update_item_progress_info (pitip, view, _("Saving changes to the calendar. Please wait..."));
e_cal_client_modify_object (
- pitip->current_client,
- icalcomp, rid ? CALOBJ_MOD_THIS : CALOBJ_MOD_ALL,
- pitip->cancellable,
- modify_object_cb,
- view);
+ pitip->current_client,
+ icalcomp, rid ? CALOBJ_MOD_THIS : CALOBJ_MOD_ALL,
+ pitip->cancellable,
+ modify_object_cb,
+ view);
cleanup:
g_object_unref (comp);
@@ -2037,7 +2037,7 @@ update_attendee_status_get_object_without_rid_cb (GObject *ecalclient,
gpointer user_data)
{
ECalClient *client = E_CAL_CLIENT (ecalclient);
- ItipView *view = user_data;
+ ItipView *view = user_data;
ItipPURI *pitip = itip_view_get_puri (view);
icalcomponent *icalcomp = NULL;
GError *error = NULL;
@@ -2053,7 +2053,7 @@ update_attendee_status_get_object_without_rid_cb (GObject *ecalclient,
update_item_progress_info (pitip, view, NULL);
pitip->update_item_error_info_id = itip_view_add_lower_info_item (
- view,
+ view,
ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
_("Attendee status can not be updated because the item no longer exists"));
return;
@@ -2068,7 +2068,7 @@ update_attendee_status_get_object_with_rid_cb (GObject *ecalclient,
gpointer user_data)
{
ECalClient *client = E_CAL_CLIENT (ecalclient);
- ItipView *view = user_data;
+ ItipView *view = user_data;
ItipPURI *pitip = itip_view_get_puri (view);
icalcomponent *icalcomp = NULL;
GError *error = NULL;
@@ -2093,19 +2093,19 @@ update_attendee_status_get_object_with_rid_cb (GObject *ecalclient,
update_item_progress_info (pitip, view, NULL);
pitip->update_item_error_info_id = itip_view_add_lower_info_item (
- view,
+ view,
ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
_("Attendee status can not be updated because the item no longer exists"));
return;
}
e_cal_client_get_object (
- pitip->current_client,
- uid,
- NULL,
- pitip->cancellable,
- update_attendee_status_get_object_without_rid_cb,
- view);
+ pitip->current_client,
+ uid,
+ NULL,
+ pitip->cancellable,
+ update_attendee_status_get_object_without_rid_cb,
+ view);
g_free (rid);
return;
@@ -2129,11 +2129,11 @@ update_attendee_status (ItipPURI *pitip,
/* search for a master object if the detached object doesn't exist in the calendar */
e_cal_client_get_object (
- pitip->current_client,
- uid, rid,
- pitip->cancellable,
- update_attendee_status_get_object_with_rid_cb,
- view);
+ pitip->current_client,
+ uid, rid,
+ pitip->cancellable,
+ update_attendee_status_get_object_with_rid_cb,
+ view);
g_free (rid);
}
@@ -2153,17 +2153,17 @@ send_item (ItipPURI *pitip,
switch (pitip->type) {
case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Meeting information sent"));
break;
case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Task information sent"));
break;
case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
_("Memo information sent"));
break;
default:
@@ -2174,17 +2174,17 @@ send_item (ItipPURI *pitip,
switch (pitip->type) {
case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
itip_view_add_lower_info_item (
- view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
_("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,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
_("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,
+ view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
_("Unable to send memo information, the memo does not exist"));
break;
default:
@@ -2270,20 +2270,20 @@ save_vcalendar_cb (ItipPURI *pitip)
static void
set_itip_error (ItipView *view,
const gchar *primary,
- const gchar *secondary,
+ const gchar *secondary,
gboolean save_btn)
{
- gchar *error;
+ gchar *error;
- error = g_strdup_printf (
+ error = g_strdup_printf (
"<div class=\"error\">"
"<p><b>%s</b></p>"
"<p>%s</p>",
- primary, secondary);
+ primary, secondary);
- itip_view_set_error (view, error, save_btn);
+ itip_view_set_error (view, error, save_btn);
- g_free (error);
+ g_free (error);
}
static gboolean
@@ -2309,7 +2309,7 @@ extract_itip_data (ItipPURI *pitip,
set_itip_error (view,
_("The calendar attached is not valid"),
_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."),
- FALSE);
+ FALSE);
return FALSE;
}
@@ -2321,7 +2321,7 @@ extract_itip_data (ItipPURI *pitip,
set_itip_error (view,
_("The calendar attached is not valid"),
_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."),
- FALSE);
+ FALSE);
if (pitip->main_comp) {
icalcomponent_free (pitip->main_comp);
@@ -2363,7 +2363,7 @@ extract_itip_data (ItipPURI *pitip,
set_itip_error (view,
_("The item in the calendar is not valid"),
_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
- FALSE);
+ FALSE);
return FALSE;
}
@@ -2392,7 +2392,7 @@ extract_itip_data (ItipPURI *pitip,
set_itip_error (view,
_("The item in the calendar is not valid"),
_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
- FALSE);
+ FALSE);
return FALSE;
}
@@ -2407,7 +2407,7 @@ extract_itip_data (ItipPURI *pitip,
set_itip_error (view,
_("The calendar attached contains multiple items"),
_("To process all of these items, the file should be saved and the calendar imported"),
- TRUE);
+ TRUE);
} if (pitip->total > 0) {
pitip->current = 1;
@@ -2490,7 +2490,7 @@ extract_itip_data (ItipPURI *pitip,
set_itip_error (view,
_("The item in the calendar is not valid"),
_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
- FALSE);
+ FALSE);
return FALSE;
};
@@ -2613,10 +2613,10 @@ view_response_cb (ItipView *view,
icalproperty *prop;
ECalComponentTransparency trans;
- if (response == ITIP_VIEW_RESPONSE_SAVE) {
- save_vcalendar_cb (pitip);
- return;
- }
+ if (response == ITIP_VIEW_RESPONSE_SAVE) {
+ save_vcalendar_cb (pitip);
+ return;
+ }
pitip->can_delete_invitation_from_cache = FALSE;
if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) {
@@ -2766,56 +2766,56 @@ static void
init_itip_view (ItipPURI *info,
ItipView *view)
{
- EShell *shell;
- EShellSettings *shell_settings;
- ECalComponentText text;
- ECalComponentOrganizer organizer;
- ECalComponentDateTime datetime;
- icaltimezone *from_zone, *to_zone;
- GString *gstring = NULL;
- GSList *list, *l;
- icalcomponent *icalcomp;
- const gchar *string, *org;
- gint i;
- gboolean response_enabled;
- gboolean have_alarms = FALSE;
- EMFormat *emf = info->puri.emf;
-
- shell = e_shell_get_default ();
- shell_settings = e_shell_get_shell_settings (shell);
+ EShell *shell;
+ EShellSettings *shell_settings;
+ ECalComponentText text;
+ ECalComponentOrganizer organizer;
+ ECalComponentDateTime datetime;
+ icaltimezone *from_zone, *to_zone;
+ GString *gstring = NULL;
+ GSList *list, *l;
+ icalcomponent *icalcomp;
+ const gchar *string, *org;
+ gint i;
+ gboolean response_enabled;
+ gboolean have_alarms = FALSE;
+ EMFormat *emf = info->puri.emf;
+
+ shell = e_shell_get_default ();
+ shell_settings = e_shell_get_shell_settings (shell);
/* Reset current client before initializing view */
- info->current_client = NULL;
+ info->current_client = NULL;
/* Accounts */
- info->accounts = e_get_account_list ();
+ info->accounts = e_get_account_list ();
/* Source Lists and open ecal clients */
- for (i = 0; i < E_CAL_CLIENT_SOURCE_TYPE_LAST; i++) {
- if (!e_cal_client_get_sources (&info->source_lists[i], i, NULL))
+ for (i = 0; i < E_CAL_CLIENT_SOURCE_TYPE_LAST; i++) {
+ if (!e_cal_client_get_sources (&info->source_lists[i], i, NULL))
/* FIXME More error handling? */
- info->source_lists[i] = NULL;
+ info->source_lists[i] = NULL;
/* Initialize the ecal hashes */
- info->clients[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
- }
+ info->clients[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+ }
/* FIXME Handle multiple VEVENTS with the same UID, ie detached instances */
- if (!extract_itip_data (info, view, &have_alarms))
- return;
+ if (!extract_itip_data (info, view, &have_alarms))
+ return;
- response_enabled = in_proper_folder (emf->folder);
+ response_enabled = in_proper_folder (emf->folder);
- if (!response_enabled) {
- itip_view_set_mode (view, ITIP_VIEW_MODE_HIDE_ALL);
- } else {
- itip_view_set_show_inherit_alarm_check (
- view,
- have_alarms && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST));
+ if (!response_enabled) {
+ itip_view_set_mode (view, ITIP_VIEW_MODE_HIDE_ALL);
+ } else {
+ itip_view_set_show_inherit_alarm_check (
+ view,
+ have_alarms && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST));
- switch (info->method) {
- case ICAL_METHOD_PUBLISH:
- case ICAL_METHOD_REQUEST:
+ switch (info->method) {
+ case ICAL_METHOD_PUBLISH:
+ case ICAL_METHOD_REQUEST:
/*
* Treat meeting request (sent by organizer directly) and
* published evend (forwarded by organizer or attendee) alike:
@@ -2823,267 +2823,267 @@ init_itip_view (ItipPURI *info,
* we show the "accept/tentative/decline" choice.
* Otherwise only show "accept".
*/
- itip_view_set_mode (view,
- info->has_organizer ?
- ITIP_VIEW_MODE_REQUEST :
- ITIP_VIEW_MODE_PUBLISH);
- break;
- case ICAL_METHOD_REPLY:
- itip_view_set_mode (view, ITIP_VIEW_MODE_REPLY);
- break;
- case ICAL_METHOD_ADD:
- itip_view_set_mode (view, ITIP_VIEW_MODE_ADD);
- break;
- case ICAL_METHOD_CANCEL:
- itip_view_set_mode (view, ITIP_VIEW_MODE_CANCEL);
- break;
- case ICAL_METHOD_REFRESH:
- itip_view_set_mode (view, ITIP_VIEW_MODE_REFRESH);
- break;
- case ICAL_METHOD_COUNTER:
- itip_view_set_mode (view, ITIP_VIEW_MODE_COUNTER);
- break;
- case ICAL_METHOD_DECLINECOUNTER:
- itip_view_set_mode (view, ITIP_VIEW_MODE_DECLINECOUNTER);
- break;
- case ICAL_METHOD_X :
+ itip_view_set_mode (view,
+ info->has_organizer ?
+ ITIP_VIEW_MODE_REQUEST :
+ ITIP_VIEW_MODE_PUBLISH);
+ break;
+ case ICAL_METHOD_REPLY:
+ itip_view_set_mode (view, ITIP_VIEW_MODE_REPLY);
+ break;
+ case ICAL_METHOD_ADD:
+ itip_view_set_mode (view, ITIP_VIEW_MODE_ADD);
+ break;
+ case ICAL_METHOD_CANCEL:
+ itip_view_set_mode (view, ITIP_VIEW_MODE_CANCEL);
+ break;
+ case ICAL_METHOD_REFRESH:
+ itip_view_set_mode (view, ITIP_VIEW_MODE_REFRESH);
+ break;
+ case ICAL_METHOD_COUNTER:
+ itip_view_set_mode (view, ITIP_VIEW_MODE_COUNTER);
+ break;
+ case ICAL_METHOD_DECLINECOUNTER:
+ itip_view_set_mode (view, ITIP_VIEW_MODE_DECLINECOUNTER);
+ break;
+ case ICAL_METHOD_X :
/* Handle appointment requests from Microsoft Live. This is
* a best-at-hand-now handling. Must be revisited when we have
* better access to the source of such meetings */
- info->method = ICAL_METHOD_REQUEST;
- itip_view_set_mode (view, ITIP_VIEW_MODE_REQUEST);
- break;
- default:
- return;
- }
- }
-
- itip_view_set_item_type (view, info->type);
-
- if (response_enabled) {
- switch (info->method) {
- case ICAL_METHOD_REQUEST:
+ info->method = ICAL_METHOD_REQUEST;
+ itip_view_set_mode (view, ITIP_VIEW_MODE_REQUEST);
+ break;
+ default:
+ return;
+ }
+ }
+
+ itip_view_set_item_type (view, info->type);
+
+ if (response_enabled) {
+ switch (info->method) {
+ case ICAL_METHOD_REQUEST:
/* FIXME What about the name? */
- itip_view_set_delegator (view, info->delegator_name ? info->delegator_name : info->delegator_address);
- case ICAL_METHOD_PUBLISH:
- case ICAL_METHOD_ADD:
- case ICAL_METHOD_CANCEL:
- case ICAL_METHOD_DECLINECOUNTER:
- itip_view_set_show_update_check (view, FALSE);
+ itip_view_set_delegator (view, info->delegator_name ? info->delegator_name : info->delegator_address);
+ case ICAL_METHOD_PUBLISH:
+ case ICAL_METHOD_ADD:
+ case ICAL_METHOD_CANCEL:
+ case ICAL_METHOD_DECLINECOUNTER:
+ itip_view_set_show_update_check (view, FALSE);
/* An organizer sent this */
- e_cal_component_get_organizer (info->comp, &organizer);
- org = organizer.cn ? organizer.cn : itip_strip_mailto (organizer.value);
-
- itip_view_set_organizer (view, org);
- if (organizer.sentby)
- itip_view_set_organizer_sentby (
- view, itip_strip_mailto (organizer.sentby));
-
- if (info->my_address) {
- if (!(organizer.value && !g_ascii_strcasecmp (itip_strip_mailto (organizer.value), info->my_address))
- && !(organizer.sentby && !g_ascii_strcasecmp (itip_strip_mailto (organizer.sentby), info->my_address))
- && (info->to_address && g_ascii_strcasecmp (info->to_address, info->my_address)))
- itip_view_set_proxy (view, info->to_name ? info->to_name : info->to_address);
- }
- break;
- case ICAL_METHOD_REPLY:
- case ICAL_METHOD_REFRESH:
- case ICAL_METHOD_COUNTER:
- itip_view_set_show_update_check (view, TRUE);
+ e_cal_component_get_organizer (info->comp, &organizer);
+ org = organizer.cn ? organizer.cn : itip_strip_mailto (organizer.value);
+
+ itip_view_set_organizer (view, org);
+ if (organizer.sentby)
+ itip_view_set_organizer_sentby (
+ view, itip_strip_mailto (organizer.sentby));
+
+ if (info->my_address) {
+ if (!(organizer.value && !g_ascii_strcasecmp (itip_strip_mailto (organizer.value), info->my_address))
+ && !(organizer.sentby && !g_ascii_strcasecmp (itip_strip_mailto (organizer.sentby), info->my_address))
+ && (info->to_address && g_ascii_strcasecmp (info->to_address, info->my_address)))
+ itip_view_set_proxy (view, info->to_name ? info->to_name : info->to_address);
+ }
+ break;
+ case ICAL_METHOD_REPLY:
+ case ICAL_METHOD_REFRESH:
+ case ICAL_METHOD_COUNTER:
+ itip_view_set_show_update_check (view, TRUE);
/* An attendee sent this */
- e_cal_component_get_attendee_list (info->comp, &list);
- if (list != NULL) {
- ECalComponentAttendee *attendee;
-
- attendee = list->data;
-
- itip_view_set_attendee (view, attendee->cn ? attendee->cn : itip_strip_mailto (attendee->value));
-
- if (attendee->sentby)
- itip_view_set_attendee_sentby (view, itip_strip_mailto (attendee->sentby));
-
- if (info->my_address) {
- if (!(attendee->value && !g_ascii_strcasecmp (itip_strip_mailto (attendee->value), info->my_address))
- && !(attendee->sentby && !g_ascii_strcasecmp (itip_strip_mailto (attendee->sentby), info->my_address))
- && (info->from_address && g_ascii_strcasecmp (info->from_address, info->my_address)))
- itip_view_set_proxy (view, info->from_name ? info->from_name : info->from_address);
- }
-
- e_cal_component_free_attendee_list (list);
- }
- break;
- default:
- g_assert_not_reached ();
- break;
- }
- }
-
- e_cal_component_get_summary (info->comp, &text);
+ e_cal_component_get_attendee_list (info->comp, &list);
+ if (list != NULL) {
+ ECalComponentAttendee *attendee;
+
+ attendee = list->data;
+
+ itip_view_set_attendee (view, attendee->cn ? attendee->cn : itip_strip_mailto (attendee->value));
+
+ if (attendee->sentby)
+ itip_view_set_attendee_sentby (view, itip_strip_mailto (attendee->sentby));
+
+ if (info->my_address) {
+ if (!(attendee->value && !g_ascii_strcasecmp (itip_strip_mailto (attendee->value), info->my_address))
+ && !(attendee->sentby && !g_ascii_strcasecmp (itip_strip_mailto (attendee->sentby), info->my_address))
+ && (info->from_address && g_ascii_strcasecmp (info->from_address, info->my_address)))
+ itip_view_set_proxy (view, info->from_name ? info->from_name : info->from_address);
+ }
+
+ e_cal_component_free_attendee_list (list);
+ }
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+ }
+
+ e_cal_component_get_summary (info->comp, &text);
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);
+ e_cal_component_get_location (info->comp, &string);
+ itip_view_set_location (view, string);
/* Status really only applies for REPLY */
- if (response_enabled && info->method == ICAL_METHOD_REPLY) {
- e_cal_component_get_attendee_list (info->comp, &list);
- if (list != NULL) {
- ECalComponentAttendee *a = list->data;
+ if (response_enabled && info->method == ICAL_METHOD_REPLY) {
+ e_cal_component_get_attendee_list (info->comp, &list);
+ if (list != NULL) {
+ ECalComponentAttendee *a = list->data;
- switch (a->status) {
- case ICAL_PARTSTAT_ACCEPTED:
+ switch (a->status) {
+ case ICAL_PARTSTAT_ACCEPTED:
itip_view_set_status (view, _("Accepted"));
- break;
- case ICAL_PARTSTAT_TENTATIVE:
+ break;
+ case ICAL_PARTSTAT_TENTATIVE:
itip_view_set_status (view, _("Tentatively Accepted"));
- break;
- case ICAL_PARTSTAT_DECLINED:
+ break;
+ case ICAL_PARTSTAT_DECLINED:
itip_view_set_status (view, _("Declined"));
- break;
- case ICAL_PARTSTAT_DELEGATED:
+ break;
+ case ICAL_PARTSTAT_DELEGATED:
itip_view_set_status (view, _("Delegated"));
- break;
- default:
+ break;
+ default:
itip_view_set_status (view, _("Unknown"));
- }
- }
- e_cal_component_free_attendee_list (list);
- }
-
- if (info->method == ICAL_METHOD_REPLY
- || info->method == ICAL_METHOD_COUNTER
- || info->method == ICAL_METHOD_DECLINECOUNTER) {
+ }
+ }
+ e_cal_component_free_attendee_list (list);
+ }
+
+ if (info->method == ICAL_METHOD_REPLY
+ || info->method == ICAL_METHOD_COUNTER
+ || info->method == ICAL_METHOD_DECLINECOUNTER) {
/* FIXME Check spec to see if multiple comments are actually valid */
/* Comments for iTIP are limited to one per object */
- e_cal_component_get_comment_list (info->comp, &list);
- if (list) {
- ECalComponentText *text = list->data;
-
- if (text->value)
- itip_view_set_comment (view, text->value);
- }
- e_cal_component_free_text_list (list);
- }
-
- e_cal_component_get_description_list (info->comp, &list);
- for (l = list; l; l = l->next) {
- ECalComponentText *text = l->data;
-
- if (!gstring && text->value)
- gstring = g_string_new (text->value);
- else if (text->value)
+ e_cal_component_get_comment_list (info->comp, &list);
+ if (list) {
+ ECalComponentText *text = list->data;
+
+ if (text->value)
+ itip_view_set_comment (view, text->value);
+ }
+ e_cal_component_free_text_list (list);
+ }
+
+ e_cal_component_get_description_list (info->comp, &list);
+ for (l = list; l; l = l->next) {
+ ECalComponentText *text = l->data;
+
+ if (!gstring && text->value)
+ gstring = g_string_new (text->value);
+ else if (text->value)
g_string_append_printf (gstring, "\n\n%s", text->value);
- }
+ }
- e_cal_component_free_text_list (list);
+ e_cal_component_free_text_list (list);
- if (gstring) {
- itip_view_set_description (view, gstring->str);
- g_string_free (gstring, TRUE);
- }
+ if (gstring) {
+ itip_view_set_description (view, gstring->str);
+ g_string_free (gstring, TRUE);
+ }
to_zone = e_shell_settings_get_pointer (shell_settings, "cal-timezone");
- e_cal_component_get_dtstart (info->comp, &datetime);
- info->start_time = 0;
- if (datetime.value) {
- struct tm start_tm;
+ e_cal_component_get_dtstart (info->comp, &datetime);
+ info->start_time = 0;
+ if (datetime.value) {
+ struct tm start_tm;
/* If the timezone is not in the component, guess the local time */
/* Should we guess if the timezone is an olsen name somehow? */
- if (datetime.value->is_utc)
- from_zone = icaltimezone_get_utc_timezone ();
- else if (!datetime.value->is_utc && datetime.tzid)
- from_zone = icalcomponent_get_timezone (info->top_level, datetime.tzid);
- else
- from_zone = NULL;
+ if (datetime.value->is_utc)
+ from_zone = icaltimezone_get_utc_timezone ();
+ else if (!datetime.value->is_utc && datetime.tzid)
+ from_zone = icalcomponent_get_timezone (info->top_level, datetime.tzid);
+ else
+ from_zone = NULL;
- start_tm = icaltimetype_to_tm_with_zone (datetime.value, from_zone, to_zone);
+ start_tm = icaltimetype_to_tm_with_zone (datetime.value, from_zone, to_zone);
- itip_view_set_start (view, &start_tm, datetime.value->is_date);
- info->start_time = icaltime_as_timet_with_zone (*datetime.value, from_zone);
- }
+ itip_view_set_start (view, &start_tm, datetime.value->is_date);
+ info->start_time = icaltime_as_timet_with_zone (*datetime.value, from_zone);
+ }
- icalcomp = e_cal_component_get_icalcomponent (info->comp);
+ icalcomp = e_cal_component_get_icalcomponent (info->comp);
/* Set the recurrence id */
- if (check_is_instance (icalcomp) && datetime.value) {
- ECalComponentRange *recur_id;
- struct icaltimetype icaltime = icaltime_convert_to_zone (*datetime.value, to_zone);
-
- recur_id = g_new0 (ECalComponentRange, 1);
- recur_id->type = E_CAL_COMPONENT_RANGE_SINGLE;
- recur_id->datetime.value = &icaltime;
- recur_id->datetime.tzid = icaltimezone_get_tzid (to_zone);
- e_cal_component_set_recurid (info->comp, recur_id);
- g_free (recur_id); /* it's ok to call g_free here */
- }
- e_cal_component_free_datetime (&datetime);
-
- e_cal_component_get_dtend (info->comp, &datetime);
- info->end_time = 0;
- if (datetime.value) {
- struct tm end_tm;
+ if (check_is_instance (icalcomp) && datetime.value) {
+ ECalComponentRange *recur_id;
+ struct icaltimetype icaltime = icaltime_convert_to_zone (*datetime.value, to_zone);
+
+ recur_id = g_new0 (ECalComponentRange, 1);
+ recur_id->type = E_CAL_COMPONENT_RANGE_SINGLE;
+ recur_id->datetime.value = &icaltime;
+ recur_id->datetime.tzid = icaltimezone_get_tzid (to_zone);
+ e_cal_component_set_recurid (info->comp, recur_id);
+ g_free (recur_id); /* it's ok to call g_free here */
+ }
+ e_cal_component_free_datetime (&datetime);
+
+ e_cal_component_get_dtend (info->comp, &datetime);
+ info->end_time = 0;
+ if (datetime.value) {
+ struct tm end_tm;
/* If the timezone is not in the component, guess the local time */
/* Should we guess if the timezone is an olsen name somehow? */
- if (datetime.value->is_utc)
- from_zone = icaltimezone_get_utc_timezone ();
- else if (!datetime.value->is_utc && datetime.tzid)
- from_zone = icalcomponent_get_timezone (info->top_level, datetime.tzid);
- else
- from_zone = NULL;
-
- if (datetime.value->is_date) {
+ if (datetime.value->is_utc)
+ from_zone = icaltimezone_get_utc_timezone ();
+ else if (!datetime.value->is_utc && datetime.tzid)
+ from_zone = icalcomponent_get_timezone (info->top_level, datetime.tzid);
+ else
+ from_zone = NULL;
+
+ if (datetime.value->is_date) {
/* RFC says the DTEND is not inclusive, thus subtract one day
* if we have a date */
- icaltime_adjust (datetime.value, -1, 0, 0, 0);
- }
+ icaltime_adjust (datetime.value, -1, 0, 0, 0);
+ }
- end_tm = icaltimetype_to_tm_with_zone (datetime.value, from_zone, to_zone);
+ end_tm = icaltimetype_to_tm_with_zone (datetime.value, from_zone, to_zone);
- itip_view_set_end (view, &end_tm, datetime.value->is_date);
- info->end_time = icaltime_as_timet_with_zone (*datetime.value, from_zone);
- }
- e_cal_component_free_datetime (&datetime);
+ itip_view_set_end (view, &end_tm, datetime.value->is_date);
+ info->end_time = icaltime_as_timet_with_zone (*datetime.value, from_zone);
+ }
+ e_cal_component_free_datetime (&datetime);
/* Recurrence info */
/* FIXME Better recurring description */
- if (e_cal_component_has_recurrences (info->comp)) {
+ if (e_cal_component_has_recurrences (info->comp)) {
/* FIXME Tell the user we don't support recurring tasks */
- switch (info->type) {
- case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
+ 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"));
- break;
- case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
+ break;
+ case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This task recurs"));
- break;
- case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
+ break;
+ case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This memo recurs"));
- break;
- default:
- g_assert_not_reached ();
- break;
- }
- }
-
- if (response_enabled) {
- g_signal_connect (
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+ }
+
+ if (response_enabled) {
+ g_signal_connect (
view, "response",
- G_CALLBACK (view_response_cb), info);
+ 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));
+ 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));
- if (info->calendar_uid) {
- start_calendar_server_by_uid (info, view, info->calendar_uid, info->type);
- } else {
- find_server (info, view, info->comp);
- set_buttons_sensitive (info, view);
- }
- }
+ if (info->calendar_uid) {
+ start_calendar_server_by_uid (info, view, info->calendar_uid, info->type);
+ } else {
+ find_server (info, view, info->comp);
+ set_buttons_sensitive (info, view);
+ }
+ }
}
static void
@@ -3151,76 +3151,76 @@ write_itip_view (EMFormat *emf,
EMFormatWriterInfo *info,
GCancellable *cancellable)
{
- GString *buffer;
+ GString *buffer;
- if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING) {
- ItipView *view;
- ItipPURI *ipuri;
+ if (info->mode == EM_FORMAT_WRITE_MODE_PRINTING) {
+ ItipView *view;
+ ItipPURI *ipuri;
- buffer = g_string_sized_new (1024);
+ buffer = g_string_sized_new (1024);
- ipuri = (ItipPURI *) puri;
- view = itip_view_new (ipuri);
+ ipuri = (ItipPURI *) puri;
+ view = itip_view_new (ipuri);
- init_itip_view (ipuri, view);
- itip_view_write_for_printing (view, buffer);
+ init_itip_view (ipuri, view);
+ itip_view_write_for_printing (view, buffer);
/* Destroy the view when the formatter is destroyed */
- g_object_weak_ref (G_OBJECT (emf), (GWeakNotify) g_object_unref, view);
+ g_object_weak_ref (G_OBJECT (emf), (GWeakNotify) g_object_unref, view);
- } else if (info->mode == EM_FORMAT_WRITE_MODE_RAW) {
- buffer = g_string_sized_new (2048);
+ } else if (info->mode == EM_FORMAT_WRITE_MODE_RAW) {
+ buffer = g_string_sized_new (2048);
- itip_view_write (buffer);
+ itip_view_write (buffer);
- } else {
- gchar *uri;
+ } else {
+ gchar *uri;
- uri = em_format_build_mail_uri (
- emf->folder, emf->message_uid,
+ 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,
- NULL);
+ NULL);
- buffer = g_string_sized_new (256);
- g_string_append_printf (buffer,
+ 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>",
- uri, puri->uri, puri->uri);
+ uri, puri->uri, puri->uri);
- g_free (uri);
- }
+ g_free (uri);
+ }
- camel_stream_write_string (stream, buffer->str, cancellable, NULL);
+ camel_stream_write_string (stream, buffer->str, cancellable, NULL);
- g_string_free (buffer, TRUE);
+ g_string_free (buffer, TRUE);
}
static void
bind_itip_view (WebKitDOMElement *element,
EMFormatPURI *puri)
{
- if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) {
+ if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) {
GString *buffer = g_string_new ("");
- WebKitDOMDocument *document;
- ItipView *view;
+ WebKitDOMDocument *document;
+ ItipView *view;
- document = webkit_dom_html_iframe_element_get_content_document (
- WEBKIT_DOM_HTML_IFRAME_ELEMENT (element));
+ document = webkit_dom_html_iframe_element_get_content_document (
+ WEBKIT_DOM_HTML_IFRAME_ELEMENT (element));
- view = itip_view_new ((ItipPURI *) puri);
+ view = itip_view_new ((ItipPURI *) puri);
g_object_set_data_full (G_OBJECT (element), "view", view,
- (GDestroyNotify) g_object_unref);
+ (GDestroyNotify) g_object_unref);
- itip_view_create_dom_bindings (view,
- webkit_dom_document_get_document_element (document));
+ itip_view_create_dom_bindings (view,
+ webkit_dom_document_get_document_element (document));
- init_itip_view ((ItipPURI *) puri, view);
- g_string_free (buffer, TRUE);
- }
+ init_itip_view ((ItipPURI *) puri, view);
+ g_string_free (buffer, TRUE);
+ }
}
void
@@ -3245,10 +3245,10 @@ format_itip (EPlugin *ep,
settings = g_settings_new ("org.gnome.evolution.plugin.itip");
puri = (ItipPURI *) em_format_puri_new (
- target->format, sizeof (ItipPURI),
- target->part, target->part_id->str);
+ target->format, sizeof (ItipPURI),
+ target->part, target->part_id->str);
puri->puri.write_func = write_itip_view;
- puri->puri.bind_func = bind_itip_view;
+ 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");
@@ -3453,4 +3453,4 @@ itip_formatter_page_factory (EPlugin *ep,
gtk_widget_show_all (page);
return page;
-}
\ No newline at end of file
+}
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 848fd45..53bba25 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -107,7 +107,6 @@ struct _ItipViewPrivate {
gchar *error;
};
-
#define TEXT_ROW_SENDER "text_row_sender"
#define TABLE_ROW_SUMMARY "table_row_summary"
#define TABLE_ROW_LOCATION "table_row_location"
@@ -159,7 +158,6 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
-
static void
format_date_and_time_x (struct tm *date_tm,
struct tm *current_tm,
@@ -373,7 +371,7 @@ dupe_first_bold (const gchar *format,
return res;
}
-static gchar*
+static gchar *
set_calendar_sender_text (ItipView *view)
{
ItipViewPrivate *priv;
@@ -456,10 +454,10 @@ set_calendar_sender_text (ItipView *view)
g_free (on_behalf_of);
- return sender;
+ return sender;
}
-static gchar*
+static gchar *
set_tasklist_sender_text (ItipView *view)
{
ItipViewPrivate *priv;
@@ -540,12 +538,12 @@ set_tasklist_sender_text (ItipView *view)
if (sender && on_behalf_of)
sender = g_strjoin (NULL, sender, "\n", on_behalf_of, NULL);
- g_free (on_behalf_of);
+ g_free (on_behalf_of);
- return sender;
+ return sender;
}
-static gchar*
+static gchar *
set_journal_sender_text (ItipView *view)
{
ItipViewPrivate *priv;
@@ -592,7 +590,7 @@ set_journal_sender_text (ItipView *view)
g_free (on_behalf_of);
- return sender;
+ return sender;
}
static void
@@ -612,25 +610,25 @@ set_sender_text (ItipView *view)
priv->sender = set_journal_sender_text (view);
break;
default:
- priv->sender = NULL;
+ priv->sender = NULL;
break;
}
if (priv->sender && priv->dom_document) {
- WebKitDOMElement *div;
+ WebKitDOMElement *div;
- div = webkit_dom_document_get_element_by_id (
- priv->dom_document, TEXT_ROW_SENDER);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (div), priv->sender, NULL);
- }
+ div = webkit_dom_document_get_element_by_id (
+ priv->dom_document, TEXT_ROW_SENDER);
+ webkit_dom_html_element_set_inner_html (
+ WEBKIT_DOM_HTML_ELEMENT (div), priv->sender, NULL);
+ }
}
static void
update_start_end_times (ItipView *view)
{
ItipViewPrivate *priv;
- WebKitDOMElement *row, *col;
+ WebKitDOMElement *row, *col;
gchar buffer[256];
time_t now;
struct tm *now_tm;
@@ -640,78 +638,78 @@ update_start_end_times (ItipView *view)
now = time (NULL);
now_tm = localtime (&now);
- if (priv->start_label)
- g_free (priv->start_label);
- if (priv->end_label)
- g_free (priv->end_label);
+ if (priv->start_label)
+ g_free (priv->start_label);
+ if (priv->end_label)
+ g_free (priv->end_label);
#define is_same(_member) (priv->start_tm->_member == priv->end_tm->_member)
if (priv->start_tm && priv->end_tm && priv->start_tm_is_date && priv->end_tm_is_date
&& is_same (tm_mday) && is_same (tm_mon) && is_same (tm_year)) {
/* 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_label = g_strdup (buffer);
priv->start_header = _("All day:");
- priv->end_header = NULL;
- priv->end_label = NULL;
+ 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_label = g_strdup (buffer);
+ priv->start_label = g_strdup (buffer);
} else {
- priv->start_header = NULL;
- priv->start_label = NULL;
+ priv->start_header = NULL;
+ priv->start_label = NULL;
}
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_label = g_strdup (buffer);
+ priv->end_label = g_strdup (buffer);
} else {
- priv->end_header = NULL;
- priv->end_label = NULL;
+ priv->end_header = NULL;
+ priv->end_label = NULL;
}
- }
+ }
#undef is_same
- if (priv->dom_document) {
- row = webkit_dom_document_get_element_by_id (
- priv->dom_document, TABLE_ROW_START_DATE);
- if (priv->start_header && priv->start_label) {
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), FALSE);
-
- col = webkit_dom_element_get_first_element_child (row);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (col), priv->start_header, NULL);
-
- col = webkit_dom_element_get_last_element_child (row);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (col), priv->start_label, NULL);
- } else {
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), TRUE);
- }
-
- row = webkit_dom_document_get_element_by_id (
- priv->dom_document, TABLE_ROW_END_DATE);
- if (priv->end_header && priv->end_label) {
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), FALSE);
-
- col = webkit_dom_element_get_first_element_child (row);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (col), priv->end_header, NULL);
-
- col = webkit_dom_element_get_last_element_child (row);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (col), priv->end_label, NULL);
- } else {
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), TRUE);
- }
- }
+ if (priv->dom_document) {
+ row = webkit_dom_document_get_element_by_id (
+ priv->dom_document, TABLE_ROW_START_DATE);
+ if (priv->start_header && priv->start_label) {
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), FALSE);
+
+ col = webkit_dom_element_get_first_element_child (row);
+ webkit_dom_html_element_set_inner_html (
+ WEBKIT_DOM_HTML_ELEMENT (col), priv->start_header, NULL);
+
+ col = webkit_dom_element_get_last_element_child (row);
+ webkit_dom_html_element_set_inner_html (
+ WEBKIT_DOM_HTML_ELEMENT (col), priv->start_label, NULL);
+ } else {
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), TRUE);
+ }
+
+ row = webkit_dom_document_get_element_by_id (
+ priv->dom_document, TABLE_ROW_END_DATE);
+ if (priv->end_header && priv->end_label) {
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), FALSE);
+
+ col = webkit_dom_element_get_first_element_child (row);
+ webkit_dom_html_element_set_inner_html (
+ WEBKIT_DOM_HTML_ELEMENT (col), priv->end_header, NULL);
+
+ col = webkit_dom_element_get_last_element_child (row);
+ webkit_dom_html_element_set_inner_html (
+ WEBKIT_DOM_HTML_ELEMENT (col), priv->end_label, NULL);
+ } else {
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), TRUE);
+ }
+ }
}
static void
@@ -720,12 +718,12 @@ button_clicked_cb (WebKitDOMElement *element,
gpointer data)
{
ItipViewResponse response;
- gchar *responseStr;
+ gchar *responseStr;
- responseStr = webkit_dom_html_button_element_get_value (
- WEBKIT_DOM_HTML_BUTTON_ELEMENT (element));
+ responseStr = webkit_dom_html_button_element_get_value (
+ WEBKIT_DOM_HTML_BUTTON_ELEMENT (element));
- response = atoi(responseStr);
+ response = atoi (responseStr);
//d(printf("Clicked btton %d\n", response));
g_signal_emit (G_OBJECT (data), signals[RESPONSE], 0, response);
@@ -735,116 +733,116 @@ static void
itip_view_finalize (GObject *object)
{
ItipViewPrivate *priv;
- GSList *iter;
+ GSList *iter;
priv = ITIP_VIEW_GET_PRIVATE (object);
d(printf("Itip view finalized!\n"));
- if (priv->sender) {
- g_free (priv->sender);
- priv->sender = NULL;
- }
-
- if (priv->organizer) {
- g_free (priv->organizer);
- priv->organizer = NULL;
- }
-
- if (priv->organizer_sentby) {
- g_free (priv->organizer_sentby);
- priv->organizer_sentby = NULL;
- }
-
- if (priv->delegator) {
- g_free (priv->delegator);
- priv->delegator = NULL;
- }
-
- if (priv->attendee) {
- g_free (priv->attendee);
- priv->attendee = NULL;
- }
-
- if (priv->attendee_sentby) {
- g_free (priv->attendee_sentby);
- priv->attendee_sentby = NULL;
- }
-
- if (priv->proxy) {
- g_free (priv->proxy);
- priv->proxy = NULL;
- }
-
- if (priv->summary) {
- g_free (priv->summary);
- priv->summary = NULL;
- }
-
- if (priv->location) {
- g_free (priv->location);
- priv->location = NULL;
- }
-
- if (priv->status) {
- g_free (priv->status);
- priv->status = NULL;
- }
-
- if (priv->comment) {
- g_free (priv->comment);
- priv->comment = NULL;
- }
-
- if (priv->start_tm) {
- g_free (priv->start_tm);
- priv->start_tm = NULL;
- }
-
- if (priv->start_label) {
- g_free (priv->start_label);
- priv->start_label = NULL;
- }
-
- if (priv->end_tm) {
- g_free (priv->end_tm);
- priv->end_tm = NULL;
- }
-
- if (priv->end_label) {
- g_free (priv->end_label);
- priv->end_label = NULL;
- }
-
- if (priv->description) {
- g_free (priv->description);
- priv->description = NULL;
- }
-
- for (iter = priv->lower_info_items; iter; iter = iter->next) {
- ItipViewInfoItem *item = iter->data;
- g_free (item->message);
- g_free (item);
- }
- if (priv->lower_info_items) {
- g_slist_free (priv->lower_info_items);
- priv->lower_info_items = NULL;
- }
-
- for (iter = priv->upper_info_items; iter; iter = iter->next) {
- ItipViewInfoItem *item = iter->data;
- g_free (item->message);
- g_free (item);
- }
- if (priv->upper_info_items) {
- g_slist_free (priv->upper_info_items);
- priv->upper_info_items = NULL;
- }
-
- if (priv->error) {
- g_free (priv->error);
- priv->error = NULL;
- }
+ if (priv->sender) {
+ g_free (priv->sender);
+ priv->sender = NULL;
+ }
+
+ if (priv->organizer) {
+ g_free (priv->organizer);
+ priv->organizer = NULL;
+ }
+
+ if (priv->organizer_sentby) {
+ g_free (priv->organizer_sentby);
+ priv->organizer_sentby = NULL;
+ }
+
+ if (priv->delegator) {
+ g_free (priv->delegator);
+ priv->delegator = NULL;
+ }
+
+ if (priv->attendee) {
+ g_free (priv->attendee);
+ priv->attendee = NULL;
+ }
+
+ if (priv->attendee_sentby) {
+ g_free (priv->attendee_sentby);
+ priv->attendee_sentby = NULL;
+ }
+
+ if (priv->proxy) {
+ g_free (priv->proxy);
+ priv->proxy = NULL;
+ }
+
+ if (priv->summary) {
+ g_free (priv->summary);
+ priv->summary = NULL;
+ }
+
+ if (priv->location) {
+ g_free (priv->location);
+ priv->location = NULL;
+ }
+
+ if (priv->status) {
+ g_free (priv->status);
+ priv->status = NULL;
+ }
+
+ if (priv->comment) {
+ g_free (priv->comment);
+ priv->comment = NULL;
+ }
+
+ if (priv->start_tm) {
+ g_free (priv->start_tm);
+ priv->start_tm = NULL;
+ }
+
+ if (priv->start_label) {
+ g_free (priv->start_label);
+ priv->start_label = NULL;
+ }
+
+ if (priv->end_tm) {
+ g_free (priv->end_tm);
+ priv->end_tm = NULL;
+ }
+
+ if (priv->end_label) {
+ g_free (priv->end_label);
+ priv->end_label = NULL;
+ }
+
+ if (priv->description) {
+ g_free (priv->description);
+ priv->description = NULL;
+ }
+
+ for (iter = priv->lower_info_items; iter; iter = iter->next) {
+ ItipViewInfoItem *item = iter->data;
+ g_free (item->message);
+ g_free (item);
+ }
+ if (priv->lower_info_items) {
+ g_slist_free (priv->lower_info_items);
+ priv->lower_info_items = NULL;
+ }
+
+ for (iter = priv->upper_info_items; iter; iter = iter->next) {
+ ItipViewInfoItem *item = iter->data;
+ g_free (item->message);
+ g_free (item);
+ }
+ if (priv->upper_info_items) {
+ g_slist_free (priv->upper_info_items);
+ priv->upper_info_items = NULL;
+ }
+
+ if (priv->error) {
+ g_free (priv->error);
+ priv->error = NULL;
+ }
/* Chain up to parent's finalize() method. */
G_OBJECT_CLASS (itip_view_parent_class)->finalize (object);
@@ -884,17 +882,17 @@ rsvp_toggled_cb (WebKitDOMHTMLInputElement *input,
WebKitDOMEvent *event,
gpointer data)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
ItipView *view = data;
gboolean rsvp;
rsvp = webkit_dom_html_input_element_get_checked (input);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
- webkit_dom_html_text_area_element_set_disabled (
- WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el), !rsvp);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
+ webkit_dom_html_text_area_element_set_disabled (
+ WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el), !rsvp);
}
static void
@@ -916,24 +914,24 @@ alarm_check_toggled_cb (WebKitDOMHTMLInputElement *check1,
WebKitDOMEvent *event,
ItipView *view)
{
- WebKitDOMElement *check2;
- gchar *id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (check1));
+ WebKitDOMElement *check2;
+ gchar *id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (check1));
- if (g_strcmp0 (id, CHECKBOX_INHERIT_ALARM)) {
- check2 = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_KEEP_ALARM);
- } else {
- check2 = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_INHERIT_ALARM);
- }
+ if (g_strcmp0 (id, CHECKBOX_INHERIT_ALARM)) {
+ check2 = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_KEEP_ALARM);
+ } else {
+ check2 = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_INHERIT_ALARM);
+ }
- g_free (id);
+ g_free (id);
- webkit_dom_html_input_element_set_disabled (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (check2),
- (webkit_dom_html_element_get_hidden (
- WEBKIT_DOM_HTML_ELEMENT (check1)) &&
- webkit_dom_html_input_element_get_checked (check1)));
+ webkit_dom_html_input_element_set_disabled (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (check2),
+ (webkit_dom_html_element_get_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (check1)) &&
+ webkit_dom_html_input_element_get_checked (check1)));
}
static void
@@ -941,12 +939,12 @@ source_changed_cb (WebKitDOMElement *select,
WebKitDOMEvent *event,
ItipView *view)
{
- ESource *source;
+ ESource *source;
- source = itip_view_get_source (view);
+ source = itip_view_get_source (view);
d(printf("Source changed to '%s'\n", e_source_peek_name (source)));
- g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
+ g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
}
static void
@@ -954,13 +952,13 @@ append_checkbox_table_row (GString *buffer,
const gchar *name,
const gchar *label)
{
- g_string_append_printf (
- 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",
- name, name, name, name, name, label);
+ name, name, name, name, name, label);
}
static void
@@ -969,20 +967,20 @@ append_text_table_row (GString *buffer,
const gchar *label,
const gchar *value)
{
- if (label && *label) {
+ if (label && *label) {
- g_string_append_printf (buffer,
+ g_string_append_printf (buffer,
"<tr id=\"%s\" %s><th>%s</th><td>%s</td></tr>\n",
id, (value && *value) ? "" : "hidden=\"\"", label, value);
- } else {
+ } else {
- g_string_append_printf (
- buffer,
+ g_string_append_printf (
+ buffer,
"<tr id=\"%s\" hidden=\"\"><td colspan=\"2\"></td></tr>\n",
- id);
+ id);
- }
+ }
}
static void
@@ -990,63 +988,63 @@ append_info_item_row (ItipView *view,
const gchar *table_id,
ItipViewInfoItem *item)
{
- WebKitDOMElement *table;
- WebKitDOMHTMLElement *row, *cell;
- const gchar *icon_name;
- gchar *id;
+ WebKitDOMElement *table;
+ WebKitDOMHTMLElement *row, *cell;
+ const gchar *icon_name;
+ gchar *id;
- table = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, table_id);
- row = webkit_dom_html_table_element_insert_row (
- WEBKIT_DOM_HTML_TABLE_ELEMENT (table), -1, NULL);
+ table = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, table_id);
+ 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);
- webkit_dom_html_element_set_id (row, id);
- g_free (id);
-
- switch (item->type) {
- case ITIP_VIEW_INFO_ITEM_TYPE_INFO:
- icon_name = GTK_STOCK_DIALOG_INFO;
- break;
- case ITIP_VIEW_INFO_ITEM_TYPE_WARNING:
- icon_name = GTK_STOCK_DIALOG_WARNING;
- break;
- case ITIP_VIEW_INFO_ITEM_TYPE_ERROR:
- icon_name = GTK_STOCK_DIALOG_ERROR;
- break;
- case ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS:
- icon_name = GTK_STOCK_FIND;
- break;
- case ITIP_VIEW_INFO_ITEM_TYPE_NONE:
- default:
- icon_name = NULL;
- }
-
- cell = webkit_dom_html_table_row_element_insert_cell (
- (WebKitDOMHTMLTableRowElement *) row, -1, NULL);
-
- if (icon_name) {
- WebKitDOMElement *image;
- gchar *icon_uri;
-
- image = webkit_dom_document_create_element (
+ webkit_dom_html_element_set_id (row, id);
+ g_free (id);
+
+ switch (item->type) {
+ case ITIP_VIEW_INFO_ITEM_TYPE_INFO:
+ icon_name = GTK_STOCK_DIALOG_INFO;
+ break;
+ case ITIP_VIEW_INFO_ITEM_TYPE_WARNING:
+ icon_name = GTK_STOCK_DIALOG_WARNING;
+ break;
+ case ITIP_VIEW_INFO_ITEM_TYPE_ERROR:
+ icon_name = GTK_STOCK_DIALOG_ERROR;
+ break;
+ case ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS:
+ icon_name = GTK_STOCK_FIND;
+ break;
+ case ITIP_VIEW_INFO_ITEM_TYPE_NONE:
+ default:
+ icon_name = NULL;
+ }
+
+ cell = webkit_dom_html_table_row_element_insert_cell (
+ (WebKitDOMHTMLTableRowElement *) row, -1, NULL);
+
+ if (icon_name) {
+ WebKitDOMElement *image;
+ gchar *icon_uri;
+
+ image = webkit_dom_document_create_element (
view->priv->dom_document, "IMG", NULL);
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);
-
- webkit_dom_node_append_child (
- WEBKIT_DOM_NODE (cell),
- WEBKIT_DOM_NODE (image),
- NULL);
- }
+ webkit_dom_html_image_element_set_src (
+ WEBKIT_DOM_HTML_IMAGE_ELEMENT (image), icon_uri);
+ g_free (icon_uri);
+
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (cell),
+ WEBKIT_DOM_NODE (image),
+ NULL);
+ }
- cell = webkit_dom_html_table_row_element_insert_cell (
- (WebKitDOMHTMLTableRowElement *) row, -1, NULL);
+ cell = webkit_dom_html_table_row_element_insert_cell (
+ (WebKitDOMHTMLTableRowElement *) row, -1, NULL);
- webkit_dom_html_element_set_inner_html (cell, item->message, NULL);
+ 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));
}
@@ -1056,23 +1054,22 @@ remove_info_item_row (ItipView *view,
const gchar *table_id,
guint id)
{
- WebKitDOMElement *row;
- gchar *row_id;
+ WebKitDOMElement *row;
+ gchar *row_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);
+ row = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, row_id);
+ g_free (row_id);
- webkit_dom_node_remove_child (
- webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (row)),
- WEBKIT_DOM_NODE (row),
- NULL);
+ webkit_dom_node_remove_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (row)),
+ WEBKIT_DOM_NODE (row),
+ NULL);
d(printf("Removed row %s_row_%d\n", table_id, id));
}
-
static void
buttons_table_write_button (GString *buffer,
const gchar *name,
@@ -1080,54 +1077,54 @@ buttons_table_write_button (GString *buffer,
const gchar *icon,
ItipViewResponse response)
{
- g_string_append_printf (
- 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",
- name, response, name, icon, GTK_ICON_SIZE_BUTTON, label);
+ name, response, name, icon, GTK_ICON_SIZE_BUTTON, label);
}
static void
append_buttons_table (GString *buffer)
{
- g_string_append (buffer,
+ g_string_append (buffer,
"<table class=\"itip buttons\" border=\"0\" "
"id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" "
"cellpadding=\"0\" >"
"<tr id=\"" TABLE_ROW_BUTTONS "\">");
/* Everything gets the open button */
- buttons_table_write_button (
+ buttons_table_write_button (
buffer, BUTTON_OPEN_CALENDAR, _("Open Calendar"),
- GTK_STOCK_JUMP_TO, ITIP_VIEW_RESPONSE_OPEN);
- buttons_table_write_button (
+ GTK_STOCK_JUMP_TO, ITIP_VIEW_RESPONSE_OPEN);
+ buttons_table_write_button (
buffer, BUTTON_DECLINE_ALL, _("Decline all"),
- GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
- buttons_table_write_button (
+ GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
+ buttons_table_write_button (
buffer, BUTTON_DECLINE, _("Decline"),
- GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
- buttons_table_write_button (
+ GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
+ buttons_table_write_button (
buffer, BUTTON_TENTATIVE_ALL, _("Tentative all"),
- GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
- buttons_table_write_button (
+ GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
+ buttons_table_write_button (
buffer, BUTTON_TENTATIVE, _("Tentative"),
- GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
- buttons_table_write_button (
+ GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
+ buttons_table_write_button (
buffer, BUTTON_ACCEPT_ALL, _("Accept all"),
- GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
- buttons_table_write_button (
+ GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
+ buttons_table_write_button (
buffer, BUTTON_ACCEPT, _("Accept"),
- GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
- buttons_table_write_button (
+ GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
+ buttons_table_write_button (
buffer, BUTTON_SEND_INFORMATION, _("Send Information"),
- GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_REFRESH);
- buttons_table_write_button (
+ GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_REFRESH);
+ buttons_table_write_button (
buffer, BUTTON_UPDATE_ATTENDEE_STATUS, _("Update Attendee Status"),
- GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_UPDATE);
- buttons_table_write_button (
+ GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_UPDATE);
+ buttons_table_write_button (
buffer, BUTTON_UPDATE, _("Update"),
- GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_CANCEL);
+ GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_CANCEL);
g_string_append (buffer, "</tr></table>");
}
@@ -1135,7 +1132,7 @@ append_buttons_table (GString *buffer)
void
itip_view_write (GString *buffer)
{
- g_string_append (buffer,
+ g_string_append (buffer,
"<html>\n"
"<head>\n"
"<title>ITIP</title>\n"
@@ -1143,26 +1140,26 @@ itip_view_write (GString *buffer)
"</head>\n"
"<body>\n");
- g_string_append_printf (buffer,
+ g_string_append_printf (buffer,
"<img src=\"gtk-stock://%s?size=%d\" class=\"itip icon\" />\n",
- MEETING_ICON, GTK_ICON_SIZE_BUTTON);
+ MEETING_ICON, GTK_ICON_SIZE_BUTTON);
- g_string_append (buffer,
+ g_string_append (buffer,
"<div class=\"itip content\" id=\"" DIV_ITIP_CONTENT "\">\n");
/* The first section listing the sender */
/* FIXME What to do if the send and organizer do not match */
- g_string_append (buffer,
+ g_string_append (buffer,
"<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\"></div>\n");
g_string_append (buffer, "<hr>\n");
/* Elementary event information */
- g_string_append (buffer,
+ g_string_append (buffer,
"<table class=\"itip table\" border=\"0\" "
"cellspacing=\"5\" cellpadding=\"0\">\n");
- append_text_table_row (buffer, TABLE_ROW_SUMMARY, NULL, NULL);
+ 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);
@@ -1172,27 +1169,26 @@ itip_view_write (GString *buffer)
g_string_append (buffer, "</table>\n");
/* Upper Info items */
- g_string_append (buffer,
+ g_string_append (buffer,
"<table class=\"itip info\" id=\"" TABLE_UPPER_ITIP_INFO "\" border=\"0\" "
"cellspacing=\"5\" cellpadding=\"0\">");
/* Description */
- g_string_append (buffer,
+ g_string_append (buffer,
"<div id=\"" TABLE_ROW_DESCRIPTION "\" class=\"itip description\" hidden=\"\"></div>\n");
g_string_append (buffer, "<hr>\n");
/* Lower Info items */
- g_string_append (buffer,
+ g_string_append (buffer,
"<table class=\"itip info\" id=\"" TABLE_LOWER_ITIP_INFO "\" border=\"0\" "
"cellspacing=\"5\" cellpadding=\"0\">");
-
- g_string_append (buffer,
+ g_string_append (buffer,
"<table class=\"itip table\" border=\"0\" "
"cellspacing=\"5\" cellpadding=\"0\">\n");
- g_string_append (buffer,
+ g_string_append (buffer,
"<tr id=\"" TABLE_ROW_ESCB "\" hidden=\"\""">"
"<th></th>"
"<td><select name=\"" SELECT_ESOURCE "\" id=\"" SELECT_ESOURCE "\"></select></td>"
@@ -1202,7 +1198,7 @@ itip_view_write (GString *buffer)
append_checkbox_table_row (buffer, CHECKBOX_RSVP, _("Send reply to sender"));
/* Comments */
- g_string_append_printf (buffer,
+ g_string_append_printf (buffer,
"<tr id=\"" TABLE_ROW_RSVP_COMMENT "\" hidden=\"\">"
"<th>%s</th>"
"<td><textarea name=\"" TEXTAREA_RSVP_COMMENT "\" "
@@ -1224,7 +1220,7 @@ itip_view_write (GString *buffer)
g_string_append (buffer, "</table>\n");
/* Buttons table */
- append_buttons_table (buffer);
+ append_buttons_table (buffer);
/* <div class="itip content" > */
g_string_append (buffer, "</div>\n");
@@ -1238,51 +1234,51 @@ void
itip_view_write_for_printing (ItipView *view,
GString *buffer)
{
- if (view->priv->error && *view->priv->error) {
- g_string_append (buffer, view->priv->error);
- return;
- }
+ if (view->priv->error && *view->priv->error) {
+ g_string_append (buffer, view->priv->error);
+ return;
+ }
- g_string_append (buffer,
+ g_string_append (buffer,
"<div class=\"itip print_content\" id=\"" DIV_ITIP_CONTENT "\">\n");
/* The first section listing the sender */
/* FIXME What to do if the send and organizer do not match */
- g_string_append_printf (buffer,
+ g_string_append_printf (buffer,
"<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\">%s</div>\n",
view->priv->sender ? view->priv->sender : "");
g_string_append (buffer, "<hr>\n");
/* Elementary event information */
- g_string_append (buffer,
+ g_string_append (buffer,
"<table class=\"itip table\" border=\"0\" "
"cellspacing=\"5\" cellpadding=\"0\">\n");
- append_text_table_row (
- buffer, TABLE_ROW_SUMMARY,
- NULL, view->priv->summary);
- append_text_table_row (
- buffer, TABLE_ROW_LOCATION,
+ append_text_table_row (
+ buffer, TABLE_ROW_SUMMARY,
+ NULL, view->priv->summary);
+ append_text_table_row (
+ buffer, TABLE_ROW_LOCATION,
_("Location:"), view->priv->location);
- append_text_table_row (
- buffer, TABLE_ROW_START_DATE,
- view->priv->start_header, view->priv->start_label);
- append_text_table_row (
- buffer, TABLE_ROW_END_DATE,
- view->priv->end_header, view->priv->end_label);
- append_text_table_row (
- buffer, TABLE_ROW_STATUS,
+ append_text_table_row (
+ buffer, TABLE_ROW_START_DATE,
+ view->priv->start_header, view->priv->start_label);
+ append_text_table_row (
+ buffer, TABLE_ROW_END_DATE,
+ view->priv->end_header, view->priv->end_label);
+ append_text_table_row (
+ buffer, TABLE_ROW_STATUS,
_("Status:"), view->priv->status);
- append_text_table_row (
- buffer, TABLE_ROW_COMMENT,
+ append_text_table_row (
+ buffer, TABLE_ROW_COMMENT,
_("Comment:"), view->priv->comment);
g_string_append (buffer, "</table>\n");
/* Description */
- g_string_append_printf (
- buffer,
+ g_string_append_printf (
+ buffer,
"<div id=\"" TABLE_ROW_DESCRIPTION "\" "
"class=\"itip description\" %s>%s</div>\n",
view->priv->description ? "" : "hidden=\"\"", view->priv->description);
@@ -1290,170 +1286,165 @@ itip_view_write_for_printing (ItipView *view,
g_string_append (buffer, "</div>");
}
-
void
itip_view_create_dom_bindings (ItipView *view,
WebKitDOMElement *element)
{
- WebKitDOMElement *el;
- WebKitDOMDocument *doc;
+ WebKitDOMElement *el;
+ WebKitDOMDocument *doc;
- doc = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (element));
- view->priv->dom_document = doc;
+ doc = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (element));
+ view->priv->dom_document = doc;
- el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_RECUR);
- if (el) {
- webkit_dom_event_target_add_event_listener (
+ 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",
- G_CALLBACK (recur_toggled_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (rsvp_toggled_cb), FALSE, view);
- }
-
+ 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(
+ 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",
- G_CALLBACK (alarm_check_toggled_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (alarm_check_toggled_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ 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 (
+ 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",
- G_CALLBACK (source_changed_cb), FALSE, view);
- }
+ G_CALLBACK (source_changed_cb), FALSE, view);
+ }
}
-
static void
itip_view_init (ItipView *view)
{
- view->priv = ITIP_VIEW_GET_PRIVATE (view);
+ view->priv = ITIP_VIEW_GET_PRIVATE (view);
}
ItipView *
itip_view_new (ItipPURI *puri)
{
- ItipView *view;
+ ItipView *view;
- view = ITIP_VIEW (g_object_new (ITIP_TYPE_VIEW, NULL));
- view->priv->puri = puri;
+ view = ITIP_VIEW (g_object_new (ITIP_TYPE_VIEW, NULL));
+ view->priv->puri = puri;
- return view;
+ return view;
}
-ItipPURI*
+ItipPURI *
itip_view_get_puri (ItipView *view)
{
- g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
+ g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
- return view->priv->puri;
+ return view->priv->puri;
}
-
static void
show_button (ItipView *view,
const gchar *id)
{
- WebKitDOMElement *button;
+ WebKitDOMElement *button;
- button = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, id);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (button), FALSE);
+ button = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, id);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (button), FALSE);
}
-
void
itip_view_set_mode (ItipView *view,
ItipViewMode mode)
{
- WebKitDOMElement *row, *cell;
- WebKitDOMElement *button;
+ WebKitDOMElement *row, *cell;
+ WebKitDOMElement *button;
g_return_if_fail (ITIP_IS_VIEW (view));
@@ -1461,60 +1452,60 @@ itip_view_set_mode (ItipView *view,
set_sender_text (view);
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- row = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_BUTTONS);
- cell = webkit_dom_element_get_first_element_child (row);
- do {
- button = webkit_dom_element_get_first_element_child (cell);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (button), TRUE);
- } while ((cell = webkit_dom_element_get_next_element_sibling (cell)) != NULL);
+ row = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_BUTTONS);
+ cell = webkit_dom_element_get_first_element_child (row);
+ do {
+ button = webkit_dom_element_get_first_element_child (cell);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (button), TRUE);
+ } while ((cell = webkit_dom_element_get_next_element_sibling (cell)) != NULL);
- view->priv->is_recur_set = itip_view_get_recur_check_state (view);
+ view->priv->is_recur_set = itip_view_get_recur_check_state (view);
/* Always visible */
- show_button (view, BUTTON_OPEN_CALENDAR);
-
- switch (mode) {
- case ITIP_VIEW_MODE_PUBLISH:
- if (view->priv->needs_decline) {
- show_button (view, BUTTON_DECLINE);
- }
- show_button (view, BUTTON_ACCEPT);
- break;
- case ITIP_VIEW_MODE_REQUEST:
- show_button (view, view->priv->is_recur_set ? BUTTON_DECLINE_ALL : BUTTON_DECLINE);
- show_button (view, view->priv->is_recur_set ? BUTTON_TENTATIVE_ALL : BUTTON_TENTATIVE);
- show_button (view, view->priv->is_recur_set ? BUTTON_ACCEPT_ALL : BUTTON_ACCEPT);
- break;
- case ITIP_VIEW_MODE_ADD:
- if (view->priv->type != E_CAL_CLIENT_SOURCE_TYPE_MEMOS) {
- show_button(view, BUTTON_DECLINE);
- show_button(view, BUTTON_TENTATIVE);
- }
- show_button (view, BUTTON_ACCEPT);
- break;
- case ITIP_VIEW_MODE_REFRESH:
- show_button (view, BUTTON_SEND_INFORMATION);
- break;
- case ITIP_VIEW_MODE_REPLY:
- show_button (view, BUTTON_UPDATE_ATTENDEE_STATUS);
- break;
- case ITIP_VIEW_MODE_CANCEL:
- show_button (view, BUTTON_UPDATE);
- break;
- case ITIP_VIEW_MODE_COUNTER:
- case ITIP_VIEW_MODE_DECLINECOUNTER:
- show_button (view, BUTTON_DECLINE);
- show_button (view, BUTTON_TENTATIVE);
- show_button (view, BUTTON_ACCEPT);
- break;
- default:
- break;
- }
+ show_button (view, BUTTON_OPEN_CALENDAR);
+
+ switch (mode) {
+ case ITIP_VIEW_MODE_PUBLISH:
+ if (view->priv->needs_decline) {
+ show_button (view, BUTTON_DECLINE);
+ }
+ show_button (view, BUTTON_ACCEPT);
+ break;
+ case ITIP_VIEW_MODE_REQUEST:
+ show_button (view, view->priv->is_recur_set ? BUTTON_DECLINE_ALL : BUTTON_DECLINE);
+ show_button (view, view->priv->is_recur_set ? BUTTON_TENTATIVE_ALL : BUTTON_TENTATIVE);
+ show_button (view, view->priv->is_recur_set ? BUTTON_ACCEPT_ALL : BUTTON_ACCEPT);
+ break;
+ case ITIP_VIEW_MODE_ADD:
+ if (view->priv->type != E_CAL_CLIENT_SOURCE_TYPE_MEMOS) {
+ show_button (view, BUTTON_DECLINE);
+ show_button (view, BUTTON_TENTATIVE);
+ }
+ show_button (view, BUTTON_ACCEPT);
+ break;
+ case ITIP_VIEW_MODE_REFRESH:
+ show_button (view, BUTTON_SEND_INFORMATION);
+ break;
+ case ITIP_VIEW_MODE_REPLY:
+ show_button (view, BUTTON_UPDATE_ATTENDEE_STATUS);
+ break;
+ case ITIP_VIEW_MODE_CANCEL:
+ show_button (view, BUTTON_UPDATE);
+ break;
+ case ITIP_VIEW_MODE_COUNTER:
+ case ITIP_VIEW_MODE_DECLINECOUNTER:
+ show_button (view, BUTTON_DECLINE);
+ show_button (view, BUTTON_TENTATIVE);
+ show_button (view, BUTTON_ACCEPT);
+ break;
+ default:
+ break;
+ }
}
ItipViewMode
@@ -1529,39 +1520,38 @@ void
itip_view_set_item_type (ItipView *view,
ECalClientSourceType type)
{
- WebKitDOMElement *row, *cell;
- const gchar *header;
+ WebKitDOMElement *row, *cell;
+ const gchar *header;
g_return_if_fail (ITIP_IS_VIEW (view));
view->priv->type = type;
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- row = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_ESCB);
- cell = webkit_dom_element_get_first_element_child (row);
+ row = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_ESCB);
+ cell = webkit_dom_element_get_first_element_child (row);
- switch (view->priv->type) {
- case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
+ switch (view->priv->type) {
+ case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
header = _("Calendar:");
- break;
- case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
+ break;
+ case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
header = _("Tasks:");
- break;
- case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
+ break;
+ case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
header = _("Memos:");
- break;
- default:
- header = NULL;
- break;
- }
+ break;
+ default:
+ header = NULL;
+ break;
+ }
- webkit_dom_html_element_set_inner_html (
+ webkit_dom_html_element_set_inner_html (
WEBKIT_DOM_HTML_ELEMENT (cell), header ? header : "", NULL);
-
set_sender_text (view);
}
@@ -1599,7 +1589,7 @@ void
itip_view_set_organizer_sentby (ItipView *view,
const gchar *sentby)
{
- g_return_if_fail (ITIP_IS_VIEW (view));
+ g_return_if_fail (ITIP_IS_VIEW (view));
if (view->priv->organizer_sentby)
g_free (view->priv->organizer_sentby);
@@ -1656,7 +1646,7 @@ itip_view_set_attendee_sentby (ItipView *view,
const gchar *
itip_view_get_attendee_sentby (ItipView *view)
{
- g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
+ g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
return view->priv->attendee_sentby;
}
@@ -1709,28 +1699,28 @@ void
itip_view_set_summary (ItipView *view,
const gchar *summary)
{
- WebKitDOMElement *row, *col;
+ WebKitDOMElement *row, *col;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (view->priv->summary)
+ if (view->priv->summary)
g_free (view->priv->summary);
view->priv->summary = summary ? g_strstrip (e_utf8_ensure_valid (summary)) : NULL;
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- row = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_SUMMARY);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), (view->priv->summary == NULL));
+ row = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_SUMMARY);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), (view->priv->summary == NULL));
- col = webkit_dom_element_get_last_element_child (row);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (col),
+ 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 : "",
- NULL);
+ NULL);
}
const gchar *
@@ -1745,7 +1735,7 @@ void
itip_view_set_location (ItipView *view,
const gchar *location)
{
- WebKitDOMElement *row, *col;
+ WebKitDOMElement *row, *col;
g_return_if_fail (ITIP_IS_VIEW (view));
@@ -1754,19 +1744,19 @@ itip_view_set_location (ItipView *view,
view->priv->location = location ? g_strstrip (e_utf8_ensure_valid (location)) : NULL;
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- row = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_LOCATION);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), (view->priv->location == NULL));
+ row = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_LOCATION);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), (view->priv->location == NULL));
- col = webkit_dom_element_get_last_element_child (row);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (col),
+ 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 : "",
- NULL);
+ NULL);
}
const gchar *
@@ -1781,7 +1771,7 @@ void
itip_view_set_status (ItipView *view,
const gchar *status)
{
- WebKitDOMElement *row, *col;
+ WebKitDOMElement *row, *col;
g_return_if_fail (ITIP_IS_VIEW (view));
@@ -1790,19 +1780,19 @@ itip_view_set_status (ItipView *view,
view->priv->status = status ? g_strstrip (e_utf8_ensure_valid (status)) : NULL;
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- row = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_STATUS);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), (view->priv->status == NULL));
+ row = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_STATUS);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), (view->priv->status == NULL));
- col = webkit_dom_element_get_last_element_child (row);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (col),
+ 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 : "",
- NULL);
+ NULL);
}
const gchar *
@@ -1817,7 +1807,7 @@ void
itip_view_set_comment (ItipView *view,
const gchar *comment)
{
- WebKitDOMElement *row, *col;
+ WebKitDOMElement *row, *col;
g_return_if_fail (ITIP_IS_VIEW (view));
@@ -1826,19 +1816,19 @@ itip_view_set_comment (ItipView *view,
view->priv->comment = comment ? g_strstrip (e_utf8_ensure_valid (comment)) : NULL;
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- row = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_COMMENT);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), (view->priv->comment == NULL));
+ row = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_COMMENT);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), (view->priv->comment == NULL));
- col = webkit_dom_element_get_last_element_child (row);
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (col),
+ 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 : "",
- NULL);
+ NULL);
}
const gchar *
@@ -1853,7 +1843,7 @@ void
itip_view_set_description (ItipView *view,
const gchar *description)
{
- WebKitDOMElement *div;
+ WebKitDOMElement *div;
g_return_if_fail (ITIP_IS_VIEW (view));
@@ -1862,18 +1852,18 @@ itip_view_set_description (ItipView *view,
view->priv->description = description ? g_strstrip (e_utf8_ensure_valid (description)) : NULL;
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- div = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_DESCRIPTION);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (div), (view->priv->description == NULL));
+ div = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_DESCRIPTION);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (div), (view->priv->description == NULL));
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (div),
+ webkit_dom_html_element_set_inner_html (
+ WEBKIT_DOM_HTML_ELEMENT (div),
view->priv->description ? view->priv->description : "",
- NULL);
+ NULL);
}
const gchar *
@@ -1929,7 +1919,7 @@ itip_view_set_end (ItipView *view,
{
ItipViewPrivate *priv;
- g_return_if_fail (ITIP_IS_VIEW (view));
+ g_return_if_fail (ITIP_IS_VIEW (view));
priv = view->priv;
@@ -1980,10 +1970,10 @@ itip_view_add_upper_info_item (ItipView *view,
priv->upper_info_items = g_slist_append (priv->upper_info_items, item);
- if (!view->priv->dom_document)
- return item->id;
+ if (!view->priv->dom_document)
+ return item->id;
- append_info_item_row (view, TABLE_UPPER_ITIP_INFO, item);
+ append_info_item_row (view, TABLE_UPPER_ITIP_INFO, item);
return item->id;
}
@@ -1998,7 +1988,7 @@ itip_view_add_upper_info_item_printf (ItipView *view,
gchar *message;
guint id;
- g_return_val_if_fail (ITIP_IS_VIEW (view), 0);
+ g_return_val_if_fail (ITIP_IS_VIEW (view), 0);
va_start (args, format);
message = g_strdup_vprintf (format, args);
@@ -2027,11 +2017,11 @@ itip_view_remove_upper_info_item (ItipView *view,
if (item->id == id) {
priv->upper_info_items = g_slist_remove (priv->upper_info_items, item);
- g_free (item->message);
+ g_free (item->message);
g_free (item);
- if (!view->priv->dom_document)
- remove_info_item_row (view, TABLE_UPPER_ITIP_INFO, id);
+ if (!view->priv->dom_document)
+ remove_info_item_row (view, TABLE_UPPER_ITIP_INFO, id);
return;
}
@@ -2044,19 +2034,19 @@ itip_view_clear_upper_info_items (ItipView *view)
ItipViewPrivate *priv;
GSList *l;
- g_return_if_fail (ITIP_IS_VIEW (view));
+ g_return_if_fail (ITIP_IS_VIEW (view));
priv = view->priv;
for (l = priv->upper_info_items; l; l = l->next) {
ItipViewInfoItem *item = l->data;
- if (view->priv->dom_document)
- remove_info_item_row (view, TABLE_UPPER_ITIP_INFO, item->id);
+ if (view->priv->dom_document)
+ remove_info_item_row (view, TABLE_UPPER_ITIP_INFO, item->id);
g_free (item->message);
g_free (item);
- }
+ }
g_slist_free (priv->upper_info_items);
priv->upper_info_items = NULL;
@@ -2082,10 +2072,10 @@ itip_view_add_lower_info_item (ItipView *view,
priv->lower_info_items = g_slist_append (priv->lower_info_items, item);
- if (!view->priv->dom_document)
- return item->id;
+ if (!view->priv->dom_document)
+ return item->id;
- append_info_item_row (view, TABLE_LOWER_ITIP_INFO, item);
+ append_info_item_row (view, TABLE_LOWER_ITIP_INFO, item);
return item->id;
}
@@ -2132,8 +2122,8 @@ itip_view_remove_lower_info_item (ItipView *view,
g_free (item->message);
g_free (item);
- if (view->priv->dom_document)
- remove_info_item_row (view, TABLE_LOWER_ITIP_INFO, id);
+ if (view->priv->dom_document)
+ remove_info_item_row (view, TABLE_LOWER_ITIP_INFO, id);
return;
}
@@ -2153,8 +2143,8 @@ itip_view_clear_lower_info_items (ItipView *view)
for (l = priv->lower_info_items; l; l = l->next) {
ItipViewInfoItem *item = l->data;
- if (view->priv->dom_document)
- remove_info_item_row (view, TABLE_LOWER_ITIP_INFO, item->id);
+ if (view->priv->dom_document)
+ remove_info_item_row (view, TABLE_LOWER_ITIP_INFO, item->id);
g_free (item->message);
g_free (item);
@@ -2168,73 +2158,73 @@ static void
source_list_changed_cb (ESourceList *source_list,
ItipView *view)
{
- GSList *groups, *iter;
- WebKitDOMElement *select;
+ GSList *groups, *iter;
+ WebKitDOMElement *select;
d(printf("Assigning a new source list!\n"));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- select = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, SELECT_ESOURCE);
+ select = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, SELECT_ESOURCE);
- while (webkit_dom_node_has_child_nodes (WEBKIT_DOM_NODE (select))) {
- webkit_dom_node_remove_child (
- WEBKIT_DOM_NODE (select),
- webkit_dom_node_get_last_child (WEBKIT_DOM_NODE (select)),
- NULL);
- }
+ while (webkit_dom_node_has_child_nodes (WEBKIT_DOM_NODE (select))) {
+ webkit_dom_node_remove_child (
+ WEBKIT_DOM_NODE (select),
+ webkit_dom_node_get_last_child (WEBKIT_DOM_NODE (select)),
+ NULL);
+ }
- groups = e_source_list_peek_groups (source_list);
- for (iter = groups; iter; iter = iter->next) {
+ groups = e_source_list_peek_groups (source_list);
+ for (iter = groups; iter; iter = iter->next) {
- ESourceGroup *group = iter->data;
- GSList *sources, *iter2;
- WebKitDOMElement *optgroup;
+ ESourceGroup *group = iter->data;
+ GSList *sources, *iter2;
+ WebKitDOMElement *optgroup;
- sources = e_source_group_peek_sources (group);
- if (sources == NULL)
- continue;
+ sources = e_source_group_peek_sources (group);
+ if (sources == NULL)
+ continue;
- optgroup = webkit_dom_document_create_element (
+ optgroup = webkit_dom_document_create_element (
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));
+ webkit_dom_html_opt_group_element_set_label (
+ WEBKIT_DOM_HTML_OPT_GROUP_ELEMENT (optgroup),
+ e_source_group_peek_name (group));
- webkit_dom_node_append_child (
- WEBKIT_DOM_NODE (select),
- WEBKIT_DOM_NODE (optgroup),
- NULL);
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (select),
+ WEBKIT_DOM_NODE (optgroup),
+ NULL);
- for (iter2 = sources; iter2; iter2 = iter2->next) {
+ for (iter2 = sources; iter2; iter2 = iter2->next) {
- WebKitDOMElement *option;
- ESource *source = iter2->data;
+ WebKitDOMElement *option;
+ ESource *source = iter2->data;
- option = webkit_dom_document_create_element (
+ option = webkit_dom_document_create_element (
view->priv->dom_document, "OPTION", NULL);
- webkit_dom_html_option_element_set_value (
- WEBKIT_DOM_HTML_OPTION_ELEMENT (option),
- e_source_peek_uid (source));
- webkit_dom_html_option_element_set_label (
- WEBKIT_DOM_HTML_OPTION_ELEMENT (option),
- e_source_peek_name (source));
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (option),
- e_source_peek_name (source), NULL);
- webkit_dom_html_element_set_class_name (
+ webkit_dom_html_option_element_set_value (
+ WEBKIT_DOM_HTML_OPTION_ELEMENT (option),
+ e_source_peek_uid (source));
+ webkit_dom_html_option_element_set_label (
+ WEBKIT_DOM_HTML_OPTION_ELEMENT (option),
+ e_source_peek_name (source));
+ webkit_dom_html_element_set_inner_html (
+ 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_node_append_child (
- WEBKIT_DOM_NODE (optgroup),
- WEBKIT_DOM_NODE (option),
- NULL);
- }
- }
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (optgroup),
+ WEBKIT_DOM_NODE (option),
+ NULL);
+ }
+ }
- source_changed_cb (select, NULL, view);
+ source_changed_cb (select, NULL, view);
}
void
@@ -2257,10 +2247,10 @@ itip_view_set_source_list (ItipView *view,
priv->source_list = g_object_ref (source_list);
- source_list_changed_cb (source_list, view);
+ source_list_changed_cb (source_list, view);
g_signal_connect (source_list, "changed",
- G_CALLBACK (source_list_changed_cb), view);
+ G_CALLBACK (source_list_changed_cb), view);
}
ESourceList *
@@ -2275,217 +2265,215 @@ void
itip_view_set_source (ItipView *view,
ESource *source)
{
- WebKitDOMElement *select;
- WebKitDOMElement *row;
- gulong i, len;
+ WebKitDOMElement *select;
+ WebKitDOMElement *row;
+ gulong i, len;
g_return_if_fail (ITIP_IS_VIEW (view));
d(printf("Settings default source '%s'\n", e_source_peek_name (source)));
- if (!view->priv->dom_document)
- return;
-
- row = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_ESCB);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (row), (source == NULL));
- if (source == NULL)
- return;
+ if (!view->priv->dom_document)
+ return;
+ row = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_ESCB);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (row), (source == NULL));
+ if (source == NULL)
+ return;
- select = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, SELECT_ESOURCE);
+ select = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, SELECT_ESOURCE);
/* <select> does not emit 'change' event when already selected <option>
* is re-selected, but we need to notify itip formatter, so that it would
* make all the buttons sensitive */
- if (source == itip_view_get_source (view)) {
- source_changed_cb (select, NULL, view);
- }
+ if (source == itip_view_get_source (view)) {
+ source_changed_cb (select, NULL, view);
+ }
- if (webkit_dom_html_select_element_get_disabled (
- WEBKIT_DOM_HTML_SELECT_ELEMENT (select))) {
- webkit_dom_html_select_element_set_disabled (
- WEBKIT_DOM_HTML_SELECT_ELEMENT (select), FALSE);
- }
+ if (webkit_dom_html_select_element_get_disabled (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (select))) {
+ webkit_dom_html_select_element_set_disabled (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (select), FALSE);
+ }
- len = webkit_dom_html_select_element_get_length (
- WEBKIT_DOM_HTML_SELECT_ELEMENT (select));
- for (i = 0; i < len; i++) {
+ len = webkit_dom_html_select_element_get_length (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (select));
+ for (i = 0; i < len; i++) {
- WebKitDOMNode *node;
- WebKitDOMHTMLOptionElement *option;
- gchar *value;
+ WebKitDOMNode *node;
+ WebKitDOMHTMLOptionElement *option;
+ gchar *value;
- node = webkit_dom_html_select_element_item (
- WEBKIT_DOM_HTML_SELECT_ELEMENT (select), i);
- option = WEBKIT_DOM_HTML_OPTION_ELEMENT (node);
+ node = webkit_dom_html_select_element_item (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (select), i);
+ option = WEBKIT_DOM_HTML_OPTION_ELEMENT (node);
- value = webkit_dom_html_option_element_get_value (option);
- if (g_strcmp0 (value, e_source_peek_uid (source)) == 0) {
- webkit_dom_html_option_element_set_selected (
- option, TRUE);
+ value = webkit_dom_html_option_element_get_value (option);
+ if (g_strcmp0 (value, e_source_peek_uid (source)) == 0) {
+ webkit_dom_html_option_element_set_selected (
+ option, TRUE);
- g_free (value);
- break;
- }
+ g_free (value);
+ break;
+ }
- g_free (value);
- }
+ g_free (value);
+ }
}
ESource *
itip_view_get_source (ItipView *view)
{
- WebKitDOMElement *select;
- gchar *uid;
- ESource *source;
- gboolean disable = FALSE;
+ WebKitDOMElement *select;
+ gchar *uid;
+ ESource *source;
+ gboolean disable = FALSE;
g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
- if (!view->priv->dom_document)
- return NULL;
+ if (!view->priv->dom_document)
+ return NULL;
- select = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, SELECT_ESOURCE);
- if (webkit_dom_html_select_element_get_disabled (
- WEBKIT_DOM_HTML_SELECT_ELEMENT (select))) {
- webkit_dom_html_select_element_set_disabled (
- WEBKIT_DOM_HTML_SELECT_ELEMENT (select), FALSE);
- disable = TRUE;
- }
+ select = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, SELECT_ESOURCE);
+ if (webkit_dom_html_select_element_get_disabled (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (select))) {
+ webkit_dom_html_select_element_set_disabled (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (select), FALSE);
+ disable = TRUE;
+ }
- uid = webkit_dom_html_select_element_get_value (
- WEBKIT_DOM_HTML_SELECT_ELEMENT (select));
+ uid = webkit_dom_html_select_element_get_value (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (select));
- source = e_source_list_peek_source_by_uid (
- view->priv->source_list, uid);
- g_free (uid);
+ source = e_source_list_peek_source_by_uid (
+ view->priv->source_list, uid);
+ g_free (uid);
- if (disable) {
- webkit_dom_html_select_element_set_disabled (
- WEBKIT_DOM_HTML_SELECT_ELEMENT (select), TRUE);
- }
+ if (disable) {
+ webkit_dom_html_select_element_set_disabled (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (select), TRUE);
+ }
- return source;
+ return source;
}
void
itip_view_set_rsvp (ItipView *view,
gboolean rsvp)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_RSVP);
- webkit_dom_html_input_element_set_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), rsvp);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_RSVP);
+ webkit_dom_html_input_element_set_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), rsvp);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
- webkit_dom_html_text_area_element_set_disabled (
- WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el), !rsvp);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
+ webkit_dom_html_text_area_element_set_disabled (
+ WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el), !rsvp);
}
gboolean
itip_view_get_rsvp (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
- if (!view->priv->dom_document)
- return FALSE;
+ if (!view->priv->dom_document)
+ return FALSE;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_UPDATE);
- return webkit_dom_html_input_element_get_checked (WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_UPDATE);
+ return webkit_dom_html_input_element_get_checked (WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
}
void
itip_view_set_show_rsvp_check (ItipView *view,
gboolean show)
{
- WebKitDOMElement *label;
- WebKitDOMElement *el;
+ WebKitDOMElement *label;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
+ el = webkit_dom_document_get_element_by_id (
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 (
- view->priv->dom_document, CHECKBOX_RSVP);
- label = webkit_dom_element_get_next_element_sibling (el);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_RSVP);
+ label = webkit_dom_element_get_next_element_sibling (el);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
- if (!show) {
- webkit_dom_html_input_element_set_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
- }
+ if (!show) {
+ webkit_dom_html_input_element_set_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
+ }
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_RSVP_COMMENT);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TABLE_ROW_RSVP_COMMENT);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
}
gboolean
itip_view_get_show_rsvp_check (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
- if (!view->priv->dom_document)
- return FALSE;
+ if (!view->priv->dom_document)
+ return FALSE;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_RSVP);
- return !webkit_dom_html_element_get_hidden (WEBKIT_DOM_HTML_ELEMENT (el));
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_RSVP);
+ return !webkit_dom_html_element_get_hidden (WEBKIT_DOM_HTML_ELEMENT (el));
}
void
itip_view_set_update (ItipView *view,
gboolean update)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_UPDATE);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_UPDATE);
- webkit_dom_html_input_element_set_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), update);
+ webkit_dom_html_input_element_set_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), update);
}
gboolean
itip_view_get_update (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
- if (!view->priv->dom_document)
- return FALSE;
+ if (!view->priv->dom_document)
+ return FALSE;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_UPDATE);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_UPDATE);
return webkit_dom_html_input_element_get_checked (WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
}
@@ -2493,41 +2481,41 @@ void
itip_view_set_show_update_check (ItipView *view,
gboolean show)
{
- WebKitDOMElement *label;
- WebKitDOMElement *el;
+ WebKitDOMElement *label;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
+ el = webkit_dom_document_get_element_by_id (
view->priv->dom_document, "table_row_" CHECKBOX_UPDATE);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_UPDATE);
- label = webkit_dom_element_get_next_element_sibling (el);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_UPDATE);
+ label = webkit_dom_element_get_next_element_sibling (el);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
- if (!show) {
- webkit_dom_html_input_element_set_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
- }
+ if (!show) {
+ webkit_dom_html_input_element_set_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
+ }
}
gboolean
itip_view_get_show_update_check (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
- if (!view->priv->dom_document)
- return FALSE;
+ if (!view->priv->dom_document)
+ return FALSE;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_UPDATE);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_UPDATE);
return !webkit_dom_html_element_get_hidden (WEBKIT_DOM_HTML_ELEMENT (el));
}
@@ -2535,43 +2523,43 @@ void
itip_view_set_rsvp_comment (ItipView *view,
const gchar *comment)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
- webkit_dom_html_element_set_hidden(
- WEBKIT_DOM_HTML_ELEMENT (el), (comment == NULL));
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (el), (comment == NULL));
- if (comment) {
- webkit_dom_html_text_area_element_set_value (
- WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el), comment);
- }
+ if (comment) {
+ webkit_dom_html_text_area_element_set_value (
+ WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el), comment);
+ }
}
gchar *
itip_view_get_rsvp_comment (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
- if (!view->priv->dom_document)
- return NULL;
+ if (!view->priv->dom_document)
+ return NULL;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
- if (webkit_dom_html_element_get_hidden (WEBKIT_DOM_HTML_ELEMENT (el))) {
- return NULL;
- }
+ if (webkit_dom_html_element_get_hidden (WEBKIT_DOM_HTML_ELEMENT (el))) {
+ return NULL;
+ }
- return webkit_dom_html_text_area_element_get_value (
- WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el));
+ return webkit_dom_html_text_area_element_get_value (
+ WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el));
}
void
@@ -2587,7 +2575,7 @@ void
itip_view_set_buttons_sensitive (ItipView *view,
gboolean sensitive)
{
- WebKitDOMElement *el, *cell;
+ WebKitDOMElement *el, *cell;
g_return_if_fail (ITIP_IS_VIEW (view));
@@ -2595,61 +2583,61 @@ itip_view_set_buttons_sensitive (ItipView *view,
view->priv->buttons_sensitive = sensitive;
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
+
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_UPDATE);
+ webkit_dom_html_input_element_set_disabled (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_UPDATE);
- webkit_dom_html_input_element_set_disabled (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_RECUR);
+ webkit_dom_html_input_element_set_disabled (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_RECUR);
- webkit_dom_html_input_element_set_disabled (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_FREE_TIME);
+ webkit_dom_html_input_element_set_disabled (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_FREE_TIME);
- webkit_dom_html_input_element_set_disabled (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_KEEP_ALARM);
+ webkit_dom_html_input_element_set_disabled (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_KEEP_ALARM);
- webkit_dom_html_input_element_set_disabled (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_INHERIT_ALARM);
+ webkit_dom_html_input_element_set_disabled (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_INHERIT_ALARM);
- webkit_dom_html_input_element_set_disabled (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_RSVP);
+ webkit_dom_html_input_element_set_disabled (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_RSVP);
- webkit_dom_html_input_element_set_disabled (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), !sensitive);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
+ webkit_dom_html_text_area_element_set_disabled (
+ WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el), !sensitive);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TEXTAREA_RSVP_COMMENT);
- webkit_dom_html_text_area_element_set_disabled (
- WEBKIT_DOM_HTML_TEXT_AREA_ELEMENT (el), !sensitive);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, SELECT_ESOURCE);
+ webkit_dom_html_select_element_set_disabled (
+ WEBKIT_DOM_HTML_SELECT_ELEMENT (el), !sensitive);
el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, SELECT_ESOURCE);
- webkit_dom_html_select_element_set_disabled(
- WEBKIT_DOM_HTML_SELECT_ELEMENT (el), !sensitive);
-
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, TABLE_ROW_BUTTONS);
- cell = webkit_dom_element_get_first_element_child (el);
- do {
- WebKitDOMElement *btn;
- btn = webkit_dom_element_get_first_element_child (cell);
- if (!webkit_dom_html_element_get_hidden (
- WEBKIT_DOM_HTML_ELEMENT (btn))) {
- webkit_dom_html_button_element_set_disabled (
- WEBKIT_DOM_HTML_BUTTON_ELEMENT (btn), !sensitive);
- }
- } while ((cell = webkit_dom_element_get_next_element_sibling (cell)) != NULL);
+ view->priv->dom_document, TABLE_ROW_BUTTONS);
+ cell = webkit_dom_element_get_first_element_child (el);
+ do {
+ WebKitDOMElement *btn;
+ btn = webkit_dom_element_get_first_element_child (cell);
+ if (!webkit_dom_html_element_get_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (btn))) {
+ webkit_dom_html_button_element_set_disabled (
+ WEBKIT_DOM_HTML_BUTTON_ELEMENT (btn), !sensitive);
+ }
+ } while ((cell = webkit_dom_element_get_next_element_sibling (cell)) != NULL);
}
gboolean
@@ -2663,193 +2651,193 @@ itip_view_get_buttons_sensitive (ItipView *view)
gboolean
itip_view_get_recur_check_state (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
- g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
+ g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
- if (!view->priv->dom_document)
- return FALSE;
+ if (!view->priv->dom_document)
+ return FALSE;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_RECUR);
- return webkit_dom_html_input_element_get_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_RECUR);
+ return webkit_dom_html_input_element_get_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
}
void
itip_view_set_show_recur_check (ItipView *view,
gboolean show)
{
- WebKitDOMElement *label;
- WebKitDOMElement *el;
+ WebKitDOMElement *label;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
+ el = webkit_dom_document_get_element_by_id (
view->priv->dom_document, "table_row_" CHECKBOX_RECUR);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_RECUR);
- label = webkit_dom_element_get_next_element_sibling (el);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_RECUR);
+ label = webkit_dom_element_get_next_element_sibling (el);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
- if (!show) {
- webkit_dom_html_input_element_set_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
- }
+ if (!show) {
+ webkit_dom_html_input_element_set_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
+ }
/* and update state of the second check */
- alarm_check_toggled_cb (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el),
- NULL, view);
+ alarm_check_toggled_cb (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el),
+ NULL, view);
}
void
itip_view_set_show_free_time_check (ItipView *view,
gboolean show)
{
- WebKitDOMElement *label;
- WebKitDOMElement *el;
+ WebKitDOMElement *label;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
+ el = webkit_dom_document_get_element_by_id (
view->priv->dom_document, "table_row_" CHECKBOX_FREE_TIME);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_FREE_TIME);
- label = webkit_dom_element_get_next_element_sibling (el);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_FREE_TIME);
+ label = webkit_dom_element_get_next_element_sibling (el);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
- if (!show) {
- webkit_dom_html_input_element_set_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
- }
+ if (!show) {
+ webkit_dom_html_input_element_set_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
+ }
/* and update state of the second check */
- alarm_check_toggled_cb (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el),
- NULL, view);
+ alarm_check_toggled_cb (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el),
+ NULL, view);
}
gboolean
itip_view_get_free_time_check_state (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
- if (!view->priv->dom_document)
- return FALSE;
+ if (!view->priv->dom_document)
+ return FALSE;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_FREE_TIME);
- return webkit_dom_html_input_element_get_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_FREE_TIME);
+ return webkit_dom_html_input_element_get_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
}
void
itip_view_set_show_keep_alarm_check (ItipView *view,
gboolean show)
{
- WebKitDOMElement *label;
- WebKitDOMElement *el;
+ WebKitDOMElement *label;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
+ el = webkit_dom_document_get_element_by_id (
view->priv->dom_document, "table_row_" CHECKBOX_KEEP_ALARM);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_KEEP_ALARM);
- label = webkit_dom_element_get_next_element_sibling (el);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_KEEP_ALARM);
+ label = webkit_dom_element_get_next_element_sibling (el);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
- if (!show) {
- webkit_dom_html_input_element_set_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
- }
+ if (!show) {
+ webkit_dom_html_input_element_set_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
+ }
/* and update state of the second check */
- alarm_check_toggled_cb (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el),
- NULL, view);
+ alarm_check_toggled_cb (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el),
+ NULL, view);
}
gboolean
itip_view_get_keep_alarm_check_state (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
- if (!view->priv->dom_document)
- return FALSE;
+ if (!view->priv->dom_document)
+ return FALSE;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_KEEP_ALARM);
- return webkit_dom_html_input_element_get_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_KEEP_ALARM);
+ return webkit_dom_html_input_element_get_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
}
void
itip_view_set_show_inherit_alarm_check (ItipView *view,
gboolean show)
{
- WebKitDOMElement *label;
- WebKitDOMElement *el;
+ WebKitDOMElement *label;
+ WebKitDOMElement *el;
g_return_if_fail (ITIP_IS_VIEW (view));
- if (!view->priv->dom_document)
- return;
+ if (!view->priv->dom_document)
+ return;
- el = webkit_dom_document_get_element_by_id (
+ el = webkit_dom_document_get_element_by_id (
view->priv->dom_document, "table_row_" CHECKBOX_INHERIT_ALARM);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_INHERIT_ALARM);
- label = webkit_dom_element_get_next_element_sibling (el);
- webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_INHERIT_ALARM);
+ label = webkit_dom_element_get_next_element_sibling (el);
+ webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (label), !show);
- if (!show) {
- webkit_dom_html_input_element_set_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
- }
+ if (!show) {
+ webkit_dom_html_input_element_set_checked (
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el), FALSE);
+ }
/* and update state of the second check */
alarm_check_toggled_cb (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el),
- NULL, view);
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el),
+ NULL, view);
}
gboolean
itip_view_get_inherit_alarm_check_state (ItipView *view)
{
- WebKitDOMElement *el;
+ WebKitDOMElement *el;
g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
- if (!view->priv->dom_document)
- return FALSE;
+ if (!view->priv->dom_document)
+ return FALSE;
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, CHECKBOX_INHERIT_ALARM);
+ el = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, CHECKBOX_INHERIT_ALARM);
return webkit_dom_html_input_element_get_checked (
- WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
+ WEBKIT_DOM_HTML_INPUT_ELEMENT (el));
}
void
@@ -2857,57 +2845,55 @@ itip_view_set_error (ItipView *view,
const gchar *error_html,
gboolean show_save_btn)
{
- WebKitDOMElement *content, *error;
- GString *str;
+ WebKitDOMElement *content, *error;
+ GString *str;
- g_return_if_fail (ITIP_IS_VIEW (view));
- g_return_if_fail (error_html);
+ g_return_if_fail (ITIP_IS_VIEW (view));
+ g_return_if_fail (error_html);
- str = g_string_new (error_html);
+ str = g_string_new (error_html);
- if (show_save_btn) {
- g_string_append (str,
+ if (show_save_btn) {
+ g_string_append (str,
"<table border=\"0\" width=\"100%\">"
"<tr width=\"100%\" id=\"" TABLE_ROW_BUTTONS "\">");
- buttons_table_write_button (
+ buttons_table_write_button (
str, BUTTON_SAVE, _("Save"),
- GTK_STOCK_SAVE, ITIP_VIEW_RESPONSE_SAVE);
+ GTK_STOCK_SAVE, ITIP_VIEW_RESPONSE_SAVE);
g_string_append (str, "</tr></table>");
- }
-
- view->priv->error = str->str;
- g_string_free (str, FALSE);
-
- if (!view->priv->dom_document)
- return;
+ }
- content = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, DIV_ITIP_CONTENT);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (content), TRUE);
+ view->priv->error = str->str;
+ g_string_free (str, FALSE);
- error = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, DIV_ITIP_ERROR);
- webkit_dom_html_element_set_hidden (
- WEBKIT_DOM_HTML_ELEMENT (error), FALSE);
+ if (!view->priv->dom_document)
+ return;
- webkit_dom_html_element_set_inner_html (
- WEBKIT_DOM_HTML_ELEMENT (error), view->priv->error, NULL);
+ content = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, DIV_ITIP_CONTENT);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (content), TRUE);
+ error = webkit_dom_document_get_element_by_id (
+ view->priv->dom_document, DIV_ITIP_ERROR);
+ webkit_dom_html_element_set_hidden (
+ WEBKIT_DOM_HTML_ELEMENT (error), FALSE);
+ webkit_dom_html_element_set_inner_html (
+ WEBKIT_DOM_HTML_ELEMENT (error), view->priv->error, NULL);
- if (show_save_btn) {
- WebKitDOMElement *el;
+ if (show_save_btn) {
+ WebKitDOMElement *el;
- show_button (view, BUTTON_SAVE);
+ show_button (view, BUTTON_SAVE);
- el = webkit_dom_document_get_element_by_id (
- view->priv->dom_document, BUTTON_SAVE);
- webkit_dom_event_target_add_event_listener (
+ 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",
- G_CALLBACK (button_clicked_cb), FALSE, view);
- }
+ G_CALLBACK (button_clicked_cb), FALSE, view);
+ }
}
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index 0308977..5ae8d9c 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -96,7 +96,7 @@ struct _ItipViewClass {
GType itip_view_get_type (void);
-ItipView* itip_view_new (ItipPURI *puri);
+ItipView * itip_view_new (ItipPURI *puri);
void itip_view_write (GString *buffer);
@@ -106,7 +106,7 @@ void itip_view_write_for_printing (ItipView *view,
void itip_view_create_dom_bindings (ItipView *view,
WebKitDOMElement *element);
-ItipPURI* itip_view_get_puri (ItipView *view);
+ItipPURI * itip_view_get_puri (ItipView *view);
void itip_view_set_mode (ItipView *view,
ItipViewMode mode);
@@ -119,59 +119,59 @@ ECalClientSourceType
void itip_view_set_organizer (ItipView *view,
const gchar *organizer);
-const gchar* itip_view_get_organizer (ItipView *view);
+const gchar * itip_view_get_organizer (ItipView *view);
void itip_view_set_organizer_sentby (ItipView *view,
const gchar *sentby);
-const gchar* itip_view_get_organizer_sentby (ItipView *view);
+const gchar * itip_view_get_organizer_sentby (ItipView *view);
void itip_view_set_attendee (ItipView *view,
const gchar *attendee);
-const gchar* itip_view_get_attendee (ItipView *view);
+const gchar * itip_view_get_attendee (ItipView *view);
void itip_view_set_attendee_sentby (ItipView *view,
const gchar *sentby);
-const gchar* itip_view_get_attendee_sentby (ItipView *view);
+const gchar * itip_view_get_attendee_sentby (ItipView *view);
void itip_view_set_delegator (ItipView *view,
const gchar *delegator);
-const gchar* itip_view_get_delegator (ItipView *view);
+const gchar * itip_view_get_delegator (ItipView *view);
void itip_view_set_proxy (ItipView *view,
const gchar *proxy);
-const gchar* itip_view_get_proxy (ItipView *view);
+const gchar * itip_view_get_proxy (ItipView *view);
void itip_view_set_summary (ItipView *view,
const gchar *summary);
-const gchar* itip_view_get_summary (ItipView *view);
+const gchar * itip_view_get_summary (ItipView *view);
void itip_view_set_location (ItipView *view,
const gchar *location);
-const gchar* itip_view_get_location (ItipView *view);
+const gchar * itip_view_get_location (ItipView *view);
void itip_view_set_status (ItipView *view,
const gchar *status);
-const gchar* itip_view_get_status (ItipView *view);
+const gchar * itip_view_get_status (ItipView *view);
void itip_view_set_comment (ItipView *view,
const gchar *comment);
-const gchar* itip_view_get_comment (ItipView *view);
+const gchar * itip_view_get_comment (ItipView *view);
void itip_view_set_description (ItipView *view,
const gchar *description);
-const gchar* itip_view_get_description (ItipView *view);
+const gchar * itip_view_get_description (ItipView *view);
void itip_view_set_start (ItipView *view,
struct tm *start,
gboolean is_date);
-const struct tm*
+const struct tm *
itip_view_get_start (ItipView *view,
gboolean *is_date);
void itip_view_set_end (ItipView *view,
struct tm *end,
gboolean is_date);
-const struct tm*
+const struct tm *
itip_view_get_end (ItipView *view,
gboolean *is_date);
@@ -203,11 +203,11 @@ void itip_view_clear_lower_info_items
void itip_view_set_source_list (ItipView *view,
ESourceList *source_list);
-ESourceList* itip_view_get_source_list (ItipView *view);
+ESourceList * itip_view_get_source_list (ItipView *view);
void itip_view_set_source (ItipView *view,
ESource *source);
-ESource* itip_view_get_source (ItipView *view);
+ESource * itip_view_get_source (ItipView *view);
void itip_view_set_rsvp (ItipView *view,
gboolean rsvp);
@@ -227,7 +227,7 @@ gboolean itip_view_get_show_update_check (ItipView *view);
void itip_view_set_rsvp_comment (ItipView *view,
const gchar *comment);
-gchar* itip_view_get_rsvp_comment (ItipView *view);
+gchar * itip_view_get_rsvp_comment (ItipView *view);
void itip_view_set_buttons_sensitive (ItipView *view,
gboolean sensitive);
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index 47b243a..5793370 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -49,10 +49,10 @@ static gboolean epp_show_suppressed = TRUE;
static void
make_part_attachment (EMFormat *format,
- CamelMimePart *part,
- GString *part_id,
- gboolean force_html,
- GCancellable *cancellable)
+ CamelMimePart *part,
+ GString *part_id,
+ gboolean force_html,
+ GCancellable *cancellable)
{
EMFormatParserInfo info = {0};
@@ -106,9 +106,9 @@ org_gnome_prefer_plain_text_html (gpointer ep,
static void
export_as_attachments (CamelMultipart *mp,
- EMFormat *format,
- CamelMimePart *except,
- GString *part_id)
+ EMFormat *format,
+ CamelMimePart *except,
+ GString *part_id)
{
gint i, nparts;
CamelMimePart *part;
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 761a41b..0621c12 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -19,7 +19,6 @@
*
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -93,7 +92,7 @@ org_gnome_format_tnef (gpointer ep,
CamelMultipart *mp;
CamelMimePart *mainpart;
CamelDataWrapper *content;
- const EMFormatHandler *handler;
+ const EMFormatHandler *handler;
gint len;
TNEFStruct tnef;
@@ -105,25 +104,25 @@ org_gnome_format_tnef (gpointer ep,
out = camel_stream_fs_new_with_name (name, O_RDWR | O_CREAT, 0666, NULL);
if (out == NULL) {
- g_free (name);
+ g_free (name);
return;
- }
+ }
content = camel_medium_get_content ((CamelMedium *) t->part);
if (content == NULL) {
- g_free (name);
- g_object_unref (out);
+ g_free (name);
+ g_object_unref (out);
return;
- }
+ }
if (camel_data_wrapper_decode_to_stream_sync (content, out, NULL, NULL) == -1
|| camel_stream_close (out, NULL, NULL) == -1) {
g_object_unref (out);
- g_free (name);
+ g_free (name);
return;
}
g_object_unref (out);
/* Extracting the winmail.dat */
- TNEFInitialize (&tnef);
+ TNEFInitialize (&tnef);
tnef.Debug = verbose;
if (TNEFParseFile (name, &tnef) == -1) {
printf("ERROR processing file\n");
@@ -135,10 +134,10 @@ org_gnome_format_tnef (gpointer ep,
dir = opendir (tmpdir);
if (dir == NULL) {
- g_object_unref (out);
- g_free (name);
+ g_object_unref (out);
+ g_free (name);
return;
- }
+ }
mainpart = camel_mime_part_new ();
@@ -194,14 +193,14 @@ org_gnome_format_tnef (gpointer ep,
if (camel_multipart_get_number (mp) > 0) {
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 ();
- camel_medium_set_content ((CamelMedium *) part,
- CAMEL_DATA_WRAPPER (mp));
- handler->parse_func (t->format, part, t->part_id, t->info, NULL);
- g_object_unref (part);
- }
- }
+ if (handler && handler->parse_func) {
+ CamelMimePart *part = camel_mime_part_new ();
+ camel_medium_set_content ((CamelMedium *) part,
+ CAMEL_DATA_WRAPPER (mp));
+ handler->parse_func (t->format, part, t->part_id, t->info, NULL);
+ g_object_unref (part);
+ }
+ }
g_string_truncate (t->part_id, len);
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 7ddfb19..7d83ab2 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -181,8 +181,8 @@ org_gnome_vcard_inline_client_loaded_cb (ESource *source,
static void
org_gnome_vcard_inline_save_cb (WebKitDOMEventTarget *button,
- WebKitDOMEvent *event,
- VCardInlinePURI *vcard_object)
+ WebKitDOMEvent *event,
+ VCardInlinePURI *vcard_object)
{
ESource *source;
GSList *contact_list;
@@ -218,8 +218,8 @@ org_gnome_vcard_inline_save_cb (WebKitDOMEventTarget *button,
static void
org_gnome_vcard_inline_toggle_cb (WebKitDOMEventTarget *button,
- WebKitDOMEvent *event,
- EMFormatPURI *puri)
+ WebKitDOMEvent *event,
+ EMFormatPURI *puri)
{
VCardInlinePURI *vcard_object;
EABContactDisplayMode mode;
@@ -231,7 +231,7 @@ org_gnome_vcard_inline_toggle_cb (WebKitDOMEventTarget *button,
if (mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
- webkit_dom_html_element_set_inner_text(
+ webkit_dom_html_element_set_inner_text (
WEBKIT_DOM_HTML_ELEMENT (button),
_("Show Full vCard"), NULL);
@@ -258,7 +258,7 @@ org_gnome_vcard_inline_toggle_cb (WebKitDOMEventTarget *button,
static void
org_gnome_vcard_inline_bind_dom (WebKitDOMElement *attachment,
- EMFormatPURI *puri)
+ EMFormatPURI *puri)
{
WebKitDOMNodeList *list;
WebKitDOMElement *iframe, *toggle_button, *save_button;
@@ -276,7 +276,7 @@ org_gnome_vcard_inline_bind_dom (WebKitDOMElement *attachment,
vcard_object->iframe = g_object_ref (iframe);
/* TOGGLE DISPLAY MODE BUTTON */
- list = webkit_dom_element_get_elements_by_class_name(
+ list = webkit_dom_element_get_elements_by_class_name (
attachment, "org-gnome-vcard-inline-display-mode-button");
if (webkit_dom_node_list_get_length (list) != 1)
return;
@@ -295,7 +295,6 @@ org_gnome_vcard_inline_bind_dom (WebKitDOMElement *attachment,
g_object_unref (vcard_object->save_button);
vcard_object->save_button = g_object_ref (save_button);
-
webkit_dom_event_target_add_event_listener (
WEBKIT_DOM_EVENT_TARGET (toggle_button),
"click", G_CALLBACK (org_gnome_vcard_inline_toggle_cb),
@@ -309,10 +308,10 @@ org_gnome_vcard_inline_bind_dom (WebKitDOMElement *attachment,
static void
org_gnome_vcard_inline_write (EMFormat *emf,
- EMFormatPURI *puri,
- CamelStream *stream,
- EMFormatWriterInfo *info,
- GCancellable *cancellable)
+ EMFormatPURI *puri,
+ CamelStream *stream,
+ EMFormatWriterInfo *info,
+ GCancellable *cancellable)
{
VCardInlinePURI *vpuri;
@@ -416,7 +415,7 @@ org_gnome_vcard_inline_format (gpointer ep,
g_string_append (target->part_id, ".org-gnome-vcard-inline-display");
vcard_object = (VCardInlinePURI *) em_format_puri_new (
- target->format, sizeof(VCardInlinePURI),
+ target->format, sizeof (VCardInlinePURI),
target->part, target->part_id->str);
vcard_object->puri.mime_type = g_strdup("text/html");
vcard_object->puri.write_func = org_gnome_vcard_inline_write;
diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c
index bb4afb8..0d46807 100644
--- a/widgets/misc/e-attachment-button.c
+++ b/widgets/misc/e-attachment-button.c
@@ -695,7 +695,7 @@ e_attachment_button_get_view (EAttachmentButton *button)
void
e_attachment_button_set_view (EAttachmentButton *button,
- EAttachmentView *view)
+ EAttachmentView *view)
{
GtkWidget *popup_menu;
diff --git a/widgets/misc/e-port-entry.c b/widgets/misc/e-port-entry.c
index 470249a..cf857b5 100644
--- a/widgets/misc/e-port-entry.c
+++ b/widgets/misc/e-port-entry.c
@@ -128,7 +128,7 @@ port_entry_method_changed (EPortEntry *port_entry)
if (valid && port_entry->priv->entries != NULL) {
for (ii = 0; port_entry->priv->entries[ii].port > 0 && (!have_ssl || !have_nossl); ii++) {
/* Use only the first SSL/no-SSL port as a default in the list
- and skip the others */
+ * and skip the others */
if (port_entry->priv->entries[ii].is_ssl) {
if (have_ssl)
continue;
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 0e39aa1..9ed0c2d 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -137,7 +137,6 @@ search_bar_find (ESearchBar *search_bar,
search_bar_update_matches (search_bar, matches);
}
-
success = webkit_web_view_search_text (
WEBKIT_WEB_VIEW (web_view),
text, case_sensitive, search_forward, FALSE);
diff --git a/widgets/misc/e-web-view-gtkhtml.h b/widgets/misc/e-web-view-gtkhtml.h
index 281a9f9..aab06e8 100644
--- a/widgets/misc/e-web-view-gtkhtml.h
+++ b/widgets/misc/e-web-view-gtkhtml.h
@@ -93,25 +93,25 @@ GType e_web_view_gtkhtml_get_type (void);
GtkWidget * e_web_view_gtkhtml_new (void);
void e_web_view_gtkhtml_clear (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_load_string (EWebViewGtkHTML *web_view,
- const gchar *string);
+ const gchar *string);
gboolean e_web_view_gtkhtml_get_animate (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_animate (EWebViewGtkHTML *web_view,
- gboolean animate);
+ gboolean animate);
gboolean e_web_view_gtkhtml_get_caret_mode (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_caret_mode (EWebViewGtkHTML *web_view,
- gboolean caret_mode);
+ gboolean caret_mode);
GtkTargetList * e_web_view_gtkhtml_get_copy_target_list (EWebViewGtkHTML *web_view);
gboolean e_web_view_gtkhtml_get_disable_printing (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_disable_printing (EWebViewGtkHTML *web_view,
- gboolean disable_printing);
+ gboolean disable_printing);
gboolean e_web_view_gtkhtml_get_disable_save_to_disk
(EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_disable_save_to_disk
(EWebViewGtkHTML *web_view,
- gboolean disable_save_to_disk);
+ gboolean disable_save_to_disk);
gboolean e_web_view_gtkhtml_get_editable (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_editable (EWebViewGtkHTML *web_view,
- gboolean editable);
+ gboolean editable);
gboolean e_web_view_gtkhtml_get_inline_spelling (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_inline_spelling (EWebViewGtkHTML *web_view,
gboolean inline_spelling);
@@ -135,10 +135,10 @@ GtkTargetList * e_web_view_gtkhtml_get_paste_target_list
(EWebViewGtkHTML *web_view);
GtkAction * e_web_view_gtkhtml_get_print_proxy (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_print_proxy (EWebViewGtkHTML *web_view,
- GtkAction *print_proxy);
+ GtkAction *print_proxy);
GtkAction * e_web_view_gtkhtml_get_save_as_proxy (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_save_as_proxy (EWebViewGtkHTML *web_view,
- GtkAction *save_as_proxy);
+ GtkAction *save_as_proxy);
GtkAction * e_web_view_gtkhtml_get_action (EWebViewGtkHTML *web_view,
const gchar *action_name);
GtkActionGroup *e_web_view_gtkhtml_get_action_group (EWebViewGtkHTML *web_view,
@@ -164,7 +164,7 @@ void e_web_view_gtkhtml_show_popup_menu (EWebViewGtkHTML *web_view,
GtkMenuPositionFunc func,
gpointer user_data);
void e_web_view_gtkhtml_status_message (EWebViewGtkHTML *web_view,
- const gchar *status_message);
+ const gchar *status_message);
void e_web_view_gtkhtml_stop_loading (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_update_actions (EWebViewGtkHTML *web_view);
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 412a7f6..1fdc555 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -355,18 +355,18 @@ replace_text (WebKitDOMNode *node,
WebKitDOMNode *replacement)
{
/* NodeType 3 = TEXT_NODE */
- if (webkit_dom_node_get_node_type (node) == 3) {
+ if (webkit_dom_node_get_node_type (node) == 3) {
- gint text_length = strlen (text);
+ gint text_length = strlen (text);
- while (node) {
+ while (node) {
- WebKitDOMNode *current_node, *replacement_node;
- const gchar *node_data, *offset;
- goffset split_offset;
- gint data_length;
+ WebKitDOMNode *current_node, *replacement_node;
+ const gchar *node_data, *offset;
+ goffset split_offset;
+ gint data_length;
- current_node = node;
+ current_node = node;
/* Don't use the WEBKIT_DOM_CHARACTER_DATA macro for
* casting. WebKit lies about type of the object and
@@ -377,107 +377,105 @@ replace_text (WebKitDOMNode *node,
* handles it by the nodeType so therefor it works
* event for "invalid" objects. But really, who knows..?
*/
- node_data = webkit_dom_character_data_get_data (
- (WebKitDOMCharacterData *) node);
-
- offset = strstr (node_data, text);
- if (!offset) {
- node = NULL;
- continue;
- }
-
- split_offset = offset - node_data + text_length;
- replacement_node =
- webkit_dom_node_clone_node (replacement, TRUE);
-
- data_length = webkit_dom_character_data_get_length(
- (WebKitDOMCharacterData *) node);
- if (split_offset < data_length) {
-
- WebKitDOMNode *parent_node;
-
- node = WEBKIT_DOM_NODE (
- webkit_dom_text_split_text (
- (WebKitDOMText *) node,
- offset - node_data + text_length,
- NULL));
- parent_node = webkit_dom_node_get_parent_node(node);
- webkit_dom_node_insert_before (
- parent_node, replacement_node,
- node, NULL);
-
- } else {
- WebKitDOMNode *parent_node;
-
- parent_node = webkit_dom_node_get_parent_node (node);
- webkit_dom_node_append_child (
- parent_node,
- replacement_node, NULL);
- }
-
- webkit_dom_character_data_delete_data (
- (WebKitDOMCharacterData *) (current_node),
- offset - node_data, text_length, NULL);
- }
+ node_data = webkit_dom_character_data_get_data (
+ (WebKitDOMCharacterData *) node);
+
+ offset = strstr (node_data, text);
+ if (!offset) {
+ node = NULL;
+ continue;
+ }
+
+ split_offset = offset - node_data + text_length;
+ replacement_node =
+ webkit_dom_node_clone_node (replacement, TRUE);
+
+ data_length = webkit_dom_character_data_get_length (
+ (WebKitDOMCharacterData *) node);
+ if (split_offset < data_length) {
+
+ WebKitDOMNode *parent_node;
+
+ node = WEBKIT_DOM_NODE (
+ webkit_dom_text_split_text (
+ (WebKitDOMText *) node,
+ offset - node_data + text_length,
+ NULL));
+ parent_node = webkit_dom_node_get_parent_node (node);
+ webkit_dom_node_insert_before (
+ parent_node, replacement_node,
+ node, NULL);
+
+ } else {
+ WebKitDOMNode *parent_node;
+
+ parent_node = webkit_dom_node_get_parent_node (node);
+ webkit_dom_node_append_child (
+ parent_node,
+ replacement_node, NULL);
+ }
+
+ webkit_dom_character_data_delete_data (
+ (WebKitDOMCharacterData *) (current_node),
+ offset - node_data, text_length, NULL);
+ }
- } else {
+ } else {
- WebKitDOMNode *child, *next_child;
+ WebKitDOMNode *child, *next_child;
/* Iframe? Let's traverse inside! */
- if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (node)) {
+ if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (node)) {
- WebKitDOMDocument *frame_document;
+ WebKitDOMDocument *frame_document;
- frame_document =
- webkit_dom_html_iframe_element_get_content_document(
- WEBKIT_DOM_HTML_IFRAME_ELEMENT (node));
- replace_text (WEBKIT_DOM_NODE (frame_document),
- text, replacement);
+ frame_document =
+ webkit_dom_html_iframe_element_get_content_document (
+ WEBKIT_DOM_HTML_IFRAME_ELEMENT (node));
+ replace_text (WEBKIT_DOM_NODE (frame_document),
+ text, replacement);
- } else {
+ } else {
- child = webkit_dom_node_get_first_child (node);
- while (child) {
- next_child = webkit_dom_node_get_next_sibling (child);
- replace_text (child, text, replacement);
- child = next_child;
- }
- }
- }
+ child = webkit_dom_node_get_first_child (node);
+ while (child) {
+ next_child = webkit_dom_node_get_next_sibling (child);
+ replace_text (child, text, replacement);
+ child = next_child;
+ }
+ }
+ }
}
-
static void
web_view_update_document_highlights (EWebView *web_view)
{
- WebKitDOMDocument *document;
- GSList *iter;
+ WebKitDOMDocument *document;
+ GSList *iter;
- document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (web_view));
+ document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (web_view));
- for (iter = web_view->priv->highlights; iter; iter = iter->next) {
+ for (iter = web_view->priv->highlights; iter; iter = iter->next) {
- WebKitDOMDocumentFragment *frag;
- WebKitDOMElement *span;
+ WebKitDOMDocumentFragment *frag;
+ WebKitDOMElement *span;
span = webkit_dom_document_create_element (document, "span", NULL);
- webkit_dom_html_element_set_class_name (
+ webkit_dom_html_element_set_class_name (
WEBKIT_DOM_HTML_ELEMENT (span), "__evo-highlight");
- webkit_dom_html_element_set_inner_text (
- WEBKIT_DOM_HTML_ELEMENT (span), iter->data, NULL);
+ webkit_dom_html_element_set_inner_text (
+ WEBKIT_DOM_HTML_ELEMENT (span), iter->data, NULL);
- frag = webkit_dom_document_create_document_fragment (document);
- webkit_dom_node_append_child (
- WEBKIT_DOM_NODE (frag), WEBKIT_DOM_NODE (span), NULL);
+ frag = webkit_dom_document_create_document_fragment (document);
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (frag), WEBKIT_DOM_NODE (span), NULL);
- replace_text(WEBKIT_DOM_NODE (document),
- iter->data, WEBKIT_DOM_NODE (frag));
- }
+ replace_text (WEBKIT_DOM_NODE (document),
+ iter->data, WEBKIT_DOM_NODE (frag));
+ }
}
-
static void
web_view_menu_item_deselect_cb (EWebView *web_view)
{
@@ -572,13 +570,13 @@ web_view_load_status_changed_cb (WebKitWebView *web_view,
GParamSpec *pspec,
gpointer user_data)
{
- WebKitLoadStatus status;
+ WebKitLoadStatus status;
- status = webkit_web_view_get_load_status (web_view);
- if (status != WEBKIT_LOAD_FINISHED)
- return;
+ status = webkit_web_view_get_load_status (web_view);
+ if (status != WEBKIT_LOAD_FINISHED)
+ return;
- web_view_update_document_highlights (E_WEB_VIEW (web_view));
+ web_view_update_document_highlights (E_WEB_VIEW (web_view));
}
static void
@@ -790,9 +788,9 @@ web_view_dispose (GObject *object)
}
if (priv->highlights != NULL) {
- g_slist_free_full (priv->highlights, g_free);
- priv->highlights = NULL;
- }
+ g_slist_free_full (priv->highlights, g_free);
+ priv->highlights = NULL;
+ }
/* Chain up to parent's dispose() method. */
G_OBJECT_CLASS (parent_class)->dispose (object);
@@ -851,77 +849,77 @@ web_view_button_press_event (GtkWidget *widget,
web_view = E_WEB_VIEW (widget);
- if (event) {
- WebKitHitTestResult *test;
- WebKitHitTestResultContext context;
+ if (event) {
+ WebKitHitTestResult *test;
+ WebKitHitTestResultContext context;
- if (web_view->priv->cursor_image) {
- g_object_unref (web_view->priv->cursor_image);
- web_view->priv->cursor_image = NULL;
- }
+ if (web_view->priv->cursor_image) {
+ g_object_unref (web_view->priv->cursor_image);
+ web_view->priv->cursor_image = NULL;
+ }
- if (web_view->priv->cursor_image_src) {
- g_free (web_view->priv->cursor_image_src);
- web_view->priv->cursor_image_src = NULL;
- }
+ if (web_view->priv->cursor_image_src) {
+ g_free (web_view->priv->cursor_image_src);
+ web_view->priv->cursor_image_src = NULL;
+ }
- test = webkit_web_view_get_hit_test_result (WEBKIT_WEB_VIEW (web_view), event);
+ test = webkit_web_view_get_hit_test_result (WEBKIT_WEB_VIEW (web_view), event);
- if (!test)
- goto chainup;
+ if (!test)
+ goto chainup;
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;
+ 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);
- if (!uri)
- goto chainup;
+ if (!uri)
+ goto chainup;
- if (web_view->priv->cursor_image_src)
- g_free (web_view->priv->cursor_image_src);
- web_view->priv->cursor_image_src = uri;
+ if (web_view->priv->cursor_image_src)
+ g_free (web_view->priv->cursor_image_src);
+ web_view->priv->cursor_image_src = uri;
/* Iterate through all resources of the loaded webpage and
- try to find resource with URI matching cursor_image_src */
- frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
- data_source = webkit_web_frame_get_data_source (frame);
- subresources = webkit_web_data_source_get_subresources (data_source);
- for (res = subresources; res; res = res->next) {
- WebKitWebResource *src = res->data;
- GdkPixbufLoader *loader;
- GString *data;
-
- if (g_strcmp0 (webkit_web_resource_get_uri (src),
- web_view->priv->cursor_image_src) != 0)
- continue;
-
- data = webkit_web_resource_get_data (src);
- if (!data)
- break;
-
- loader = gdk_pixbuf_loader_new ();
- if (!gdk_pixbuf_loader_write (loader,
- (guchar *) data->str, data->len, NULL)) {
- g_object_unref (loader);
- break;
- }
- gdk_pixbuf_loader_close (loader, NULL);
-
- if (web_view->priv->cursor_image)
- g_object_unref (web_view->priv->cursor_image);
-
- web_view->priv->cursor_image =
- g_object_ref (gdk_pixbuf_loader_get_animation (loader));
-
- g_object_unref (loader);
- break;
- }
- }
- }
+ try to find resource with URI matching cursor_image_src */
+ frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
+ data_source = webkit_web_frame_get_data_source (frame);
+ subresources = webkit_web_data_source_get_subresources (data_source);
+ for (res = subresources; res; res = res->next) {
+ WebKitWebResource *src = res->data;
+ GdkPixbufLoader *loader;
+ GString *data;
+
+ if (g_strcmp0 (webkit_web_resource_get_uri (src),
+ web_view->priv->cursor_image_src) != 0)
+ continue;
+
+ data = webkit_web_resource_get_data (src);
+ if (!data)
+ break;
+
+ loader = gdk_pixbuf_loader_new ();
+ if (!gdk_pixbuf_loader_write (loader,
+ (guchar *) data->str, data->len, NULL)) {
+ g_object_unref (loader);
+ break;
+ }
+ gdk_pixbuf_loader_close (loader, NULL);
+
+ if (web_view->priv->cursor_image)
+ g_object_unref (web_view->priv->cursor_image);
+
+ web_view->priv->cursor_image =
+ g_object_ref (gdk_pixbuf_loader_get_animation (loader));
+
+ g_object_unref (loader);
+ break;
+ }
+ }
+ }
if (event != NULL && event->button != 3)
goto chainup;
@@ -1113,7 +1111,7 @@ web_view_load_string (EWebView *web_view,
static void
web_view_load_uri (EWebView *web_view,
- const gchar *uri)
+ const gchar *uri)
{
if (uri == NULL)
uri = "about:blank";
@@ -1124,8 +1122,8 @@ web_view_load_uri (EWebView *web_view,
static void
web_view_frame_load_string (EWebView *web_view,
- const gchar *frame_name,
- const gchar *string)
+ const gchar *frame_name,
+ const gchar *string)
{
WebKitWebFrame *main_frame, *frame;
@@ -1144,8 +1142,8 @@ web_view_frame_load_string (EWebView *web_view,
static void
web_view_frame_load_uri (EWebView *web_view,
- const gchar *frame_name,
- const gchar *uri)
+ const gchar *frame_name,
+ const gchar *uri)
{
WebKitWebFrame *main_frame, *frame;
@@ -1665,7 +1663,7 @@ e_web_view_init (EWebView *web_view)
web_view->priv = E_WEB_VIEW_GET_PRIVATE (web_view);
- web_view->priv->highlights = NULL;
+ web_view->priv->highlights = NULL;
g_signal_connect (
web_view, "create-plugin-widget",
@@ -1680,9 +1678,9 @@ e_web_view_init (EWebView *web_view)
G_CALLBACK (web_view_navigation_policy_decision_requested_cb),
NULL);
- g_signal_connect (
+ g_signal_connect (
web_view, "notify::load-status",
- G_CALLBACK (web_view_load_status_changed_cb), NULL);
+ G_CALLBACK (web_view_load_status_changed_cb), NULL);
ui_manager = gtk_ui_manager_new ();
web_view->priv->ui_manager = ui_manager;
@@ -1839,7 +1837,7 @@ e_web_view_load_string (EWebView *web_view,
void
e_web_view_load_uri (EWebView *web_view,
- const gchar *uri)
+ const gchar *uri)
{
EWebViewClass *class;
@@ -1859,7 +1857,7 @@ e_web_view_reload (EWebView *web_view)
webkit_web_view_reload (WEBKIT_WEB_VIEW (web_view));
}
-const gchar*
+const gchar *
e_web_view_get_uri (EWebView *web_view)
{
g_return_val_if_fail (E_IS_WEB_VIEW (web_view), NULL);
@@ -1869,8 +1867,8 @@ e_web_view_get_uri (EWebView *web_view)
void
e_web_view_frame_load_string (EWebView *web_view,
- const gchar *frame_name,
- const gchar *string)
+ const gchar *frame_name,
+ const gchar *string)
{
EWebViewClass *class;
@@ -1885,8 +1883,8 @@ e_web_view_frame_load_string (EWebView *web_view,
void
e_web_view_frame_load_uri (EWebView *web_view,
- const gchar *frame_name,
- const gchar *uri)
+ const gchar *frame_name,
+ const gchar *uri)
{
EWebViewClass *class;
@@ -1899,9 +1897,9 @@ e_web_view_frame_load_uri (EWebView *web_view,
class->frame_load_uri (web_view, frame_name, uri);
}
-const gchar*
+const gchar *
e_web_view_frame_get_uri (EWebView *web_view,
- const gchar *frame_name)
+ const gchar *frame_name)
{
WebKitWebFrame *main_frame, *frame;
@@ -1919,7 +1917,7 @@ e_web_view_frame_get_uri (EWebView *web_view,
return NULL;
}
-gchar*
+gchar *
e_web_view_get_html (EWebView *web_view)
{
GValue html = {0};
@@ -1944,7 +1942,9 @@ e_web_view_get_global_context (EWebView *web_view)
}
GType
-e_web_view_exec_script (EWebView *web_view, const gchar *script, GValue *value)
+e_web_view_exec_script (EWebView *web_view,
+ const gchar *script,
+ GValue *value)
{
WebKitWebFrame *main_frame;
@@ -1959,7 +1959,10 @@ e_web_view_exec_script (EWebView *web_view, const gchar *script, GValue *value)
}
GType
-e_web_view_frame_exec_script (EWebView *web_view, const gchar *frame_name, const gchar *script, GValue *value)
+e_web_view_frame_exec_script (EWebView *web_view,
+ const gchar *frame_name,
+ const gchar *script,
+ GValue *value)
{
WebKitWebFrame *main_frame, *frame;
JSGlobalContextRef context;
@@ -2008,7 +2011,7 @@ e_web_view_frame_exec_script (EWebView *web_view, const gchar *frame_name, const
break;
case kJSTypeNumber:
g_value_init (value, G_TYPE_DOUBLE);
- g_value_set_double(value, JSValueToNumber (context, js_value, NULL));
+ g_value_set_double (value, JSValueToNumber (context, js_value, NULL));
break;
case kJSTypeString:
js_str = JSValueToStringCopy (context, js_value, NULL);
@@ -2036,8 +2039,12 @@ e_web_view_frame_exec_script (EWebView *web_view, const gchar *frame_name, const
}
static JSValueRef
-web_view_handle_js_callback (JSContextRef ctx, JSObjectRef function, JSObjectRef this_object,
- size_t argument_count, const JSValueRef arguments[], JSValueRef *exception)
+web_view_handle_js_callback (JSContextRef ctx,
+ JSObjectRef function,
+ JSObjectRef this_object,
+ size_t argument_count,
+ const JSValueRef arguments[],
+ JSValueRef *exception)
{
gpointer web_view;
gpointer user_data;
@@ -2055,8 +2062,8 @@ web_view_handle_js_callback (JSContextRef ctx, JSObjectRef function, JSObjectRef
JSValueRef js_userdata = JSObjectGetProperty (ctx, function, js_userdata_prop, NULL);
JSValueRef js_fncname = JSObjectGetProperty (ctx, function, js_fncname_prop, NULL);
- web_view = GINT_TO_POINTER ((int) JSValueToNumber (ctx, js_webview, NULL));
- user_data = GINT_TO_POINTER ((int) JSValueToNumber (ctx, js_userdata, NULL));
+ web_view = GINT_TO_POINTER ((gint) JSValueToNumber (ctx, js_webview, NULL));
+ user_data = GINT_TO_POINTER ((gint) JSValueToNumber (ctx, js_userdata, NULL));
js_fncname_str = JSValueToStringCopy (ctx, js_fncname, NULL);
fnc_name_len = JSStringGetLength (js_fncname_str);
@@ -2064,7 +2071,7 @@ web_view_handle_js_callback (JSContextRef ctx, JSObjectRef function, JSObjectRef
/* Convert fncname to gchar* and lookup the callback in hashtable */
fnc_name = g_malloc (fnc_name_len + 1);
- JSStringGetUTF8CString (js_fncname_str, fnc_name, fnc_name_len+1);
+ JSStringGetUTF8CString (js_fncname_str, fnc_name, fnc_name_len + 1);
callback = g_hash_table_lookup (E_WEB_VIEW (web_view)->priv->js_callbacks, fnc_name);
g_return_val_if_fail (callback != NULL, 0);
@@ -2083,7 +2090,10 @@ web_view_handle_js_callback (JSContextRef ctx, JSObjectRef function, JSObjectRef
}
void
-e_web_view_install_js_callback (EWebView *web_view, const gchar *fnc_name, EWebViewJSFunctionCallback callback, gpointer user_data)
+e_web_view_install_js_callback (EWebView *web_view,
+ const gchar *fnc_name,
+ EWebViewJSFunctionCallback callback,
+ gpointer user_data)
{
WebKitWebFrame *frame;
JSGlobalContextRef ctx;
@@ -2187,39 +2197,37 @@ 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;
+ WebKitWebSettings *settings;
+ gboolean flattening;
/* Return TRUE with fail since it's default value we set in _init(). */
- g_return_val_if_fail (E_IS_WEB_VIEW (web_view), TRUE);
+ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), TRUE);
- settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (web_view));
- g_return_val_if_fail (settings != NULL, TRUE);
+ 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);
- return flattening;
+ 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;
+ WebKitWebSettings *settings;
- g_return_if_fail (E_IS_WEB_VIEW (web_view));
+ g_return_if_fail (E_IS_WEB_VIEW (web_view));
- settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (web_view));
- g_return_if_fail (settings != NULL);
+ 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",
- enable_frame_flattening, NULL);
+ enable_frame_flattening, NULL);
}
-
-
gboolean
e_web_view_get_editable (EWebView *web_view)
{
@@ -2488,38 +2496,38 @@ e_web_view_set_save_as_proxy (EWebView *web_view,
g_object_notify (G_OBJECT (web_view), "save-as-proxy");
}
-GSList*
+GSList *
e_web_view_get_highlights (EWebView *web_view)
{
- g_return_val_if_fail (E_IS_WEB_VIEW (web_view), NULL);
+ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), NULL);
- return web_view->priv->highlights;
+ return web_view->priv->highlights;
}
void
e_web_view_add_highlight (EWebView *web_view,
const gchar *highlight)
{
- g_return_if_fail (E_IS_WEB_VIEW (web_view));
- g_return_if_fail (highlight && *highlight);
+ g_return_if_fail (E_IS_WEB_VIEW (web_view));
+ g_return_if_fail (highlight && *highlight);
- web_view->priv->highlights =
- g_slist_append (web_view->priv->highlights, g_strdup (highlight));
+ web_view->priv->highlights =
+ g_slist_append (web_view->priv->highlights, g_strdup (highlight));
- web_view_update_document_highlights (web_view);
+ web_view_update_document_highlights (web_view);
}
void e_web_view_clear_highlights (EWebView *web_view)
{
- g_return_if_fail (E_IS_WEB_VIEW (web_view));
+ g_return_if_fail (E_IS_WEB_VIEW (web_view));
- if (!web_view->priv->highlights)
- return;
+ if (!web_view->priv->highlights)
+ return;
- g_slist_free_full (web_view->priv->highlights, g_free);
- web_view->priv->highlights = NULL;
+ g_slist_free_full (web_view->priv->highlights, g_free);
+ web_view->priv->highlights = NULL;
- web_view_update_document_highlights (web_view);
+ web_view_update_document_highlights (web_view);
}
GtkAction *
@@ -2732,45 +2740,45 @@ e_web_view_update_actions (EWebView *web_view)
g_signal_emit (web_view, signals[UPDATE_ACTIONS], 0);
}
-gchar*
+gchar *
e_web_view_get_selection_html (EWebView *web_view)
{
- WebKitDOMDocument *document;
- WebKitDOMDOMWindow *window;
- WebKitDOMDOMSelection *selection;
- WebKitDOMRange *range;
- WebKitDOMDocumentFragment *fragment;
- WebKitDOMHTMLElement *element;
+ WebKitDOMDocument *document;
+ WebKitDOMDOMWindow *window;
+ WebKitDOMDOMSelection *selection;
+ WebKitDOMRange *range;
+ WebKitDOMDocumentFragment *fragment;
+ WebKitDOMHTMLElement *element;
- g_return_val_if_fail (E_IS_WEB_VIEW (web_view), NULL);
+ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), NULL);
- if (!webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view)))
- return NULL;
+ if (!webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view)))
+ return NULL;
- document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (web_view));
- window = webkit_dom_document_get_default_view (document);
- selection = webkit_dom_dom_window_get_selection (window);
- if (!selection)
- return NULL;
+ document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (web_view));
+ window = webkit_dom_document_get_default_view (document);
+ selection = webkit_dom_dom_window_get_selection (window);
+ if (!selection)
+ return NULL;
- range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
- if (!range)
- return NULL;
+ range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
+ if (!range)
+ return NULL;
- fragment = webkit_dom_range_clone_contents (range, NULL);
- if (!fragment)
- return NULL;
+ fragment = webkit_dom_range_clone_contents (range, NULL);
+ if (!fragment)
+ return 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);
+ webkit_dom_node_append_child (WEBKIT_DOM_NODE (element),
+ WEBKIT_DOM_NODE (fragment), NULL);
- return webkit_dom_html_element_get_inner_html (element);
+ return webkit_dom_html_element_get_inner_html (element);
}
void
e_web_view_set_settings (EWebView *web_view,
- WebKitWebSettings *settings)
+ WebKitWebSettings *settings)
{
g_return_if_fail (E_IS_WEB_VIEW (web_view));
@@ -2783,9 +2791,8 @@ e_web_view_set_settings (EWebView *web_view,
webkit_web_view_set_settings (WEBKIT_WEB_VIEW (web_view), settings);
}
-
-WebKitWebSettings*
-e_web_view_get_default_settings(GtkWidget *parent_widget)
+WebKitWebSettings *
+e_web_view_get_default_settings (GtkWidget *parent_widget)
{
GtkStyleContext *context;
const PangoFontDescription *font;
@@ -2809,7 +2816,7 @@ e_web_view_get_default_settings(GtkWidget *parent_widget)
"enable-offline-web-application-cache", FALSE,
"enable-site-specific-quirks", TRUE,
"enable-scripts", FALSE,
- NULL);
+ NULL);
- return settings;
+ return settings;
}
diff --git a/widgets/misc/e-web-view.h b/widgets/misc/e-web-view.h
index 2d90cf9..d71cf04 100644
--- a/widgets/misc/e-web-view.h
+++ b/widgets/misc/e-web-view.h
@@ -60,7 +60,7 @@ struct _EWebView {
EWebViewPrivate *priv;
};
-typedef void (*EWebViewJSFunctionCallback) (EWebView *web_view,
+typedef void (*EWebViewJSFunctionCallback) (EWebView *web_view,
size_t arg_count,
const JSValueRef args[],
gpointer user_data);
@@ -109,7 +109,7 @@ void e_web_view_load_string (EWebView *web_view,
const gchar *string);
void e_web_view_load_uri (EWebView *web_view,
const gchar *uri);
-const gchar* e_web_view_get_uri (EWebView *web_view);
+const gchar * e_web_view_get_uri (EWebView *web_view);
void e_web_view_reload (EWebView *web_view);
void e_web_view_frame_load_string (EWebView *web_view,
const gchar *frame_name,
@@ -117,7 +117,7 @@ void e_web_view_frame_load_string (EWebView *web_view,
void e_web_view_frame_load_uri (EWebView *web_view,
const gchar *frame_name,
const gchar *uri);
-const gchar* e_web_view_frame_get_uri (EWebView *web_view,
+const gchar * e_web_view_frame_get_uri (EWebView *web_view,
const gchar *frame_name);
JSGlobalContextRef
e_web_view_get_global_context (EWebView *web_view);
@@ -183,7 +183,7 @@ void e_web_view_set_print_proxy (EWebView *web_view,
GtkAction * e_web_view_get_save_as_proxy (EWebView *web_view);
void e_web_view_set_save_as_proxy (EWebView *web_view,
GtkAction *save_as_proxy);
-GSList* e_web_view_get_highlights (EWebView *web_view);
+GSList * e_web_view_get_highlights (EWebView *web_view);
void e_web_view_add_highlight (EWebView *web_view,
const gchar *highlight);
void e_web_view_clear_highlights (EWebView *web_view);
@@ -215,11 +215,11 @@ void e_web_view_status_message (EWebView *web_view,
void e_web_view_stop_loading (EWebView *web_view);
void e_web_view_update_actions (EWebView *web_view);
-gchar* e_web_view_get_selection_html (EWebView *web_view);
+gchar * e_web_view_get_selection_html (EWebView *web_view);
void e_web_view_set_settings (EWebView *web_view,
WebKitWebSettings *settings);
-WebKitWebSettings*
+WebKitWebSettings *
e_web_view_get_default_settings ();
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
