2008-04-07 Sven Herzberg <sven@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

diff --git a/ChangeLog b/ChangeLog
index 641fcbe..fb2a022 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@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
 

diff --git a/src/hildon-date-editor.c b/src/hildon-date-editor.c
index 2c60010..577e658 100644 (file)
--- a/src/hildon-date-editor.c
+++ b/src/hildon-date-editor.c
@@ -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 @@ hildon_date_editor_size_allocate                (GtkWidget *widget,
     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);