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

[chris at sita.openmoko.org]

Author: chris
Date: 2007-11-22 13:55:16 +0100 (Thu, 22 Nov 2007)
New Revision: 3476

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
Log:
        * src/today-launcher.c: (item_added_cb):
        * src/today-main.c: (today_messages_button_clicked_cb),
        (today_create_home_page):
        * src/today-pim-journal.c: (unread_messages_button_press_cb):
        * src/today.h:
        Enable openmoko-messages launcher


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-11-22 12:49:10 UTC (rev 3475)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-11-22 12:55:16 UTC (rev 3476)
@@ -1,3 +1,12 @@
+2007-11-22  Chris Lord  <chris at openedhand.com>
+
+	* src/today-launcher.c: (item_added_cb):
+	* src/today-main.c: (today_messages_button_clicked_cb),
+	(today_create_home_page):
+	* src/today-pim-journal.c: (unread_messages_button_press_cb):
+	* src/today.h:
+        Enable openmoko-messages launcher
+
 2007-11-02  Chris Lord  <chris at openedhand.com>
 
 	* src/today-launcher.c: (item_added_cb), (item_removed_cb),

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c	2007-11-22 12:49:10 UTC (rev 3475)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c	2007-11-22 12:55:16 UTC (rev 3476)
@@ -39,6 +39,10 @@
 		data->dates_item = item;
 	} else if (strcmp (name, "World Clock") == 0) {
 		data->clock_item = item;
+	} else if (strcmp (name, "Messages") == 0) {
+		gtk_widget_set_sensitive (GTK_WIDGET (
+			data->messages_button), TRUE);
+		data->messages_item = item;
 	}
 
 	if (GTK_IS_WIDGET (tile))

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-22 12:49:10 UTC (rev 3475)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c	2007-11-22 12:55:16 UTC (rev 3476)
@@ -52,6 +52,9 @@
 static void
 today_messages_button_clicked_cb (GtkToolButton *button, TodayData *data)
 {
+	if (data->messages_item) launcher_start (data->window,
+		data->messages_item,
+		(gchar *[]){ "openmoko-messages", NULL }, TRUE, TRUE);
 }
 
 static void
@@ -190,7 +193,7 @@
 		gtk_separator_tool_item_new (), 0);
 	g_signal_connect (G_OBJECT (data->dates_button), "clicked",
 		G_CALLBACK (today_dates_button_clicked_cb), data);
-	gtk_widget_set_sensitive (data->dates_button, FALSE);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->dates_button), FALSE);
 
 	data->messages_button = today_toolbutton_new ("openmoko-messages");
 	gtk_toolbar_insert (GTK_TOOLBAR (data->home_toolbar),
@@ -199,7 +202,7 @@
 		gtk_separator_tool_item_new (), 0);
 	g_signal_connect (G_OBJECT (data->messages_button), "clicked",
 		G_CALLBACK (today_messages_button_clicked_cb), data);
-	gtk_widget_set_sensitive (data->messages_button, FALSE);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->messages_button), FALSE);
 
 	data->contacts_button = today_toolbutton_new ("contacts");
 	gtk_toolbar_insert (GTK_TOOLBAR (data->home_toolbar),
@@ -208,7 +211,7 @@
 		gtk_separator_tool_item_new (), 0);
 	g_signal_connect (G_OBJECT (data->contacts_button), "clicked",
 		G_CALLBACK (today_contacts_button_clicked_cb), data);
-	gtk_widget_set_sensitive (data->contacts_button, FALSE);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->contacts_button), FALSE);
 
 	data->dial_button = today_toolbutton_new ("openmoko-dialer");
 	gtk_toolbar_insert (GTK_TOOLBAR (data->home_toolbar),
@@ -216,7 +219,7 @@
 	gtk_widget_show_all (data->home_toolbar);
 	g_signal_connect (G_OBJECT (data->dial_button), "clicked",
 		G_CALLBACK (today_dial_button_clicked_cb), data);
-	gtk_widget_set_sensitive (data->dial_button, FALSE);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->dial_button), FALSE);
 
 	/* Create event box with background */
 	data->bg_ebox = gtk_event_box_new ();

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c	2007-11-22 12:49:10 UTC (rev 3475)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c	2007-11-22 12:55:16 UTC (rev 3476)
@@ -157,7 +157,9 @@
 unread_messages_button_press_cb (GtkWidget *widget, GdkEventButton *event,
 				 TodayData *data)
 {
-	g_debug ("TODO: Launch messages app");
+	if (data->messages_item) launcher_start (data->window,
+		data->messages_item,
+		(gchar *[]){ "openmoko-messages", NULL }, TRUE, TRUE);
 
 	return FALSE;
 }

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h	2007-11-22 12:49:10 UTC (rev 3475)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h	2007-11-22 12:55:16 UTC (rev 3476)
@@ -55,6 +55,7 @@
 	TakuMenuItem *tasks_item;
 	TakuMenuItem *dates_item;
 	TakuMenuItem *clock_item;
+	TakuMenuItem *messages_item;
 	
 	/* App manager */
 	GdkWindow *root_window;