[maemo-commits] [maemo-commits] r9823 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-02-13 14:45:29 +0200 (Tue, 13 Feb 2007)
New Revision: 9823

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/statusbar-item-socket.c
Log:

	* libhildondesktop/statusbar-item-socket.c:
        * libhildondesktop/hildon-desktop-panel-expandable.c:
        - Use gdk_window_set_back_pixmap for getting the proper background.
        - Code cleanup.
	* ChangeLog updated.



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-13 12:44:14 UTC (rev 9822)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-13 12:45:29 UTC (rev 9823)
@@ -1,3 +1,10 @@
+2007-02-13  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildondesktop/statusbar-item-socket.c:
+	* libhildondesktop/hildon-desktop-panel-expandable.c:
+	- Use gdk_window_set_back_pixmap for getting the proper background.
+	- Code cleanup.
+
 2007-02-13  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-desktop.c, src/hd-notification-manager.[ch],

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-02-13 12:44:14 UTC (rev 9822)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-02-13 12:45:29 UTC (rev 9823)
@@ -799,13 +799,13 @@
 
   hildon_desktop_panel_expandable_add_button (HILDON_DESKTOP_PANEL (panel),
 		  			      GTK_WIDGET (sb_socket));
-  gtk_widget_show_all (GTK_WIDGET (sb_socket));
-
+  
   hildon_desktop_panel_expandable_arrange_items (panel);
 
   hildon_desktop_item_socket_add_id (HILDON_DESKTOP_ITEM_SOCKET (sb_socket), 
 		  		     wid);
 
+
   g_free (id);
   g_free (name);
 }

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/statusbar-item-socket.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/statusbar-item-socket.c	2007-02-13 12:44:14 UTC (rev 9822)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/statusbar-item-socket.c	2007-02-13 12:45:29 UTC (rev 9823)
@@ -94,19 +94,32 @@
 }
 
 static void 
+statusbar_item_socket_add_socket (StatusbarItemSocket *itemsocket, gpointer data)
+{ 
+  gtk_widget_show (GTK_WIDGET (itemsocket->socket));
+  
+  gdk_window_set_back_pixmap (GTK_WIDGET (itemsocket->socket)->window, NULL, TRUE);
+  gdk_window_clear (GTK_WIDGET (itemsocket->socket)->window);
+}
+
+static void 
 statusbar_item_socket_init (StatusbarItemSocket *itemsocket)
 {
+	
   itemsocket->socket = GTK_SOCKET (gtk_socket_new ());
- 
   gtk_container_add (GTK_CONTAINER (itemsocket), GTK_WIDGET (itemsocket->socket));
-  gtk_widget_show (GTK_WIDGET (itemsocket->socket));
-
+  
   g_signal_connect (G_OBJECT (itemsocket->socket), 
 		    "plug-added",
 		    G_CALLBACK (statusbar_item_socket_proxy_plug_added),
 		    (gpointer)itemsocket);
-  }
 
+  g_signal_connect_after (G_OBJECT (itemsocket),
+		          "map",
+		          G_CALLBACK (statusbar_item_socket_add_socket),
+		          NULL);
+}
+
 static void 
 statusbar_item_socket_class_init (StatusbarItemSocketClass *itemsocket_class)
 {