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

[From: subversion at stage.maemo.org]

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

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>

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

	* src/hildon-date-editor.c: merged the two if() branches together


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2008-04-07 11:33:19 UTC (rev 15352)
+++ projects/haf/trunk/hildon-1/ChangeLog	2008-04-07 11:33:24 UTC (rev 15353)
@@ -3,6 +3,13 @@
 	Prepares: NB#78896: libhildon code inspection/coverity: uninitialised
 	local values in hildon_date_editor_size_allocate
 
+	* src/hildon-date-editor.c: merged the two if() branches together
+
+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
+
 	* src/hildon-date-editor.c: changed the arguments of the if()
 	conditions
 

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:19 UTC (rev 15352)
+++ projects/haf/trunk/hildon-1/src/hildon-date-editor.c	2008-04-07 11:33:24 UTC (rev 15353)
@@ -1,4 +1,5 @@
-/*
+/* vim:set sw=4 expandtab cino=(0:
+ *
  * This file is a part of hildon
  *
  * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
@@ -1298,16 +1299,15 @@
     f_alloc.x = img_alloc.x = allocation->x +
         MAX (allocation->width - max_req.width, 0) / 2;
 
-    /* allocate frame */
+    /* calculate allocations */
     if (GTK_WIDGET_VISIBLE (widget)) {
+        /* allocate frame */
         gtk_widget_get_child_requisition (priv->frame, &req);
 
         f_alloc.width = req.width;
         f_alloc.height = max_req.height;
-    }
 
-    /* allocate icon */
-    if (GTK_WIDGET_VISIBLE (widget)) {
+        /* allocate icon */
         gtk_widget_get_child_requisition (priv->d_button_image,
                 &req);