[maemo-commits] [maemo-commits] r12135 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-06 18:18:30 +0300 (Wed, 06 Jun 2007)
New Revision: 12135

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-06-06  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c:
	- do not call the parent's style_set, which resets the background
	to white
	- fixed detection of unchanged style.
	Fixes: NB#53975



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-06 15:18:09 UTC (rev 12134)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-06 15:18:30 UTC (rev 12135)
@@ -1,5 +1,13 @@
 2007-06-06  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-window.c:
+	- do not call the parent's style_set, which resets the background
+	to white
+	- fixed detection of unchanged style.
+	Fixes: NB#53975
+
+2007-06-06  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-plugin-loader-legacy.c, src/hd-plugin-loader-factory.c:
 	- load the applet with G_MODULE_BIND_LOCAL to avoid conflict
 	of symbols. Patch courtesy of Santtu Lakkala.

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-06 15:18:09 UTC (rev 12134)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-06 15:18:30 UTC (rev 12135)
@@ -779,27 +779,32 @@
   window = HD_HOME_WINDOW (widget);
   priv = HD_HOME_WINDOW_GET_PRIVATE (window);
 
-  if (GTK_WIDGET_CLASS (hd_home_window_parent_class)->style_set)
-    GTK_WIDGET_CLASS (hd_home_window_parent_class)->style_set (widget,
-                                                               old_style);
   north_border = hd_home_window_get_pixmap_name (window,
                                                  HD_HOME_WINDOW_STYLE_NORTH_BORDER);
 
   west_border  = hd_home_window_get_pixmap_name (window,
                                                  HD_HOME_WINDOW_STYLE_WEST_BORDER);
 
+  g_debug ("style set with %s, %s", north_border, west_border);
 
+
   /* avoid resetting the background when the window is exposed for the
    * first time
    */
   if (!old_style ||
-      !(north_border && g_str_equal (priv->north_border, north_border)) ||
-      !(west_border && g_str_equal (priv->west_border, west_border)))
+      (north_border && !g_str_equal (priv->north_border, north_border)) ||
+      (west_border  && !g_str_equal (priv->west_border, west_border)))
     {
       if (north_border)
-        priv->north_border = g_strdup (north_border);
+        {
+          g_free (priv->north_border);
+          priv->north_border = g_strdup (north_border);
+        }
       if (west_border)
-        priv->west_border  = g_strdup (west_border);
+        {
+          g_free (priv->west_border);
+          priv->west_border  = g_strdup (west_border);
+        }
 
       if (priv->background)
         {
@@ -836,6 +841,7 @@
             }
         }
     }
+
 }
 
 static gboolean