From d2bdd3cb62c1cba24619ae843cf087709a02643d Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue, 9 Feb 2010 16:57:14 +0000
Subject: [PATCH] Fix some compiler warnings

GCC complains that some variable might be used uninitialized.
---
 clutter/clutter-backend.c             | 6 ++++--
 clutter/clutter-bin-layout.c          | 1 +
 clutter/clutter-flow-layout.c         | 6 ++++++
 clutter/clutter-text.c                | 6 ++----
 clutter/cogl/cogl/cogl-matrix-stack.c | 6 +++++-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 7a2170fe7..1ba58891a 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -285,10 +285,12 @@ _clutter_backend_create_stage (ClutterBackend  *backend,
   stage_manager = clutter_stage_manager_get_default ();
 
   klass = CLUTTER_BACKEND_GET_CLASS (backend);
-  if (klass->create_stage)
+  if (klass->create_stage != NULL)
     stage_window = klass->create_stage (backend, wrapper, error);
+  else
+    stage_window = NULL;
 
-  if (!stage_window)
+  if (stage_window != NULL)
     return NULL;
 
   g_assert (CLUTTER_IS_STAGE_WINDOW (stage_window));
diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c
index 243004f53..94a5fd5fb 100644
--- a/clutter/clutter-bin-layout.c
+++ b/clutter/clutter-bin-layout.c
@@ -459,6 +459,7 @@ clutter_bin_layout_allocate (ClutterLayoutManager   *manager,
           continue;
         }
 
+      child_width = child_height = 0;
       request = clutter_actor_get_request_mode (child);
       if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
         {
diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index 4e649e6d7..08882569f 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -236,6 +236,8 @@ clutter_flow_layout_get_preferred_width (ClutterLayoutManager *manager,
   if (children)
     line_count = 1;
 
+  max_min_width = max_natural_width = 0;
+
   for (l = children; l != NULL; l = l->next)
     {
       ClutterActor *child = l->data;
@@ -385,6 +387,8 @@ clutter_flow_layout_get_preferred_height (ClutterLayoutManager *manager,
   if (children)
     line_count = 1;
 
+  max_min_height = max_natural_height = 0;
+
   for (l = children; l != NULL; l = l->next)
     {
       ClutterActor *child = l->data;
@@ -523,6 +527,8 @@ clutter_flow_layout_allocate (ClutterLayoutManager   *manager,
       if (!CLUTTER_ACTOR_IS_VISIBLE (child))
         continue;
 
+      new_x = new_y = 0;
+
       if (priv->orientation == CLUTTER_FLOW_HORIZONTAL)
         {
           if (line_item_count == items_per_line && line_item_count > 0)
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index 65aa44c70..0d4cc1752 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -1952,10 +1952,8 @@ clutter_text_real_move_right (ClutterText         *self,
 {
   ClutterTextPrivate *priv = self->priv;
   gint pos = priv->position;
-  gint new_pos;
-  gint len;
-
-  len = priv->n_chars;
+  gint len = priv->n_chars;
+  gint new_pos = 0;
 
   g_object_freeze_notify (G_OBJECT (self));
 
diff --git a/clutter/cogl/cogl/cogl-matrix-stack.c b/clutter/cogl/cogl/cogl-matrix-stack.c
index fd59433bf..859f886cf 100644
--- a/clutter/cogl/cogl/cogl-matrix-stack.c
+++ b/clutter/cogl/cogl/cogl-matrix-stack.c
@@ -408,19 +408,23 @@ _cogl_matrix_stack_flush_to_gl (CoglMatrixStack *stack,
 
   if (ctx->flushed_matrix_mode != mode)
     {
-      GLenum gl_mode;
+      GLenum gl_mode = 0;
+
       switch (mode)
         {
         case COGL_MATRIX_MODELVIEW:
           gl_mode = GL_MODELVIEW;
           break;
+
         case COGL_MATRIX_PROJECTION:
           gl_mode = GL_PROJECTION;
           break;
+
         case COGL_MATRIX_TEXTURE:
           gl_mode = GL_TEXTURE;
           break;
         }
+
       GE (glMatrixMode (gl_mode));
       ctx->flushed_matrix_mode = mode;
     }