* gtkutil.c (xg_set_widget_bg): Divide by 65535.

Fixes: debbugs:12612

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 56131aca4b2..6bb34d9866a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612).
+
 2012-10-13  HANATAKA, Shinya  <bogytech@gmail.com>  (tiny change)
 
         * coding.c (detect_coding): Set coding->id before calling
@@ -1290,6 +1294,7 @@
         * sysdep.c (init_signals): Do not use SA_NODEFER.  It wasn't
         wanted even on POSIXish hosts, and it doesn't work on Windows.
 
+>>>>>>> MERGE-SOURCE
 2012-09-23  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xterm.c (x_term_init): Call fixup_locale before and after calling
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 1bf2b533b41..4367b534cb9 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1035,9 +1035,9 @@ xg_set_widget_bg (FRAME_PTR f, GtkWidget *w, long unsigned int pixel)
   xbg.pixel = pixel;
   if (XQueryColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), &xbg))
     {
-      bg.red = (double)xbg.red/65536.0;
-      bg.green = (double)xbg.green/65536.0;
-      bg.blue = (double)xbg.blue/65536.0;
+      bg.red = (double)xbg.red/65535.0;
+      bg.green = (double)xbg.green/65535.0;
+      bg.blue = (double)xbg.blue/65535.0;
       bg.alpha = 1.0;
       gtk_widget_override_background_color (w, GTK_STATE_FLAG_NORMAL, &bg);
     }