[maemo-commits] [maemo-commits] r9061 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildonwm test

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-01-11 15:09:20 +0200 (Thu, 11 Jan 2007)
New Revision: 9061

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.h
   projects/haf/branches/maemo-af-desktop/hildon-desktop/test/test7.c
Log:

	* libhildonwm/hd-wm.[ch]:
        - (hd_wm_update_client_list): New method for updating the client list.
        - (hd_wm_close_application): Close the children views as well.
        * test/test7.c: Test updated.
	* ChangeLog updated.



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-11 12:38:39 UTC (rev 9060)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-11 13:09:20 UTC (rev 9061)
@@ -1,3 +1,10 @@
+2007-01-11  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildonwm/hd-wm.[ch]:
+	- (hd_wm_update_client_list): New method for updating the client list.
+	- (hd_wm_close_application): Close the children views as well.
+	* test/test7.c: Test updated.
+
 2007-01-11  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* libhildondesktop/hildon-home-applet.[ch]: rename

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.c	2007-01-11 12:38:39 UTC (rev 9060)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.c	2007-01-11 13:09:20 UTC (rev 9061)
@@ -1641,6 +1641,7 @@
 hd_wm_close_application (HDWM *hdwm, HDEntryInfo *entry_info)
 {
   HDWMWatchedWindow *appwindow;
+  const GList *children = NULL, *l;
 	
   if (!entry_info)/* || entry_info->type != HD_ENTRY_WATCHED_WINDOW)*/
   {
@@ -1648,6 +1649,15 @@
     return;
   }
 
+  children = hd_entry_info_get_children (entry_info);
+
+  for (l = children ; l ; l = g_list_next (l))
+  {
+    appwindow = hd_entry_info_get_window ((HDEntryInfo*)l->data);
+
+    hd_wm_watched_window_close (appwindow);
+  }
+
   appwindow = hd_entry_info_get_window (entry_info);
 
   hd_wm_watched_window_close (appwindow);
@@ -1914,6 +1924,12 @@
   hdwm->priv->others_menu = widget;
 }
 
+void 
+hd_wm_update_client_list (HDWM *hdwm)
+{
+  hd_wm_process_x_client_list (hdwm);
+}
+
 gboolean
 hd_wm_add_watched_window (HDWMWatchedWindow *win)
 {

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.h
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.h	2007-01-11 12:38:39 UTC (rev 9060)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.h	2007-01-11 13:09:20 UTC (rev 9061)
@@ -252,6 +252,8 @@
 gboolean  
 hd_wm_remove_applications (HDWM *hdwm, HDEntryInfo *entry_info);
 
+void 
+hd_wm_update_client_list (HDWM *hdwm);
 
 /*
  * These are simple getters/setters that replace direct use of global

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/test/test7.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/test/test7.c	2007-01-11 12:38:39 UTC (rev 9060)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/test/test7.c	2007-01-11 13:09:20 UTC (rev 9061)
@@ -5,20 +5,15 @@
 {
   HDWM *hdwm = (HDWM *)data;
   GList *l = NULL;
-  GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_show (GTK_WIDGET (window));
+  static gint i=0;
 
-  l = hd_wm_get_applications (hdwm);
-
-  g_debug ("%s: Reached %p",__FILE__,l);
-  
   for (l = hd_wm_get_applications (hdwm); l ; l = g_list_next (l))
   {
-    g_debug ("%s: e: %p",__FILE__,l->data);
+    g_debug ("Iteration: %d",i++);
     hd_wm_close_application (hdwm,(HDEntryInfo *)l->data);
   }
-  
-  return TRUE;
+ 
+  return FALSE;
 }
 
 int 
@@ -27,10 +22,12 @@
   HDWM *hdwm;
   GList *l = NULL;
   gint i;
-
+  
   gtk_init (&argc,&argv);
 
   hdwm = hd_wm_get_singleton (); 
+  
+  hd_wm_update_client_list (hdwm);
 
   i = g_timeout_add (2000,(GSourceFunc)button_press,(gpointer)hdwm);