Merged back with head

1 files changed, 13 insertions, 3 deletions

diff --git a/libmap/cc-timezone-map.c b/libmap/cc-timezone-map.c
index ec12c84..7b7d704 100644
--- a/libmap/cc-timezone-map.c
+++ b/libmap/cc-timezone-map.c
@@ -766,13 +766,23 @@ cc_timezone_map_draw (GtkWidget *widget,
   gchar *file;
   GError *err = NULL;
   gdouble pointx, pointy;
+  gdouble alpha = 1.0;
+  GtkStyle *style;
   char buf[16];
 
   gtk_widget_get_allocation (widget, &alloc);
 
+  style = gtk_widget_get_style (widget);
+
+  /* Check if insensitive */
+  if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
+    alpha = 0.5;
+
   /* paint background */
-  gdk_cairo_set_source_pixbuf (cr, priv->background, 0, 0);
+  gdk_cairo_set_source_color (cr, &style->bg[gtk_widget_get_state (widget)]);
   cairo_paint (cr);
+  gdk_cairo_set_source_pixbuf (cr, priv->background, 0, 0);
+  cairo_paint_with_alpha (cr, alpha);
 
   /* paint watermark */
   if (priv->watermark) {
@@ -813,7 +823,7 @@ cc_timezone_map_draw (GtkWidget *widget,
                                          alloc.height, GDK_INTERP_BILINEAR);
       gdk_cairo_set_source_pixbuf (cr, hilight, 0, 0);
 
-      cairo_paint (cr);
+      cairo_paint_with_alpha (cr, alpha);
       g_object_unref (hilight);
       g_object_unref (orig_hilight);
     }
@@ -836,7 +846,7 @@ cc_timezone_map_draw (GtkWidget *widget,
   if (pin)
     {
       gdk_cairo_set_source_pixbuf (cr, pin, pointx - 8, pointy - 14);
-      cairo_paint (cr);
+      cairo_paint_with_alpha (cr, alpha);
       g_object_unref (pin);
     }