[maemo-commits] [maemo-commits] r19113 - in projects/haf/trunk/hildon-control-panel: . src

[From: subversion at stage.maemo.org]

Author: paradi
Date: 2009-08-11 13:33:18 +0300 (Tue, 11 Aug 2009)
New Revision: 19113

Modified:
   projects/haf/trunk/hildon-control-panel/ChangeLog
   projects/haf/trunk/hildon-control-panel/src/hcp-app.c
Log:
raise applet's dialogs instead of the unmapped windows


Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-control-panel/ChangeLog	2009-08-11 09:28:39 UTC (rev 19112)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog	2009-08-11 10:33:18 UTC (rev 19113)
@@ -1,3 +1,9 @@
+2009-08-11 David Kedves <dkedves at blumsoft.eu>
+
+	* src/hcp-app.c:
+	 - Ignore unmapped windows when looking for applet window-id
+	   (the idea from Peter)
+
 2009-08-10 David Kedves <dkedves at blumsoft.eu>
 
 	* src/hcp-app-loader.c:

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-app.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-app.c	2009-08-11 09:28:39 UTC (rev 19112)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-app.c	2009-08-11 10:33:18 UTC (rev 19113)
@@ -417,7 +417,13 @@
     if (prop)
     {
       if (strcasecmp ((char*) prop, wm_class) == 0)
-        *result = g_slist_append (*result, GUINT_TO_POINTER (w));
+      {
+        XWindowAttributes attrs = { 0 };
+        XGetWindowAttributes(GDK_DISPLAY (), w, &attrs);
+        /* we should ignore unmapped applet windows ... */
+        if (attrs.map_state != IsUnmapped)
+          *result = g_slist_append (*result, GUINT_TO_POINTER (w));
+      }
       XFree (prop);
     }
   }