From 699e36491b564069bce8c36a79d4803b5d9492d1 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 10 Aug 2010 18:08:55 -0400
Subject: Change em_format_redraw() to em_format_queue_redraw().

This changes the behavior of the function: instead of redrawing
immediately it schedules the redraw from an idle callback.  This
allows us to make multiple changes to EMFormat before redrawing.
---
 mail/e-mail-browser.c      | 2 +-
 mail/e-mail-display.c      | 4 ++--
 mail/e-mail-paned-view.c   | 2 +-
 mail/e-mail-reader-utils.c | 2 +-
 mail/e-mail-reader.c       | 4 ++--
 mail/em-format-html.c      | 4 ++--
 mail/em-utils.c            | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'mail')

diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 86cc929182..9d4fdf95ba 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -618,7 +618,7 @@ mail_browser_constructed (GObject *object)
 
 	g_signal_connect_swapped (
 		search_bar, "changed",
-		G_CALLBACK (em_format_redraw), priv->formatter);
+		G_CALLBACK (em_format_queue_redraw), priv->formatter);
 
 	/* Bind GObject properties to GConf keys. */
 
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index fda1f3a034..58f4824799 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -204,7 +204,7 @@ mail_display_style_set (GtkWidget *widget,
 	GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
 
 	mail_display_update_formatter_colors (E_MAIL_DISPLAY (widget));
-	em_format_redraw (EM_FORMAT (priv->formatter));
+	em_format_queue_redraw (EM_FORMAT (priv->formatter));
 }
 
 static void
@@ -264,7 +264,7 @@ mail_display_link_clicked (GtkHTML *html,
 		}
 
 		priv->formatter->header_wrap_flags = flags;
-		em_format_redraw (EM_FORMAT (priv->formatter));
+		em_format_queue_redraw (EM_FORMAT (priv->formatter));
 
 	} else if (*uri == '#')
 		gtk_html_jump_to_anchor (html, uri + 1);
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 106e761492..2195f8740f 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -592,7 +592,7 @@ mail_paned_view_constructed (GObject *object)
 
 	g_signal_connect_swapped (
 		search_bar, "changed",
-		G_CALLBACK (em_format_redraw), priv->formatter);
+		G_CALLBACK (em_format_queue_redraw), priv->formatter);
 
 	/* Load the view instance. */
 
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 7d8be346bc..bdef954709 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -720,7 +720,7 @@ headers_changed_cb (GConfClient *client,
 
 	/* force a redraw */
 	if (EM_FORMAT (formatter)->message)
-		em_format_redraw (EM_FORMAT (formatter));
+		em_format_queue_redraw (EM_FORMAT (formatter));
 }
 
 static void
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 3675b5209b..63cbba1cf5 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -377,7 +377,7 @@ action_mail_flag_clear_cb (GtkAction *action,
 
 	em_utils_flag_for_followup_clear (window, folder, uids);
 
-	em_format_redraw (EM_FORMAT (formatter));
+	em_format_queue_redraw (EM_FORMAT (formatter));
 }
 
 static void
@@ -396,7 +396,7 @@ action_mail_flag_completed_cb (GtkAction *action,
 
 	em_utils_flag_for_followup_completed (window, folder, uids);
 
-	em_format_redraw (EM_FORMAT (formatter));
+	em_format_queue_redraw (EM_FORMAT (formatter));
 }
 
 static void
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 5818ad2a35..d8f4869577 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -980,7 +980,7 @@ efh_init (EMFormatHTML *efh,
 
 	g_signal_connect_swapped (
 		efh, "notify::mark-citations",
-		G_CALLBACK (em_format_redraw), NULL);
+		G_CALLBACK (em_format_queue_redraw), NULL);
 
 	e_extensible_load_extensions (E_EXTENSIBLE (efh));
 }
@@ -1040,7 +1040,7 @@ em_format_html_load_images (EMFormatHTML *efh)
 	/* This will remain set while we're still
 	 * rendering the same message, then it wont be. */
 	efh->priv->load_images_now = TRUE;
-	em_format_redraw (EM_FORMAT (efh));
+	em_format_queue_redraw (EM_FORMAT (efh));
 }
 
 void
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 2bc0143eb3..fe7c248d0e 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -455,7 +455,7 @@ em_utils_flag_for_followup (EMailReader *reader,
 	camel_tag_list_free (&tags);
 
 	formatter = e_mail_reader_get_formatter (reader);
-	em_format_redraw (EM_FORMAT (formatter));
+	em_format_queue_redraw (EM_FORMAT (formatter));
 
 exit:
 	/* XXX We shouldn't be freeing this. */
-- 
cgit v1.2.3