[evolution/gnome-3-10] Miscellaneous cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-10] Miscellaneous cleanups.
- Date: Sun, 20 Oct 2013 16:09:07 +0000 (UTC)
commit cf14d109f73e2c4b9cd107976c9163a6c1c21b9d
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Oct 20 11:13:20 2013 -0400
Miscellaneous cleanups.
composer/e-msg-composer.c | 2 +-
e-util/e-web-view.c | 12 ++++++------
em-format/e-mail-formatter-error.c | 2 +-
em-format/e-mail-formatter-text-enriched.c | 2 +-
mail/e-mail-display.c | 14 ++++++++++----
mail/em-subscription-editor.c | 20 +++++++++++---------
shell/e-shell-taskbar.c | 12 ++++++++----
7 files changed, 38 insertions(+), 26 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index cb0fcf2..9b721b0 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2892,7 +2892,7 @@ handle_multipart_alternative (EMsgComposer *composer,
text_part = mime_part;
/* this is when prefer-plain filters out text/html part, then
- the text/plain should be used */
+ * the text/plain should be used */
if (camel_content_type_is (content_type, "text", "plain"))
fallback_text_part = mime_part;
} else {
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index b60dce3..2f614dc 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -629,7 +629,7 @@ web_view_load_status_changed_cb (WebKitWebView *webkit_web_view,
status = webkit_web_view_get_load_status (webkit_web_view);
if (status != WEBKIT_LOAD_FINISHED)
- return;
+ return;
style_updated_cb (web_view);
@@ -1806,11 +1806,11 @@ e_web_view_clear (EWebView *web_view)
webkit_web_view_load_html_string (
WEBKIT_WEB_VIEW (web_view),
- "<html> \
- <head></head> \
- <body class=\"-e-web-view-background-color -e-web-view-text-color\"></body> \
- </html>",
- NULL);
+ "<html>"
+ "<head></head>"
+ "<body class=\"-e-web-view-background-color -e-web-view-text-color\"></body>"
+ "</html>",
+ NULL);
}
void
diff --git a/em-format/e-mail-formatter-error.c b/em-format/e-mail-formatter-error.c
index f349283..a0a789f 100644
--- a/em-format/e-mail-formatter-error.c
+++ b/em-format/e-mail-formatter-error.c
@@ -60,7 +60,7 @@ emfe_error_format (EMailFormatterExtension *extension,
html = g_strdup_printf (
"<div class=\"part-container -e-mail-formatter-frame-color "
- "-e-mail-formatter-body-color -e-web-view-text-color\">"
+ "-e-mail-formatter-body-color -e-web-view-text-color\">"
"<div class=\"part-container-inner-margin pre\">\n"
"<table border=\"0\" cellspacing=\"10\" "
"cellpadding=\"0\" width=\"100%%\">\n"
diff --git a/em-format/e-mail-formatter-text-enriched.c b/em-format/e-mail-formatter-text-enriched.c
index 168522e..a94d226 100644
--- a/em-format/e-mail-formatter-text-enriched.c
+++ b/em-format/e-mail-formatter-text-enriched.c
@@ -76,7 +76,7 @@ emfe_text_enriched_format (EMailFormatterExtension *extension,
g_string_append (
buffer,
"<div class=\"part-container -e-mail-formatter-frame-color "
- "-e-web-view-background-color -e-web-view-text-color\">"
+ "-e-web-view-background-color -e-web-view-text-color\">"
"<div class=\"part-container-inner-margin\">\n");
camel_stream_write_string (stream, buffer->str, cancellable, NULL);
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index d4a0277..4e7ac57 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -825,8 +825,8 @@ toggle_address_visibility (WebKitDOMElement *button,
static void
add_color_css_rule_for_web_view (EWebView *view,
- const char *color_name,
- const char *color_value)
+ const gchar *color_name,
+ const gchar *color_value)
{
gchar *selector;
gchar *style;
@@ -854,10 +854,16 @@ static void
initialize_web_view_colors (EMailDisplay *display)
{
EMailFormatter *formatter;
- const gchar *color_names [] = { "body-color", "citation-color",
- "frame-color", "header-color", NULL };
gint ii;
+ const gchar *color_names[] = {
+ "body-color",
+ "citation-color",
+ "frame-color",
+ "header-color",
+ NULL
+ };
+
formatter = e_mail_display_get_formatter (display);
for (ii = 0; color_names[ii]; ii++) {
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 88240e9..e210652 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -1430,17 +1430,18 @@ subscription_editor_add_store (EMSubscriptionEditor *editor,
static void
emse_notebook_sensitive_changed_cb (GtkWidget *notebook,
- GParamSpec *param,
- GtkDialog *editor)
+ GParamSpec *param,
+ GtkDialog *editor)
{
- gtk_dialog_set_response_sensitive (editor,
- GTK_RESPONSE_CLOSE, gtk_widget_get_sensitive (notebook));
+ gtk_dialog_set_response_sensitive (
+ editor, GTK_RESPONSE_CLOSE,
+ gtk_widget_get_sensitive (notebook));
}
static gboolean
subscription_editor_delete_event_cb (EMSubscriptionEditor *editor,
- GdkEvent *event,
- gpointer user_data)
+ GdkEvent *event,
+ gpointer user_data)
{
/* stop processing if the button is insensitive */
return !gtk_widget_get_sensitive (editor->priv->notebook);
@@ -1448,8 +1449,8 @@ subscription_editor_delete_event_cb (EMSubscriptionEditor *editor,
static void
subscription_editor_response_cb (EMSubscriptionEditor *editor,
- gint response_id,
- gpointer user_data)
+ gint response_id,
+ gpointer user_data)
{
if (!gtk_widget_get_sensitive (editor->priv->notebook))
g_signal_stop_emission_by_name (editor, "response");
@@ -1801,7 +1802,8 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE);
- g_signal_connect (widget, "notify::sensitive",
+ g_signal_connect (
+ widget, "notify::sensitive",
G_CALLBACK (emse_notebook_sensitive_changed_cb), editor);
widget = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 53db054..d8f3bfc 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -90,7 +90,7 @@ shell_taskbar_free_idle_data (gpointer data)
static void
shell_taskbar_remove_proxy_container (EShellTaskbar *shell_taskbar,
- GtkWidget *proxy)
+ GtkWidget *proxy)
{
GList *children;
GtkContainer *container;
@@ -141,7 +141,9 @@ shell_taskbar_weak_notify_cb (EShellTaskbar *shell_taskbar,
idle_data->shell_taskbar = g_object_ref (shell_taskbar);
idle_data->proxy = proxy;
- g_idle_add_full (G_PRIORITY_DEFAULT, shell_taskbar_remove_proxy_container_idle_cb,
+ g_idle_add_full (
+ G_PRIORITY_DEFAULT,
+ shell_taskbar_remove_proxy_container_idle_cb,
idle_data, shell_taskbar_free_idle_data);
}
}
@@ -200,7 +202,7 @@ shell_taskbar_add_activity_idle_cb (gpointer user_data)
static void
shell_taskbar_activity_added_cb (EShellTaskbar *shell_taskbar,
- EActivity *activity)
+ EActivity *activity)
{
if (shell_taskbar->priv->main_thread == g_thread_self ()) {
shell_taskbar_activity_add (shell_taskbar, activity);
@@ -211,7 +213,9 @@ shell_taskbar_activity_added_cb (EShellTaskbar *shell_taskbar,
idle_data->shell_taskbar = g_object_ref (shell_taskbar);
idle_data->activity = g_object_ref (activity);
- g_idle_add_full (G_PRIORITY_DEFAULT, shell_taskbar_add_activity_idle_cb,
+ g_idle_add_full (
+ G_PRIORITY_DEFAULT,
+ shell_taskbar_add_activity_idle_cb,
idle_data, shell_taskbar_free_idle_data);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
