Changeset 2170

Timestamp:

06/06/07 10:00:36 (6 years ago)

Author:

thomas

Message:

• src/today-main.c: (today_infoline_new), (child_setup),

(today_launcher_clicked_cb), (create_ui):
Use argv array to start applications. Open the dialer with --show-missed when
missed call info is clicked

Location:

trunk/src/target/OM-2007/applications/openmoko-today

Files:

• ChangeLog (modified) (1 diff)
• src/today-main.c (modified) (9 diffs)

trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog

@@ +1 @@
+2007-06-06  Thomas Wood  <thomas@openedhand.com>
+
+        * src/today-main.c: (today_infoline_new), (child_setup),
+        (today_launcher_clicked_cb), (create_ui):
+        Use argv array to start applications. Open the dialer with --show-missed when
+        missed call info is clicked
+
 2007-06-05  Thomas Wood  <thomas@openedhand.com>
 

trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c

@@ -46 +46 @@
 
 /*** functions ***/
-static void today_launcher_clicked_cb (GtkWidget *widget, gchar *command);
+static void today_launcher_clicked_cb (GtkWidget *widget, gchar **argv);
 
 
@@ -100 +100 @@
 today_infoline_clicked_cb (GtkWidget *widget, GdkEventButton *button, gchar *data)
 {
-  today_launcher_clicked_cb (widget, data);
+  gchar *argv[1];
+  argv[0] = data;
+  today_launcher_clicked_cb (widget, argv);
 }
 
@@ -114 +116 @@
 
 static GtkWidget *
-today_infoline_new (gchar * exec, gchar * message)
+today_infoline_new (gchar **argv, gchar * message)
 {
   GtkWidget *eventbox, *hbox, *icon, *label;
@@ -126 +128 @@
   gtk_widget_add_events (eventbox, GDK_BUTTON_PRESS_MASK);
 
-  g_signal_connect (G_OBJECT (eventbox), "button-press-event", (GCallback) today_infoline_clicked_cb, exec);
+  g_signal_connect (G_OBJECT (eventbox), "button-press-event", (GCallback) today_infoline_clicked_cb, argv);
 
   hbox = gtk_hbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (eventbox), hbox);
 
-  if (gtk_icon_theme_has_icon (icon_theme, exec))
-  {
-    pb = gtk_icon_theme_load_icon (icon_theme, exec, 32, GTK_ICON_LOOKUP_NO_SVG, NULL);
+  if (gtk_icon_theme_has_icon (icon_theme, argv[0]))
+  {
+    pb = gtk_icon_theme_load_icon (icon_theme, argv[0], 32, GTK_ICON_LOOKUP_NO_SVG, NULL);
   }
   else
@@ -170 +172 @@
 
 static void
-today_launcher_clicked_cb (GtkWidget *widget, gchar *command)
+today_launcher_clicked_cb (GtkWidget *widget, gchar **argv)
 {
   /* The following code is a modified version of code from launcher-util.c in
@@ -181 +183 @@
   int screen;
   GError *error = NULL;
-  gchar *argv[1];
 
   display = gdk_x11_display_get_xdisplay (gtk_widget_get_display (widget));
@@ -191 +192 @@
 
   /* sn_launcher_context_set_name (context, data->name); */
-  sn_launcher_context_set_binary_name (context, command);
-  sn_launcher_context_initiate (context, "openmoko-today", command, CurrentTime);
-
-  argv[0] = command;
+  sn_launcher_context_set_binary_name (context, argv[0]);
+  sn_launcher_context_initiate (context, "openmoko-today", argv[0], CurrentTime);
+
   if (!g_spawn_async (NULL, argv, NULL,
                             G_SPAWN_SEARCH_PATH, child_setup, context,
                             NULL, &error))
   {
-    g_warning ("Cannot launch %s: %s", command, error->message);
+    g_warning ("Cannot launch %s: %s", argv[0], error->message);
     g_error_free (error);
     sn_launcher_context_complete (context);
@@ -273 +273 @@
   GtkWidget *infoline;
   GtkWidget *button_box;
+
+  gchar *missed_calls_cmd[] = { "openmoko-dialer", "--show-missed" };
+  gchar *messages_inbox_cmd[] = { "openmoko-messages" };
 
   /* main window */
@@ -313 +316 @@
 
   /* unread messages */
-  infoline = today_infoline_new ("openmoko-messages", "Unread Messages");
+  infoline = today_infoline_new (messages_inbox_cmd, "Unread Messages");
   gtk_box_pack_start (GTK_BOX (vbox), infoline, FALSE, FALSE, 0);
 
   /* missed calls */
-  infoline = today_infoline_new ("openmoko-dialer", "Missed Calls");
+  infoline = today_infoline_new (missed_calls_cmd, "Missed Calls");
   gtk_box_pack_start (GTK_BOX (vbox), infoline, FALSE, FALSE, 0);