[libchamplain] use the new version of memphis_rule_set_[gs]et_bg_color



commit 066c15a3c2f305962d191f623ec7f180c8512cd1
Author: Simon Wenner <simon wenner ch>
Date:   Fri Sep 11 20:01:42 2009 +0200

    use the new version of memphis_rule_set_[gs]et_bg_color

 champlain/champlain-memphis-map-source.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/champlain/champlain-memphis-map-source.c b/champlain/champlain-memphis-map-source.c
index c8cca3e..863dcca 100644
--- a/champlain/champlain-memphis-map-source.c
+++ b/champlain/champlain-memphis-map-source.c
@@ -693,16 +693,16 @@ ClutterColor * champlain_memphis_map_source_get_background_color (
 
   ChamplainMemphisMapSourcePrivate *priv = GET_PRIVATE (self);
   ClutterColor color;
-  gint16 r, b, g;
+  guint8 r, b, g, a;
 
   g_static_rw_lock_reader_lock (&MemphisLock);
-  memphis_rule_set_get_bg_color (priv->rules, &r, &g, &b);
+  memphis_rule_set_get_bg_color (priv->rules, &r, &g, &b, &a);
   g_static_rw_lock_reader_unlock (&MemphisLock);
 
-  color.red = (guint8) r;
-  color.green = (guint8) g;
-  color.blue = (guint8) b;
-  color.alpha = 255;
+  color.red = r;
+  color.green = g;
+  color.blue = b;
+  color.alpha = a;
   return clutter_color_copy (&color);
 }
 
@@ -725,8 +725,8 @@ champlain_memphis_map_source_set_background_color (
   ChamplainMemphisMapSourcePrivate *priv = GET_PRIVATE (self);
 
   g_static_rw_lock_writer_lock (&MemphisLock);
-  memphis_rule_set_set_bg_color (priv->rules, (gint16) color->red,
-      (gint16) color->green, (gint16) color->blue);
+  memphis_rule_set_set_bg_color (priv->rules, color->red,
+      color->green, color->blue, color->alpha);
   g_static_rw_lock_writer_unlock (&MemphisLock);
 
   if (!priv->persistent_cache)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]