From 0d34f2487d8b405dd0f2117092e091f49e94447a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 18 Aug 2010 03:16:40 +0000
Subject: [PATCH] Fix warnings.

git-svn-id: svn://localhost/ardour2/branches/3.0@7645 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h |  7 -----
 libs/gtkmm2ext/prolooks_helpers.c           | 33 ++++++++++-----------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h b/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h
index 3d868b1084..a484dd2eab 100644
--- a/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h
+++ b/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h
@@ -141,10 +141,6 @@ struct _ProlooksParamSpecHSV {
 };
 
 
-static gpointer cairo_color_parent_class = NULL;
-static gpointer prolooks_hsl_parent_class = NULL;
-static gpointer prolooks_hsv_parent_class = NULL;
-
 gpointer cairo_color_ref (gpointer instance);
 void cairo_color_unref (gpointer instance);
 GParamSpec* cairo_param_spec_color (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -191,7 +187,6 @@ void cairo_color_set_as_source_in (CairoColor* self, cairo_t* cr);
 void cairo_color_add_color_stop_to (CairoColor* self, cairo_pattern_t* p, double offset);
 CairoColor* prolooks_gdk_color_to_cairo (const GdkColor* color);
 void prolooks_color_from_string (const char* webcolor, GdkColor* result);
-static void cairo_color_finalize (CairoColor* obj);
 GType prolooks_button_state_get_type (void);
 GType prolooks_button_type_get_type (void);
 void prolooks_set_line_width_from_device (cairo_t* cr);
@@ -217,7 +212,6 @@ char* prolooks_hsl_to_string (ProlooksHSL* self);
 void prolooks_hsl_to_gdk_color (ProlooksHSL* self, GdkColor* result);
 void prolooks_hsl_from_gdk_color (ProlooksHSL* self, const GdkColor* color);
 void prolooks_hsl_set_hue (ProlooksHSL* self, double value);
-static void prolooks_hsl_finalize (ProlooksHSL* obj);
 gpointer prolooks_hsv_ref (gpointer instance);
 void prolooks_hsv_unref (gpointer instance);
 GParamSpec* prolooks_param_spec_hsv (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -246,7 +240,6 @@ void prolooks_hsv_set_hue (ProlooksHSV* self, double value);
 void prolooks_hsv_set_saturation (ProlooksHSV* self, double value);
 ProlooksHSV* prolooks_hsv_new (void);
 ProlooksHSV* prolooks_hsv_construct (GType object_type);
-static void prolooks_hsv_finalize (ProlooksHSV* obj);
 void prolooks_shade_color (const GdkColor* orig, double shade_ratio, GdkColor* result);
 GdkPixbuf* prolooks_cairo_image_surface_to_pixbuf (cairo_surface_t* surface);
 
diff --git a/libs/gtkmm2ext/prolooks_helpers.c b/libs/gtkmm2ext/prolooks_helpers.c
index a173039d7f..90f6d836c3 100644
--- a/libs/gtkmm2ext/prolooks_helpers.c
+++ b/libs/gtkmm2ext/prolooks_helpers.c
@@ -8,6 +8,10 @@
 
 #include "gtkmm2ext/prolooks-helpers.h"
 
+static gpointer cairo_color_parent_class = NULL;
+static gpointer prolooks_hsl_parent_class = NULL;
+static gpointer prolooks_hsv_parent_class = NULL;
+
 CairoColor* cairo_color_construct (GType object_type, double red, double green, double blue, double alpha) {
 	CairoColor* self;
 	self = (CairoColor*) g_type_create_instance (object_type);
@@ -262,6 +266,10 @@ void cairo_value_take_color (GValue* value, gpointer v_object) {
 	}
 }
 
+static void cairo_color_finalize (CairoColor* obj) {
+	CairoColor * self;
+	self = CAIRO_COLOR (obj);
+}
 
 static void cairo_color_class_init (CairoColorClass * klass) {
 	cairo_color_parent_class = g_type_class_peek_parent (klass);
@@ -276,11 +284,6 @@ static void cairo_color_instance_init (CairoColor * self) {
 }
 
 
-static void cairo_color_finalize (CairoColor* obj) {
-	CairoColor * self;
-	self = CAIRO_COLOR (obj);
-}
-
 
 GType cairo_color_get_type (void) {
 	static volatile gsize cairo_color_type_id__volatile = 0;
@@ -850,6 +853,10 @@ void prolooks_value_take_hsl (GValue* value, gpointer v_object) {
 	}
 }
 
+static void prolooks_hsl_finalize (ProlooksHSL* obj) {
+	ProlooksHSL * self;
+	self = PROLOOKS_HSL (obj);
+}
 
 static void prolooks_hsl_class_init (ProlooksHSLClass * klass) {
 	prolooks_hsl_parent_class = g_type_class_peek_parent (klass);
@@ -864,11 +871,6 @@ static void prolooks_hsl_instance_init (ProlooksHSL * self) {
 }
 
 
-static void prolooks_hsl_finalize (ProlooksHSL* obj) {
-	ProlooksHSL * self;
-	self = PROLOOKS_HSL (obj);
-}
-
 
 GType prolooks_hsl_get_type (void) {
 	static volatile gsize prolooks_hsl_type_id__volatile = 0;
@@ -1259,6 +1261,10 @@ void prolooks_value_take_hsv (GValue* value, gpointer v_object) {
 	}
 }
 
+static void prolooks_hsv_finalize (ProlooksHSV* obj) {
+	ProlooksHSV * self;
+	self = PROLOOKS_HSV (obj);
+}
 
 static void prolooks_hsv_class_init (ProlooksHSVClass * klass) {
 	prolooks_hsv_parent_class = g_type_class_peek_parent (klass);
@@ -1272,13 +1278,6 @@ static void prolooks_hsv_instance_init (ProlooksHSV * self) {
 	self->ref_count = 1;
 }
 
-
-static void prolooks_hsv_finalize (ProlooksHSV* obj) {
-	ProlooksHSV * self;
-	self = PROLOOKS_HSV (obj);
-}
-
-
 GType prolooks_hsv_get_type (void) {
 	static volatile gsize prolooks_hsv_type_id__volatile = 0;
 	if (g_once_init_enter (&prolooks_hsv_type_id__volatile)) {