[Xfce4-commits] <postler:master> Fallback to a default link color

[Christian Dywan]

Updating branch refs/heads/master
         to a18f0c63b92e573a0620e049ac07e2b062e54c62 (commit)
       from aeb90c0efa0fd7b6ce309ee263059fb01fd9e573 (commit)

commit a18f0c63b92e573a0620e049ac07e2b062e54c62
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Jul 13 21:28:09 2011 +0200

    Fallback to a default link color
    
    GTK+ does the same internally. Why there is no built-in
    default is beyond me.

 postler/postler-cellrendererconvo.vala |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/postler/postler-cellrendererconvo.vala b/postler/postler-cellrendererconvo.vala
index 69315bc..af862c2 100644
--- a/postler/postler-cellrendererconvo.vala
+++ b/postler/postler-cellrendererconvo.vala
@@ -120,13 +120,16 @@ public class Postler.CellRendererConvo : Gtk.CellRenderer {
 #else
         style.lookup_color ("link_color", out link_color_);
 #endif
+        if (link_color_ == null)
+            Gdk.Color.parse ("#00e", out link_color_);
         Gdk.RGBA link_color = gdk_color_to_rgba (link_color_);
         return link_color;
     }
 
-    static Gdk.RGBA gdk_color_to_rgba (Gdk.Color color)
+    static Gdk.RGBA gdk_color_to_rgba (Gdk.Color? color)
     {
         Gdk.RGBA link_color = Gdk.RGBA ();
+        return_val_if_fail (color != null, link_color);
         link_color.red = ((double)color.red) / 0xFFFF;
         link_color.green = ((double)color.green) / 0xFFFF;
         link_color.blue = ((double)color.blue) / 0xFFFF;