Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2913 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: .
libtaku src ([EMAIL PROTECTED])
2. r2914 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: .
libtaku ([EMAIL PROTECTED])
3. r2915 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: .
libtaku ([EMAIL PROTECTED])
4. r2916 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
5. r2917 -
trunk/src/target/OM-2007.2/applications/openmoko-today2
([EMAIL PROTECTED])
6. r2918 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
7. r2919 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: .
libtaku src ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-09-05 13:43:46 +0200 (Wed, 05 Sep 2007)
New Revision: 2913
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
Log:
* libtaku/taku-launcher-tile.c: (taku_launcher_tile_class_init): Update with
changes in r1644 of upstream (matchbox-desktop-2: Rename TakuIcon icon size to
taku-icon, to match GTK+.)
* src/today-launcher.c: (today_launcher_page_create): Update for above changes
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-05 08:46:13 UTC (rev 2912)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-05 11:43:46 UTC (rev 2913)
@@ -1,3 +1,10 @@
+2007-09-05 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libtaku/taku-launcher-tile.c: (taku_launcher_tile_class_init): Update
with
+ changes in r1644 of upstream (matchbox-desktop-2: Rename TakuIcon icon
size to
+ taku-icon, to match GTK+.)
+ * src/today-launcher.c: (today_launcher_page_create): Update for above
changes
+
2007-09-02 Michael Lauer <[EMAIL PROTECTED]>
* src/today-pim-summary.c: (today_pim_summary_update_date):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
2007-09-05 08:46:13 UTC (rev 2912)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
2007-09-05 11:43:46 UTC (rev 2913)
@@ -165,10 +165,10 @@
object_class->finalize = taku_launcher_tile_finalize;
/* Lookup the icon size from the theme. */
- icon_size = gtk_icon_size_from_name ("TakuIcon");
+ icon_size = gtk_icon_size_from_name ("taku-icon");
/* If the icon name isn't registered, use button sized icons as a fallback.
*/
if (icon_size == GTK_ICON_SIZE_INVALID) {
- g_warning ("TakuIcon size not registered, falling back");
+ g_warning ("taku-icon size not registered, falling back");
icon_size = GTK_ICON_SIZE_BUTTON;
}
}
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-09-05 08:46:13 UTC (rev 2912)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
2007-09-05 11:43:46 UTC (rev 2913)
@@ -331,7 +331,7 @@
viewport = gtk_viewport_new (NULL, NULL);
gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport),
GTK_SHADOW_NONE);
- gtk_icon_size_register ("TakuIcon", 64, 64);
+ gtk_icon_size_register ("taku-icon", 64, 64);
data->launcher_table = taku_table_new ();
/* Create search category */
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-09-05 15:26:25 +0200 (Wed, 05 Sep 2007)
New Revision: 2914
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/taku-icon-tile.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-table.c
Log:
Synchronise with 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 11:43:46 UTC (rev 2913)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-05 13:26:25 UTC (rev 2914)
@@ -1,10 +1,21 @@
+2007-09-05 Chris Lord,,, <[EMAIL PROTECTED]>
+
+ * libtaku/launcher-util.c: (launcher_start):
+ * libtaku/taku-icon-tile.c: (make_bold), (taku_icon_tile_init),
+ (taku_icon_tile_set_icon_name), (taku_icon_tile_set_primary):
+ * libtaku/taku-table.c: (calculate_columns),
+ (taku_table_class_init):
+ Synchronise with upstream matchbox-desktop-2
+
2007-09-05 Thomas Wood <[EMAIL PROTECTED]>
- * libtaku/taku-launcher-tile.c: (taku_launcher_tile_class_init): Update
with
- changes in r1644 of upstream (matchbox-desktop-2: Rename TakuIcon icon
size to
- taku-icon, to match GTK+.)
- * src/today-launcher.c: (today_launcher_page_create): Update for above
changes
+ * libtaku/taku-launcher-tile.c: (taku_launcher_tile_class_init):
+ Update with changes in r1644 of upstream (matchbox-desktop-2:
+ Rename TakuIcon icon size to taku-icon, to match GTK+.)
+ * src/today-launcher.c: (today_launcher_page_create):
+ Update for above changes
+
2007-09-02 Michael Lauer <[EMAIL PROTECTED]>
* src/today-pim-summary.c: (today_pim_summary_update_date):
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 11:43:46 UTC (rev 2913)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.c
2007-09-05 13:26:25 UTC (rev 2914)
@@ -289,7 +289,7 @@
/* TODO: optionally link to GtkUnique and directly handle that? */
void
-launcher_start (GtkWidget *widget, const LauncherData *data)
+launcher_start (GtkWidget *widget, LauncherData *data)
{
GError *error = NULL;
#ifdef USE_LIBSN
@@ -344,17 +344,20 @@
if (!g_spawn_async (
#endif
NULL, data->argv, NULL,
- G_SPAWN_SEARCH_PATH, child_setup,
+ G_SPAWN_SEARCH_PATH,
+ child_setup,
#ifdef USE_LIBSN
- data->use_sn ? context : NULL,
+ data->use_sn ? context : NULL,
#else
NULL,
#endif
- NULL, &error)) {
+ NULL,
+ &error)) {
g_warning ("Cannot launch %s: %s", data->argv[0], error->message);
g_error_free (error);
#ifdef USE_LIBSN
- sn_launcher_context_complete (context);
+ if (context)
+ sn_launcher_context_complete (context);
#endif
}
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-icon-tile.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-icon-tile.c
2007-09-05 11:43:46 UTC (rev 2913)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-icon-tile.c
2007-09-05 13:26:25 UTC (rev 2914)
@@ -90,12 +90,33 @@
}
static void
-taku_icon_tile_init (TakuIconTile *self)
+make_bold (GtkLabel *label)
{
- GtkWidget *vbox, *hbox;
PangoAttribute *attr;
PangoAttrList *list;
+ list = pango_attr_list_new ();
+
+ attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
+ attr->start_index = 0;
+ attr->end_index = G_MAXUINT;
+ pango_attr_list_insert (list, attr);
+
+ attr = pango_attr_scale_new (1.2);
+ attr->start_index = 0;
+ attr->end_index = G_MAXUINT;
+ pango_attr_list_insert (list, attr);
+
+ gtk_label_set_attributes (label, list);
+
+ pango_attr_list_unref (list);
+}
+
+static void
+taku_icon_tile_init (TakuIconTile *self)
+{
+ GtkWidget *vbox, *hbox;
+
self->priv = GET_PRIVATE (self);
hbox = gtk_hbox_new (FALSE, 6);
@@ -110,22 +131,11 @@
self->priv->primary = gtk_label_new (NULL);
gtk_label_set_ellipsize (GTK_LABEL (self->priv->primary),
PANGO_ELLIPSIZE_END);
+ make_bold (GTK_LABEL (self->priv->primary));
gtk_widget_show (self->priv->primary);
gtk_misc_set_alignment (GTK_MISC (self->priv->primary), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), self->priv->primary, TRUE, TRUE, 0);
-
- list = pango_attr_list_new ();
- attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
- attr->start_index = 0;
- attr->end_index = G_MAXUINT;
- pango_attr_list_insert (list, attr);
- attr = pango_attr_scale_new (1.2);
- attr->start_index = 0;
- attr->end_index = G_MAXUINT;
- pango_attr_list_insert (list, attr);
- gtk_label_set_attributes (GTK_LABEL (self->priv->primary), list);
- pango_attr_list_unref (list);
-
+
self->priv->secondary = gtk_label_new (NULL);
gtk_label_set_ellipsize (GTK_LABEL (self->priv->secondary),
PANGO_ELLIPSIZE_END);
gtk_widget_show (self->priv->secondary);
@@ -157,7 +167,7 @@
g_return_if_fail (TAKU_IS_ICON_TILE (tile));
gtk_image_set_from_icon_name (GTK_IMAGE (tile->priv->icon),
- name, gtk_icon_size_from_name ("TakuIcon"));
+ name, gtk_icon_size_from_name ("taku-icon"));
}
void
@@ -166,6 +176,8 @@
g_return_if_fail (TAKU_IS_ICON_TILE (tile));
gtk_label_set_text (GTK_LABEL (tile->priv->primary), text);
+
+ atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (tile)), text);
}
const char *
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-table.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-table.c
2007-09-05 11:43:46 UTC (rev 2913)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-table.c
2007-09-05 13:26:25 UTC (rev 2914)
@@ -16,6 +16,7 @@
* Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gtk/gtk.h>
#include <string.h>
#include "eggsequence.h"
@@ -26,6 +27,8 @@
#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), TAKU_TYPE_TABLE, TakuTablePrivate))
+#define DEFAULT_WIDTH 30
+
struct _TakuTablePrivate
{
int columns;
@@ -311,6 +314,7 @@
PangoContext *context;
PangoFontMetrics *metrics;
int width, new_cols;
+ guint cell_text_width = DEFAULT_WIDTH;
/* If we are currently reflowing the tiles, or the final allocation hasn't
been decided yet, return */
@@ -321,8 +325,10 @@
context = gtk_widget_get_pango_context (widget);
metrics = pango_context_get_metrics (context, widget->style->font_desc,
NULL);
+ gtk_widget_style_get (widget, "cell-text-width", &cell_text_width, NULL);
+
width = PANGO_PIXELS
- (30 * pango_font_metrics_get_approximate_char_width (metrics));
+ (cell_text_width * pango_font_metrics_get_approximate_char_width
(metrics));
new_cols = MAX (1, widget->allocation.width / width);
if (table->priv->columns != new_cols) {
@@ -495,6 +501,13 @@
container_class->add = container_add;
container_class->remove = container_remove;
+
+ gtk_widget_class_install_style_property (widget_class, g_param_spec_uint
+ ("cell-text-width", "cell text
width",
+ "Width of the tiles in characters",
+ 0, G_MAXUINT, DEFAULT_WIDTH,
+ G_PARAM_READABLE));
+
}
static void
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-09-05 15:29:00 +0200 (Wed, 05 Sep 2007)
New Revision: 2915
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.c
Log:
Fix function to match prototype in header in launcher-util.c
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:26:25 UTC (rev 2914)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-05 13:29:00 UTC (rev 2915)
@@ -1,6 +1,11 @@
2007-09-05 Chris Lord,,, <[EMAIL PROTECTED]>
* libtaku/launcher-util.c: (launcher_start):
+ Fix function to match prototype in header
+
+2007-09-05 Chris Lord,,, <[EMAIL PROTECTED]>
+
+ * libtaku/launcher-util.c: (launcher_start):
* libtaku/taku-icon-tile.c: (make_bold), (taku_icon_tile_init),
(taku_icon_tile_set_icon_name), (taku_icon_tile_set_primary):
* libtaku/taku-table.c: (calculate_columns),
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:26:25 UTC (rev 2914)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.c
2007-09-05 13:29:00 UTC (rev 2915)
@@ -289,7 +289,7 @@
/* TODO: optionally link to GtkUnique and directly handle that? */
void
-launcher_start (GtkWidget *widget, LauncherData *data)
+launcher_start (GtkWidget *widget, const LauncherData *data)
{
GError *error = NULL;
#ifdef USE_LIBSN
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-09-05 15:43:10 +0200 (Wed, 05 Sep 2007)
New Revision: 2916
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
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-summary.c
Log:
Launch "openmoko-dates" instead of "dates"
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:29:00 UTC (rev 2915)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-05 13:43:10 UTC (rev 2916)
@@ -1,5 +1,13 @@
2007-09-05 Chris Lord,,, <[EMAIL PROTECTED]>
+ * src/today-main.c: (today_dates_button_clicked_cb),
+ (today_create_home_page):
+ * src/today-pim-summary.c:
+ (today_pim_summary_events_selection_changed_cb):
+ Launch "openmoko-dates" instead of "dates"
+
+2007-09-05 Chris Lord,,, <[EMAIL PROTECTED]>
+
* libtaku/launcher-util.c: (launcher_start):
Fix function to match prototype in header
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:29:00 UTC (rev 2915)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
2007-09-05 13:43:10 UTC (rev 2916)
@@ -57,7 +57,7 @@
today_dates_button_clicked_cb (GtkToolButton *button, TodayData *data)
{
launcher_start (data->window, today_get_launcher (
- "dates", TRUE, TRUE));
+ "openmoko-dates", TRUE, TRUE));
}
static GtkWidget *
@@ -72,7 +72,7 @@
data->home_toolbar = gtk_toolbar_new ();
gtk_box_pack_start (GTK_BOX (main_vbox), data->home_toolbar, FALSE,
TRUE, 0);
- data->dates_button = today_toolbutton_new ("dates");
+ data->dates_button = today_toolbutton_new ("openmoko-dates");
gtk_toolbar_insert (GTK_TOOLBAR (data->home_toolbar),
data->dates_button, 0);
gtk_toolbar_insert (GTK_TOOLBAR (data->home_toolbar),
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:29:00 UTC (rev 2915)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
2007-09-05 13:43:10 UTC (rev 2916)
@@ -118,7 +118,7 @@
if (gtk_tree_selection_count_selected_rows (selection)) {
gtk_tree_selection_unselect_all (selection);
launcher_start (data->window, today_get_launcher (
- "dates", TRUE, TRUE));
+ "openmoko-dates", TRUE, TRUE));
}
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-05 15:44:49 +0200 (Wed, 05 Sep 2007)
New Revision: 2917
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-today2/libkoto/
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/
Log:
* Switch to using the upstream version of libkoto via svn:externals
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-today2
___________________________________________________________________
Name: svn:externals
+ libkoto http://svn.o-hand.com/repos/tasks/trunk/libkoto
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-05 15:52:06 +0200 (Wed, 05 Sep 2007)
New Revision: 2918
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
Log:
* src/today-pim-summary.c: (today_pim_summary_visible_cb): Sync to
upstream libkoto
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:44:49 UTC (rev 2917)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-05 13:52:06 UTC (rev 2918)
@@ -1,3 +1,8 @@
+2007-09-05 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/today-pim-summary.c: (today_pim_summary_visible_cb): Sync to
+ upstream libkoto
+
2007-09-05 Chris Lord,,, <[EMAIL PROTECTED]>
* src/today-main.c: (today_dates_button_clicked_cb),
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:44:49 UTC (rev 2917)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
2007-09-05 13:52:06 UTC (rev 2918)
@@ -38,7 +38,7 @@
KotoTask *task;
gboolean done;
- gtk_tree_model_get (model, iter, COLUMN_ICAL, &task,
+ gtk_tree_model_get (model, iter, COLUMN_TASK, &task,
COLUMN_DONE, &done, -1);
if (!done) return TRUE;
--- End Message ---
--- Begin Message ---
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,,, <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* 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__*/
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
