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

[chris at sita.openmoko.org]

Author: chris
Date: 2007-10-09 16:10:25 +0200 (Tue, 09 Oct 2007)
New Revision: 3123

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.c
Log:
        * src/today-task-manager.c:
        Change button order (bug #818)

        * src/today-utils.c:
        Fix compiler warning


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-10-08 16:38:02 UTC (rev 3122)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-10-09 14:10:25 UTC (rev 3123)
@@ -1,3 +1,11 @@
+2007-10-09  Chris Lord  <chris at openedhand.com>
+
+	* src/today-task-manager.c: (today_task_manager_page_create):
+	Change button order (bug #818)
+
+	* src/today-utils.c: (today_get_launcher):
+	Fix compiler warning
+
 2007-10-04  Chris Lord  <chris at openedhand.com>
 
 	* src/today-task-manager.c: (today_task_manager_populate_tasks):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-10-08 16:38:02 UTC (rev 3122)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-10-09 14:10:25 UTC (rev 3123)
@@ -733,19 +733,19 @@
 	g_signal_connect (G_OBJECT (button), "clicked",
 		G_CALLBACK (today_task_manager_killall_clicked_cb), data);
 
-	/* Kill app button */
-	button = today_toolbutton_new (GTK_STOCK_DELETE);
-	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
+	/* Switch to app button */
+	button = today_toolbutton_new (GTK_STOCK_JUMP_TO);
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
 		gtk_separator_tool_item_new (), 0);
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
 	g_signal_connect (G_OBJECT (button), "clicked",
-		G_CALLBACK (today_task_manager_kill_clicked_cb), data);
+		G_CALLBACK (today_task_manager_raise_clicked_cb), data);
 
-	/* Switch to app button */
-	button = today_toolbutton_new (GTK_STOCK_JUMP_TO);
+	/* Kill app button */
+	button = today_toolbutton_new (GTK_STOCK_DELETE);
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
 	g_signal_connect (G_OBJECT (button), "clicked",
-		G_CALLBACK (today_task_manager_raise_clicked_cb), data);
+		G_CALLBACK (today_task_manager_kill_clicked_cb), data);
 
 	/* Viewport / tasks table */
 	viewport = gtk_viewport_new (NULL, NULL);

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.c	2007-10-08 16:38:02 UTC (rev 3122)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.c	2007-10-09 14:10:25 UTC (rev 3123)
@@ -41,8 +41,8 @@
 {
 	static LauncherData launcher_data;
 	
-	launcher_data.argv = argv;
-	launcher_data.name = argv[0];
+	launcher_data.argv = (char **)argv;
+	launcher_data.name = (char *)argv[0];
 	launcher_data.description = "";
 	launcher_data.icon = NULL;
 	launcher_data.categories = (char *[]){ "" };