r2919 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . libtaku src
chris at sita.openmoko.org
chris at sita.openmoko.org
Wed Sep 5 16:34:40 CEST 2007
Author: chris
Date: 2007-09-05 16:34:37 +0200 (Wed, 05 Sep 2007)
New Revision: 2919
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.h
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-pim-summary.c
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.h
Log:
Change the way launching apps work so as to not require changes to
upstream matchbox-desktop-2.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog 2007-09-05 13:52:06 UTC (rev 2918)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog 2007-09-05 14:34:37 UTC (rev 2919)
@@ -1,3 +1,21 @@
+2007-09-05 Chris Lord,,, <chris at openedhand.com>
+
+ * libtaku/launcher-util.c:
+ * libtaku/launcher-util.h:
+ * src/today-main.c: (today_dial_button_clicked_cb),
+ (today_contacts_button_clicked_cb),
+ (today_messages_button_clicked_cb),
+ (today_dates_button_clicked_cb):
+ * src/today-pim-journal.c: (today_pim_journal_header_clicked_cb),
+ (today_pim_journal_selection_changed_cb):
+ * src/today-pim-summary.c:
+ (today_pim_summary_events_selection_changed_cb),
+ (today_pim_summary_tasks_selection_changed_cb):
+ * src/today-utils.c: (today_get_launcher):
+ * src/today-utils.h:
+ Change the way launching apps work so as to not require changes to
+ upstream matchbox-desktop-2.
+
2007-09-05 Thomas Wood <thomas at openedhand.com>
* src/today-pim-summary.c: (today_pim_summary_visible_cb): Sync to
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.c 2007-09-05 13:52:06 UTC (rev 2918)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.c 2007-09-05 14:34:37 UTC (rev 2919)
@@ -36,7 +36,7 @@
#define DESKTOP "Desktop Entry"
-char **
+static char **
exec_to_argv (const char *exec)
{
const char *p;
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.h 2007-09-05 13:52:06 UTC (rev 2918)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.h 2007-09-05 14:34:37 UTC (rev 2919)
@@ -35,8 +35,6 @@
gboolean single_instance;
} LauncherData;
-char **exec_to_argv (const char *exec);
-
LauncherData *launcher_parse_desktop_file (const char *filename, GError **error);
void launcher_start (GtkWidget *widget, const LauncherData *data);
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-09-05 13:52:06 UTC (rev 2918)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c 2007-09-05 14:34:37 UTC (rev 2919)
@@ -35,29 +35,29 @@
static void
today_dial_button_clicked_cb (GtkToolButton *button, TodayData *data)
{
- launcher_start (data->window, today_get_launcher (
- "openmoko-dialer -s", TRUE, TRUE));
+ launcher_start (data->window, today_get_launcher ((const gchar *[])
+ {"openmoko-dialer", "-s", NULL }, TRUE, TRUE));
}
static void
today_contacts_button_clicked_cb (GtkToolButton *button, TodayData *data)
{
- launcher_start (data->window, today_get_launcher (
- "openmoko-contacts", TRUE, TRUE));
+ launcher_start (data->window, today_get_launcher ((const gchar *[])
+ { "openmoko-contacts", NULL }, TRUE, TRUE));
}
static void
today_messages_button_clicked_cb (GtkToolButton *button, TodayData *data)
{
- launcher_start (data->window, today_get_launcher (
- "openmoko-messages", TRUE, TRUE));
+ launcher_start (data->window, today_get_launcher ((const gchar *[])
+ { "openmoko-messages", NULL }, TRUE, TRUE));
}
static void
today_dates_button_clicked_cb (GtkToolButton *button, TodayData *data)
{
- launcher_start (data->window, today_get_launcher (
- "openmoko-dates", TRUE, TRUE));
+ launcher_start (data->window, today_get_launcher ((const gchar *[])
+ { "openmoko-dates", NULL }, TRUE, TRUE));
}
static GtkWidget *
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-09-05 13:52:06 UTC (rev 2918)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c 2007-09-05 14:34:37 UTC (rev 2919)
@@ -82,8 +82,8 @@
today_pim_journal_header_clicked_cb (GtkTreeViewColumn *column, TodayData *data)
{
/* TODO: Maybe just launch dialer normally here? */
- launcher_start (data->window, today_get_launcher (
- "openmoko-dialer -m", TRUE, TRUE));
+ launcher_start (data->window, today_get_launcher ((const gchar *[])
+ { "openmoko-dialer", "-m", NULL }, TRUE, TRUE));
}
static void
@@ -93,7 +93,8 @@
if (gtk_tree_selection_count_selected_rows (selection)) {
gtk_tree_selection_unselect_all (selection);
launcher_start (data->window, today_get_launcher (
- "openmoko-dialer -m", TRUE, TRUE));
+ (const gchar *[]){ "openmoko-dialer", "-m", NULL },
+ TRUE, TRUE));
}
}
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c 2007-09-05 13:52:06 UTC (rev 2918)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c 2007-09-05 14:34:37 UTC (rev 2919)
@@ -118,7 +118,8 @@
if (gtk_tree_selection_count_selected_rows (selection)) {
gtk_tree_selection_unselect_all (selection);
launcher_start (data->window, today_get_launcher (
- "openmoko-dates", TRUE, TRUE));
+ (const gchar *[]){ "openmoko-dates", NULL },
+ TRUE, TRUE));
}
}
@@ -129,7 +130,8 @@
if (gtk_tree_selection_count_selected_rows (selection)) {
gtk_tree_selection_unselect_all (selection);
launcher_start (data->window, today_get_launcher (
- "openmoko-tasks", TRUE, TRUE));
+ (const gchar *[]){ "openmoko-tasks", NULL },
+ TRUE, TRUE));
}
}
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-09-05 13:52:06 UTC (rev 2918)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.c 2007-09-05 14:34:37 UTC (rev 2919)
@@ -37,19 +37,12 @@
}
const LauncherData *
-today_get_launcher (const gchar *exec, gboolean use_sn, gboolean single)
+today_get_launcher (const gchar **argv, gboolean use_sn, gboolean single)
{
static LauncherData launcher_data;
- static gboolean first = TRUE;
- if (first) {
- launcher_data.argv = NULL;
- first = FALSE;
- }
-
- if (launcher_data.argv) g_free (launcher_data.argv);
- launcher_data.argv = exec_to_argv (exec);
- launcher_data.name = (gchar *)exec;
+ launcher_data.argv = argv;
+ launcher_data.name = argv[0];
launcher_data.description = "";
launcher_data.icon = NULL;
launcher_data.categories = (char *[]){ "" };
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.h 2007-09-05 13:52:06 UTC (rev 2918)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.h 2007-09-05 14:34:37 UTC (rev 2919)
@@ -28,7 +28,7 @@
#include <libtaku/launcher-util.h>
GtkToolItem *today_toolbutton_new (const gchar *icon_name);
-const LauncherData *today_get_launcher (const gchar *exec, gboolean use_sn,
+const LauncherData *today_get_launcher (const gchar **argv, gboolean use_sn,
gboolean single);
#endif /*__TODAY_UTILS_H__*/
More information about the commitlog
mailing list