r3541 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . src

[chris at sita.openmoko.org]

Author: chris
Date: 2007-11-30 17:25:31 +0100 (Fri, 30 Nov 2007)
New Revision: 3541

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
Log:
        * src/today-main.c: (workarea_changed), (main):
        Migrate to x_monitor_workarea from x_get_workarea


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-11-30 16:11:16 UTC (rev 3540)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-11-30 16:25:31 UTC (rev 3541)
@@ -1,5 +1,10 @@
 2007-11-30  Chris Lord  <chris at openedhand.com>
 
+	* src/today-main.c: (workarea_changed), (main):
+        Migrate to x_monitor_workarea from x_get_workarea
+
+2007-11-30  Chris Lord  <chris at openedhand.com>
+
 	* src/today-launcher.c: (item_removed_cb):
         Grey out messages launcher-button if the .desktop gets removed
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c	2007-11-30 16:11:16 UTC (rev 3540)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c	2007-11-30 16:25:31 UTC (rev 3541)
@@ -349,6 +349,15 @@
 	}
 }
 
+static GtkWidget *window;
+
+static void
+workarea_changed (int x, int y, int w, int h)
+{
+	gtk_window_resize (GTK_WINDOW (window), w, h);
+	gtk_window_move (GTK_WINDOW (window), x, y);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -426,10 +435,8 @@
 	gtk_window_set_type_hint (GTK_WINDOW (data.window),
 		GDK_WINDOW_TYPE_HINT_DESKTOP);
 	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (data.window), TRUE);
-	if (x_get_workarea (&x, &y, &w, &h)) {
-		gtk_window_set_default_size (GTK_WINDOW (data.window), w, h);
-		gtk_window_move (GTK_WINDOW (data.window), x, y);
-	}
+	window = data.window;
+	x_monitor_workarea (gtk_widget_get_screen (window), workarea_changed);
 #else
 	gtk_window_set_default_size (GTK_WINDOW (data.window), 480, 600);
 #endif