[maemo-commits] [maemo-commits] r13847 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-09-17 15:22:26 +0300 (Mon, 17 Sep 2007)
New Revision: 13847

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
Log:
2007-09-17  Moises Martinez  <moises.martinez at nokia.com>

        * libhildondesktop/hildon-desktop-panel-expandable.c:
        (hildon_desktop_x_event_filter),
        (hildon_desktop_panel_embed_applet):
        - Increment number of systray applets. Fixes: NB#60764
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-17 11:45:21 UTC (rev 13846)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-17 12:22:26 UTC (rev 13847)
@@ -1,3 +1,10 @@
+2007-09-17  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildondesktop/hildon-desktop-panel-expandable.c:
+	(hildon_desktop_x_event_filter),
+	(hildon_desktop_panel_embed_applet):
+	- Increment number of systray applets. Fixes: NB#60764
+
 2007-09-17  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hn-app-button.c (hn_app_button_create_menu): set toplevel window

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-09-17 11:45:21 UTC (rev 13846)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-09-17 12:22:26 UTC (rev 13847)
@@ -1063,14 +1063,14 @@
     HILDON_DESKTOP_PANEL_EXPANDABLE (_panel);
 
   XEvent *e = (XEvent*)xevent;
-
+  
   if (e->type == ClientMessage)
   {
     if (e->xclient.message_type == panel->priv->tray_opcode &&
         e->xclient.data.l[1] == SYSTEM_TRAY_REQUEST_DOCK)
     {
       gchar *id = g_strdup_printf ("XEmbed:%d",(GdkNativeWindow)e->xclient.data.l[2]);
-	    
+      
       if (g_hash_table_lookup (panel->priv->items, id) != NULL)
       {
 	g_free (id);
@@ -1078,7 +1078,7 @@
       }
 
       g_free (id);
-
+	
       if (panel->priv->n_systray_applets <= (panel->priv->items_p_row - 1))
         hildon_desktop_panel_embed_applet (panel,(Window)e->xclient.data.l[2]);
       
@@ -1086,7 +1086,7 @@
     }
   }
 
-  return TRUE;
+  return GDK_FILTER_CONTINUE;
 }
 
 static gboolean 
@@ -1147,7 +1147,8 @@
   hildon_desktop_item_socket_add_id (HILDON_DESKTOP_ITEM_SOCKET (sb_socket), 
 		  		     wid);
 
-
+  panel->priv->n_systray_applets++;
+  
   g_free (id);
   g_free (name);
 }