[maemo-commits] [maemo-commits] r15354 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-04-07 14:33:29 +0300 (Mon, 07 Apr 2008)
New Revision: 15354

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-date-editor.c
Log:
2008-04-07  Sven Herzberg  <sven at imendio.com>

	Fixes: NB#78896: libhildon code inspection/coverity: uninitialised
	local values in hildon_date_editor_size_allocate

	* src/hildon-date-editor.c: moved the real allocation code into the
	if() branch


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2008-04-07 11:33:24 UTC (rev 15353)
+++ projects/haf/trunk/hildon-1/ChangeLog	2008-04-07 11:33:29 UTC (rev 15354)
@@ -1,5 +1,13 @@
 2008-04-07  Sven Herzberg  <sven at imendio.com>
 
+	Fixes: NB#78896: libhildon code inspection/coverity: uninitialised
+	local values in hildon_date_editor_size_allocate
+
+	* src/hildon-date-editor.c: moved the real allocation code into the
+	if() branch
+
+2008-04-07  Sven Herzberg  <sven at imendio.com>
+
 	Prepares: NB#78896: libhildon code inspection/coverity: uninitialised
 	local values in hildon_date_editor_size_allocate
 

Modified: projects/haf/trunk/hildon-1/src/hildon-date-editor.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-date-editor.c	2008-04-07 11:33:24 UTC (rev 15353)
+++ projects/haf/trunk/hildon-1/src/hildon-date-editor.c	2008-04-07 11:33:29 UTC (rev 15354)
@@ -1320,14 +1320,14 @@
             img_alloc.x = f_alloc.x;
             f_alloc.x  += img_alloc.width + HILDON_MARGIN_DEFAULT;
         }
-    }
 
-    if (GTK_WIDGET_VISIBLE (priv->d_button_image)) {
-        gtk_widget_size_allocate (priv->d_button_image, &img_alloc);
-    }
+        if (GTK_WIDGET_VISIBLE (priv->d_button_image)) {
+            gtk_widget_size_allocate (priv->d_button_image, &img_alloc);
+        }
 
-    if (GTK_WIDGET_VISIBLE (priv->frame)) {
-        gtk_widget_size_allocate (priv->frame, &f_alloc);
+        if (GTK_WIDGET_VISIBLE (priv->frame)) {
+            gtk_widget_size_allocate (priv->frame, &f_alloc);
+        }
     }
 
     /* FIXME: We really should not alloc delimeters by hand (since they