* Fixes NB#103843, fixes a crash when updating the RC style of the mime part viewer

[modest] / src / widgets / modest-gtkhtml-mime-part-view.c

diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c
index 62e4e06..6ac99d5 100644 (file)
--- a/src/widgets/modest-gtkhtml-mime-part-view.c
+++ b/src/widgets/modest-gtkhtml-mime-part-view.c
@@ -43,6 +43,7 @@
 #include <widgets/modest-zoomable.h>
 #include <widgets/modest-tny-stream-gtkhtml.h>
 #include <libgnomevfs/gnome-vfs.h>
+#include <gdk/gdkkeysyms.h>
 
 /* gobject structure methods */
 static void    modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass);
@@ -59,6 +60,8 @@ static gboolean  on_link_clicked  (GtkWidget *widget, const gchar *uri, ModestGt
 static gboolean  on_url           (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMimePartView *self);
 static gboolean  on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream,
                                   ModestGtkhtmlMimePartView *self);
+static void      on_notify_style  (GObject *obj, GParamSpec *spec, gpointer userdata);
+static gboolean  update_style     (ModestGtkhtmlMimePartView *self);
 /* TnyMimePartView implementation */
 static void modest_gtkhtml_mime_part_view_clear (TnyMimePartView *self);
 static void modest_gtkhtml_mime_part_view_clear_default (TnyMimePartView *self);
@@ -120,6 +123,7 @@ struct _ModestGtkhtmlMimePartViewPrivate {
        gdouble current_zoom;
        gboolean view_images;
        gboolean has_external_images;
+       GSList *sighandlers;
 };
 
 #define MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -248,6 +252,8 @@ static void
 modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self)
 {
        ModestGtkhtmlMimePartViewPrivate *priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (self);
+       GdkColor base;
+       GdkColor text;
 
        gtk_html_set_editable        (GTK_HTML(self), FALSE);
        gtk_html_allow_selection     (GTK_HTML(self), TRUE);
@@ -255,12 +261,23 @@ modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self)
        gtk_html_set_blocking        (GTK_HTML(self), TRUE);
        gtk_html_set_images_blocking (GTK_HTML(self), TRUE);
 
-       g_signal_connect (G_OBJECT(self), "link_clicked",
-                         G_CALLBACK(on_link_clicked), self);
-       g_signal_connect (G_OBJECT(self), "url_requested",
-                         G_CALLBACK(on_url_requested), self);
-       g_signal_connect (G_OBJECT(self), "on_url",
-                         G_CALLBACK(on_url), self);
+       gdk_color_parse ("#fff", &base);
+       gdk_color_parse ("#000", &text);
+       gtk_widget_modify_base (GTK_WIDGET (self), GTK_STATE_NORMAL, &base);
+       gtk_widget_modify_text (GTK_WIDGET (self), GTK_STATE_NORMAL, &text);
+
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+                                                      G_OBJECT(self), "link_clicked",
+                                                      G_CALLBACK(on_link_clicked), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+                                                      G_OBJECT(self), "url_requested",
+                                                      G_CALLBACK(on_url_requested), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+                                                      G_OBJECT(self), "on_url",
+                                                      G_CALLBACK(on_url), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+                                                      G_OBJECT(self), "notify::style",
+                                                      G_CALLBACK (on_notify_style), (gpointer) self);
 
        priv->part = NULL;
        priv->current_zoom = 1.0;
@@ -271,6 +288,11 @@ modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self)
 static void
 modest_gtkhtml_mime_part_view_finalize (GObject *obj)
 {
+       ModestGtkhtmlMimePartViewPrivate *priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (obj);
+
+       modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
+       priv->sighandlers = NULL;
+
        G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
@@ -289,6 +311,55 @@ modest_gtkhtml_mime_part_view_dispose (GObject *obj)
 
 /* GTKHTML SIGNALS HANDLERS */
 
+static void 
+on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
+{
+       if (strcmp ("style", spec->name) == 0) {
+               g_idle_add_full (G_PRIORITY_DEFAULT, (GSourceFunc) update_style, 
+                                g_object_ref (obj), g_object_unref);
+               gtk_widget_queue_draw (GTK_WIDGET (obj));
+       }
+}
+
+gboolean
+same_color (GdkColor *a, GdkColor *b)
+{
+       return ((a->red == b->red) && 
+               (a->green == b->green) && 
+               (a->blue == b->blue));
+}
+
+static gboolean
+update_style (ModestGtkhtmlMimePartView *self)
+{
+       GdkColor base;
+       GdkColor text;
+       GtkRcStyle *rc_style;
+
+       gdk_threads_enter ();
+
+       if (GTK_WIDGET_VISIBLE (self)) {
+               rc_style = gtk_widget_get_modifier_style (GTK_WIDGET (self));
+
+               gdk_color_parse ("#fff", &base);
+               gdk_color_parse ("#000", &text);
+
+               if (!same_color (&(rc_style->base[GTK_STATE_NORMAL]), &base) &&
+                   !same_color (&(rc_style->text[GTK_STATE_NORMAL]), &text)) {
+
+                       rc_style->base[GTK_STATE_NORMAL] = base;
+                       rc_style->text[GTK_STATE_NORMAL] = text;
+                       gtk_widget_modify_style (GTK_WIDGET (self), rc_style);
+               }
+       }
+
+       gdk_threads_leave ();
+
+       return FALSE;
+}
+
+
+
 static gboolean
 on_link_clicked (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMimePartView *self)
 {