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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-18 18:39:14 +0300 (Mon, 18 Jun 2007)
New Revision: 12337

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

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

	* src/hd-home-window.c: Do not reload the background when the
	theme changes, as this is now done on the fly.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-18 15:32:23 UTC (rev 12336)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-18 15:39:14 UTC (rev 12337)
@@ -1,5 +1,10 @@
 2007-06-18  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-window.c: Do not reload the background when the
+	theme changes, as this is now done on the fly.
+
+2007-06-18  Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildonwm/hd-keys.c: Added a few safeguard when retrieving
 	the active application. Fixes: NB#60495
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-18 15:32:23 UTC (rev 12336)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-18 15:39:14 UTC (rev 12337)
@@ -867,101 +867,9 @@
                                                                     event);
 }
 
-static const gchar *
-hd_home_window_get_pixmap_name (HDHomeWindow *window,
-                                const gchar *key)
-{
-  GtkStyle *style;
-  GtkSettings *settings;
-
-  settings = gtk_widget_get_settings (GTK_WIDGET (window));
-
-  style = gtk_rc_get_style_by_paths (settings,
-                                     key,
-                                     NULL,
-                                     G_TYPE_NONE);
-
-  if (style && style->rc_style->bg_pixmap_name[0])
-    return style->rc_style->bg_pixmap_name[0];
-
-  return NULL;
-
-}
-
 static void
 hd_home_window_style_set (GtkWidget *widget, GtkStyle *old_style)
 {
-  HDHomeWindow         *window;
-  HDHomeWindowPrivate  *priv;
-  const gchar          *north_border;
-  const gchar          *west_border;
-
-  window = HD_HOME_WINDOW (widget);
-  priv = HD_HOME_WINDOW_GET_PRIVATE (window);
-
-  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)))
-    {
-      if (north_border)
-        {
-          g_free (priv->north_border);
-          priv->north_border = g_strdup (north_border);
-        }
-      if (west_border)
-        {
-          g_free (priv->west_border);
-          priv->west_border  = g_strdup (west_border);
-        }
-
-      if (priv->background)
-        {
-          GValue value = {0};
-          g_value_init (&value, G_TYPE_STRING);
-
-          if (priv->north_border)
-            {
-              g_value_set_string (&value, priv->north_border);
-              g_object_set_property (G_OBJECT (priv->background),
-                                     "north-border",
-                                     &value);
-            }
-
-          if (priv->west_border)
-            {
-              g_value_set_string (&value, priv->west_border);
-              g_object_set_property (G_OBJECT (priv->background),
-                                     "west-border",
-                                     &value);
-            }
-
-          if (GTK_WIDGET_MAPPED (widget))
-            {
-              GdkRectangle *workarea;
-              g_object_get (widget, "work-area", &workarea, NULL);
-
-              hd_home_background_apply_async (priv->background,
-                                              widget->window,
-                                              workarea,
-                                              (HDHomeBackgroundApplyCallback)
-                                              background_apply_callback,
-                                              widget);
-            }
-        }
-    }
-
 }
 
 static gboolean