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

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-08-16 16:05:09 +0300 (Thu, 16 Aug 2007)
New Revision: 13263

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-helper.c
Log:
Remove the bogus warning about color not being found. Fixes NB#58352.


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-08-16 13:03:08 UTC (rev 13262)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-08-16 13:05:09 UTC (rev 13263)
@@ -1,5 +1,10 @@
 2007-08-16  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* src/hildon-helper.c: Remove the bogus warning about color not being
+	found. Fixes NB#58352.
+
+2007-08-16  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
 	* examples/Makefile.am:
 	* examples/hildon-toolbar-seekbar-example.c: Adding an example to test a
 	HildonSeekbar widget inside a toolbar.

Modified: projects/haf/trunk/hildon-1/src/hildon-helper.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-helper.c	2007-08-16 13:03:08 UTC (rev 13262)
+++ projects/haf/trunk/hildon-1/src/hildon-helper.c	2007-08-16 13:05:09 UTC (rev 13263)
@@ -95,7 +95,7 @@
         /* Changing logical color */
         GdkColor color;
         gtk_widget_ensure_style (widget);
-        if (gtk_style_lookup_color (widget->style, ld->logicalcolorstring, &color) == TRUE)
+        if (gtk_style_lookup_color (widget->style, ld->logicalcolorstring, &color) == TRUE) {
             switch (ld->rcflags)
             {
                 case GTK_RC_FG:
@@ -113,10 +113,10 @@
                 case GTK_RC_BASE:
                     gtk_widget_modify_base (widget, ld->state, &color);
                     break;
-
-            } else {
-                g_warning ("Failed to lookup '%s' color!", ld->logicalcolorstring);
             }
+        } else {
+            g_warning ("Failed to lookup '%s' color!", ld->logicalcolorstring);
+        }
     }
 
     if (ld->logicalfontstring != NULL)