2008-10-12 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / src / object-editor-fill-page.c

diff --git a/glabels2/src/object-editor-fill-page.c b/glabels2/src/object-editor-fill-page.c
index c40f8a170ee4be32803c4bae13da683743e6bf1d..8ff5b4a2f12732115822011b820b04906b6bd314 100644 (file)
--- a/glabels2/src/object-editor-fill-page.c
+++ b/glabels2/src/object-editor-fill-page.c
@@ -31,7 +31,7 @@
 #include <math.h>
 
 #include "prefs.h"
-#include "mygal/widget-color-combo.h"
+#include "color-combo.h"
 #include "color.h"
 #include "util.h"
 
@@ -64,8 +64,6 @@ static void fill_radio_toggled_cb                (glObjectEditor        *editor)
 void
 gl_object_editor_prepare_fill_page (glObjectEditor *editor)
 {
-       GdkColor *gdk_color;
-
        gl_debug (DEBUG_EDITOR, "START");
 
        /* Extract widgets from XML tree. */
@@ -87,9 +85,8 @@ gl_object_editor_prepare_fill_page (glObjectEditor *editor)
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->fill_color_radio), TRUE);
        gtk_widget_set_sensitive (editor->priv->fill_color_combo, TRUE);
        gtk_widget_set_sensitive (editor->priv->fill_key_combo, FALSE);
-       gdk_color = gl_color_to_gdk_color (gl_prefs->default_fill_color);
-       color_combo_set_color (COLOR_COMBO(editor->priv->fill_color_combo), gdk_color);
-       g_free (gdk_color);
+       gl_color_combo_set_color (GL_COLOR_COMBO(editor->priv->fill_color_combo),
+                                  gl_prefs->default_fill_color);
 
        /* Un-hide */
        gtk_widget_show_all (editor->priv->fill_page_vbox);
@@ -122,8 +119,6 @@ gl_object_editor_set_fill_color (glObjectEditor      *editor,
                                 gboolean             merge_flag,
                                 glColorNode         *color_node)
 {
-       GdkColor *gdk_color;
-
        gl_debug (DEBUG_EDITOR, "START");
 
         editor->priv->stop_signals = TRUE;
@@ -132,14 +127,12 @@ gl_object_editor_set_fill_color (glObjectEditor      *editor,
 
        if ( color_node->color == GL_COLOR_NONE ) {
 
-               color_combo_set_color_to_default (COLOR_COMBO(editor->priv->fill_color_combo));
+               gl_color_combo_set_to_default (GL_COLOR_COMBO(editor->priv->fill_color_combo));
 
        } else {
 
-               gdk_color = gl_color_to_gdk_color (color_node->color);
-               color_combo_set_color (COLOR_COMBO(editor->priv->fill_color_combo),
-                                          gdk_color);
-               g_free (gdk_color);
+               gl_color_combo_set_color (GL_COLOR_COMBO(editor->priv->fill_color_combo),
+                                          color_node->color);
 
        }
        
@@ -170,7 +163,7 @@ gl_object_editor_set_fill_color (glObjectEditor      *editor,
 glColorNode*
 gl_object_editor_get_fill_color (glObjectEditor      *editor)
 {
-        GdkColor    *gdk_color;
+        guint        color;
         gboolean     is_default;
        glColorNode *color_node;
  
@@ -182,15 +175,15 @@ gl_object_editor_get_fill_color (glObjectEditor      *editor)
                color_node->field_flag = TRUE;
                color_node->key = 
                        gtk_combo_box_get_active_text (GTK_COMBO_BOX (editor->priv->fill_key_combo));
-    } else {
+        } else {
                color_node->field_flag = FALSE;
                color_node->key = NULL;
-               gdk_color = color_combo_get_color (COLOR_COMBO(editor->priv->fill_color_combo),
-                                           &is_default);
+               color = gl_color_combo_get_color (GL_COLOR_COMBO(editor->priv->fill_color_combo),
+                                                  &is_default);
 
                if (!is_default) {
-               color_node->color = gl_color_from_gdk_color (gdk_color);
-        }
+                        color_node->color = color;
+                }
        }
 
        gl_debug (DEBUG_EDITOR, "END");