[Emacs-diffs] /srv/bzr/emacs/trunk r110538: * gtkutil.c (xg_set_widget_bg): Divide by 65535.

[Jan D.]

------------------------------------------------------------
revno: 110538
fixes bug: http://debbugs.gnu.org/12612
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-13 23:52:09 +0200
message:
  * gtkutil.c (xg_set_widget_bg): Divide by 65535.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-13 13:11:40 +0000
+++ b/src/ChangeLog     2012-10-13 21:52:09 +0000
@@ -1,3 +1,7 @@
+2012-10-13  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612).
+
 2012-10-13  HANATAKA, Shinya  <address@hidden>  (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  <address@hidden>
 
        * xterm.c (x_term_init): Call fixup_locale before and after calling

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-09-23 19:36:31 +0000
+++ b/src/gtkutil.c     2012-10-13 21:52:09 +0000
@@ -1035,9 +1035,9 @@
   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);
     }