gnome-terminal r2616 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:38:57 2008
New Revision: 2616
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2616&view=rev

Log:
Make this code the same as in gtkcolorsel.


Modified:
   trunk/src/terminal-screen.c

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:38:57 2008
@@ -1939,18 +1939,19 @@
         GdkColor fg;
         TerminalProfile *profile;
 
-        if (selection_data->format != 16 ||
-            selection_data->length != 8)
+        /* We accept drops with the wrong format, since the KDE color
+         * chooser incorrectly drops application/x-color with format 8.
+         */
+        if (selection_data->length != 8)
           {
-            g_printerr (_("Color dropped on terminal had wrong format (%d) or length (%d)\n"),
-                        selection_data->format,
-                        selection_data->length);
+            g_warning ("Received invalid color data\n");
             return;
           }
 
         color.red = data[0];
         color.green = data[1];
         color.blue = data[2];
+        /* FIXMEchpe: use opacity from data[3] */
 
         profile = terminal_screen_get_profile (screen);