carve out the (currently disabled) welcome page into it's own file to slightly reduce...

[obnox/wireshark/wip.git] / gtk / colors.c

diff --git a/gtk/colors.c b/gtk/colors.c
index 3d9ad7f1ce6dce117aae26e606d4b94233512483..872a16aae0ae1c3906814b7c0814a159e4db4151 100644 (file)
--- a/gtk/colors.c
+++ b/gtk/colors.c
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -29,6 +29,8 @@
 
 #include <string.h>
 
+#include "color.h"     /* to declare "color_t" */
+
 #include "colors.h"
 #include "simple_dialog.h"
 #include "gtkglobals.h"
@@ -37,6 +39,7 @@ static GdkColormap*   sys_cmap;
 static GdkColormap*    our_cmap = NULL;
 
 GdkColor       WHITE = { 0, 65535, 65535, 65535 };
+GdkColor       LTGREY = { 0, 57343, 57343, 57343 };
 GdkColor       BLACK = { 0, 0, 0, 0 };
 
 /* Initialize the colors */
@@ -85,3 +88,21 @@ get_color(GdkColor *new_color)
        }
        return (gdk_colormap_alloc_color(our_cmap, new_color, FALSE, TRUE));
 }
+
+void
+color_t_to_gdkcolor(GdkColor *target, color_t *source)
+{
+       target->pixel = source->pixel;
+       target->red   = source->red;
+       target->green = source->green;
+       target->blue  = source->blue;
+}
+
+void
+gdkcolor_to_color_t(color_t *target, GdkColor *source)
+{
+       target->pixel = source->pixel;
+       target->red   = source->red;
+       target->green = source->green;
+       target->blue  = source->blue;
+}