From c3dc03997cf4a2b82f45c90ad855785f8ac86853 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat, 6 Jun 2009 14:37:41 +0100
Subject: [PATCH] Fixes for some compiler warnings

---
 clutter/clutter-actor.c   | 2 ++
 clutter/clutter-texture.c | 1 +
 clutter/clutter-units.c   | 8 ++++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index fc33c4264..633ed4934 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -8316,6 +8316,8 @@ clutter_actor_allocate_available_size (ClutterActor           *self,
 
   priv = self->priv;
 
+  width = height = 0.0;
+
   switch (priv->request_mode)
     {
     case CLUTTER_REQUEST_HEIGHT_FOR_WIDTH:
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 3181ff81e..3a5d2d21e 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -1951,6 +1951,7 @@ clutter_texture_set_filter_quality (ClutterTexture        *texture,
     {
       gint min_filter, mag_filter;
 
+      min_filter = mag_filter = COGL_MATERIAL_FILTER_LINEAR;
       clutter_texture_quality_to_filters (filter_quality,
                                           &min_filter,
                                           &mag_filter);
diff --git a/clutter/clutter-units.c b/clutter/clutter-units.c
index 97b2d9a05..0132feded 100644
--- a/clutter/clutter-units.c
+++ b/clutter/clutter-units.c
@@ -487,8 +487,8 @@ clutter_unit_type_name (ClutterUnitType unit_type)
 gchar *
 clutter_units_to_string (const ClutterUnits *units)
 {
-  const gchar *unit_name;
-  gchar *fmt;
+  const gchar *unit_name = NULL;
+  gchar *fmt = NULL;
 
   g_return_val_if_fail (units != NULL, NULL);
 
@@ -513,6 +513,10 @@ clutter_units_to_string (const ClutterUnits *units)
       unit_name = "px";
       fmt = g_strdup_printf ("%d", (int) units->value);
       break;
+
+    default:
+      g_assert_not_reached ();
+      break;
     }
 
   return g_strconcat (fmt, " ", unit_name, NULL);