[Pkg-maemo-commits] r299 ./hildon-desktop/ubuntu:

[Tollef Fog Heen]

------------------------------------------------------------
revno: 299
committer: Tollef Fog Heen <tfheen at err.no>
branch nick: hildon-desktop
timestamp: Wed 2007-08-29 17:44:07 +0200
message:
  
  * reset local active window cache first before sending out window update
    signal to marquee-plugins
modified:
  debian/changelog
  libhildonwm/hd-wm-window.c
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-08-29 15:35:13 +0000
+++ b/debian/changelog	2007-08-29 15:44:07 +0000
@@ -10,6 +10,10 @@
   
   [ Carl Wong ]
   * Fix up dropdown menu.
+  
+  [ Horace Li ]
+  * reset local active window cache first before sending out window update
+    signal to marquee-plugins
 
  -- Tollef Fog Heen <tfheen at ubuntu.com>  Wed, 29 Aug 2007 16:20:53 +0200
 

=== modified file 'libhildonwm/hd-wm-window.c'
--- a/libhildonwm/hd-wm-window.c	2007-07-19 18:11:45 +0000
+++ b/libhildonwm/hd-wm-window.c	2007-08-29 15:44:07 +0000
@@ -510,18 +510,18 @@
   if (win->priv->pixb_icon)
     g_object_unref (win->priv->pixb_icon);
 
-  if(win->priv->app_parent && 
-     win == hd_wm_application_get_active_window (win->priv->app_parent))
-    {
-      hd_wm_application_set_active_window (win->priv->app_parent, NULL);
-    }
-
   if (hd_wm_get_active_window() == win)
     hd_wm_reset_active_window();
 
   if (hd_wm_get_last_active_window() == win)
     hd_wm_reset_last_active_window();
 
+  if(win->priv->app_parent && 
+     win == hd_wm_application_get_active_window (win->priv->app_parent))
+    {
+      hd_wm_application_set_active_window (win->priv->app_parent, NULL);
+    }
+
   if (win->priv->gdk_wrapper_win)
     g_object_unref (win->priv->gdk_wrapper_win);