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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-05 09:53:27 +0300 (Wed, 05 Sep 2007)
New Revision: 13591

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-multiscreen.c
Log:

2007-09-05 Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-desktop-multiscreen.c:
	- properly pass the object as data to the size-changed handlers.
	Fixes: NB#66644



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-05 05:31:17 UTC (rev 13590)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-05 06:53:27 UTC (rev 13591)
@@ -1,3 +1,9 @@
+2007-09-05 Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-desktop-multiscreen.c:
+	- properly pass the object as data to the size-changed handlers.
+	Fixes: NB#66644
+
 2007-09-04  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* libhildondesktop/hildon-desktop-popup-menu.c

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-multiscreen.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-multiscreen.c	2007-09-05 05:31:17 UTC (rev 13590)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-multiscreen.c	2007-09-05 06:53:27 UTC (rev 13591)
@@ -83,8 +83,8 @@
 
     screen = gdk_display_get_screen (display, i);
 
-    g_signal_connect (screen, "size-changed",
-		      G_CALLBACK (hildon_desktop_ms_reinit), NULL);
+    g_signal_connect_swapped (screen, "size-changed",
+                              G_CALLBACK (hildon_desktop_ms_reinit), dms);
 
     dms->monitors   [i] = gdk_screen_get_n_monitors (screen);
     dms->geometries [i] = g_new0 (GdkRectangle, dms->monitors[i]);
@@ -95,8 +95,8 @@
 #else
   GdkScreen *screen = gdk_display_get_default_screen (display);
 
-  g_signal_connect (screen, "size-changed",
-		    G_CALLBACK (hildon_desktop_ms_reinit), NULL);
+  g_signal_connect_swapped (screen, "size-changed",
+                            G_CALLBACK (hildon_desktop_ms_reinit), dms);
 
   dms->monitors[0]   = 1;
   dms->geometries[0] = g_new0 (GdkRectangle,1);
@@ -173,7 +173,7 @@
     screen = gdk_display_get_screen (display, i);
     g_signal_handlers_disconnect_by_func (screen,
 				          hildon_desktop_ms_reinit,
-					  NULL);
+					  dms);
   }
 
   hildon_desktop_ms_init (dms);