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. r4319 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
2. r4320 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
3. r4321 - developers/werner/bin ([EMAIL PROTECTED])
4. r4322 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/common src/dialer ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2008-04-07 18:00:49 +0200 (Mon, 07 Apr 2008)
New Revision: 4319
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/test-notes.c
Log:
2008-04-07 Thomas Wood <[EMAIL PROTECTED]>
* src/test-notes.c: (main): Add support for recipient and "Sent" flag
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-07 09:55:13 UTC (rev 4318)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-07 16:00:49 UTC (rev 4319)
@@ -1,3 +1,7 @@
+2008-04-07 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/test-notes.c: (main): Add support for recipient and "Sent" flag
+
2008-04-03 Thomas Wood <[EMAIL PROTECTED]>
* src/moko-save-number.c: (create_new_contact_from_number),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/test-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/test-notes.c
2008-04-07 09:55:13 UTC (rev 4318)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/test-notes.c
2008-04-07 16:00:49 UTC (rev 4319)
@@ -35,13 +35,19 @@
if (argc >= 3)
body = argv[2];
-
+
store = jana_ecal_store_new (JANA_COMPONENT_NOTE);
jana_store_open (store);
note = jana_ecal_note_new ();
jana_note_set_author (note, number);
jana_note_set_body (note, body);
+
+ if (argc >= 4)
+ {
+ jana_utils_component_insert_category (JANA_COMPONENT (note), "Sent", -1);
+ jana_note_set_recipient (JANA_NOTE (note), argv[3]);
+ }
jana_store_add_component (store, JANA_COMPONENT (note));
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-07 18:01:59 +0200 (Mon, 07 Apr 2008)
New Revision: 4320
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
2008-04-07 Thomas Wood <[EMAIL PROTECTED]>
* src/moko-save-number.c: (moko_save_number): Check number is not blank,
and warn user if it is.
* src/sms-notes.c: (save_contact_clicked_cb): Add recipient number if
SMS was "Sent".
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-07 16:00:49 UTC (rev 4319)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-07 16:01:59 UTC (rev 4320)
@@ -1,7 +1,15 @@
2008-04-07 Thomas Wood <[EMAIL PROTECTED]>
- * src/test-notes.c: (main): Add support for recipient and "Sent" flag
+ * src/moko-save-number.c: (moko_save_number): Check number is not blank,
+ and warn user if it is.
+ * src/sms-notes.c: (save_contact_clicked_cb): Add recipient number if
+ SMS was "Sent".
+
+2008-04-07 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/test-notes.c: (main): Add
+
2008-04-03 Thomas Wood <[EMAIL PROTECTED]>
* src/moko-save-number.c: (create_new_contact_from_number),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
2008-04-07 16:00:49 UTC (rev 4319)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
2008-04-07 16:01:59 UTC (rev 4320)
@@ -217,6 +217,18 @@
GtkWidget *window, *btn, *vbox;
SaveButtonInfo *btn_info;
+g_debug ("Sae number %s", number);
+
+ if (!number || !strcmp (number, ""))
+ {
+ GtkWidget *dlg;
+ dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ "No number available");
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+ return;
+ }
+
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_title (GTK_WINDOW (window), number);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-04-07 16:00:49 UTC (rev 4319)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-04-07 16:01:59 UTC (rev 4320)
@@ -617,7 +617,9 @@
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
- gchar *author;
+ gchar *author, *recipient, **categories;
+ gboolean sent;
+ gint i;
selection = gtk_tree_view_get_selection (
GTK_TREE_VIEW (data->notes_treeview));
@@ -626,11 +628,30 @@
return;
gtk_tree_model_get (model, &iter,
- JANA_GTK_NOTE_STORE_COL_AUTHOR, &author, -1);
+ JANA_GTK_NOTE_STORE_COL_AUTHOR, &author,
+ JANA_GTK_NOTE_STORE_COL_RECIPIENT, &recipient,
+ JANA_GTK_NOTE_STORE_COL_CATEGORIES, &categories, -1);
+
+ /* find out if the SMS was sent or received, so we can save the
+ * appropriate number */
+ sent = FALSE;
+ for (i = 0; categories[i]; i++)
+ {
+ if (!strcmp (categories[i], "Sent"))
+ {
+ sent = TRUE;
+ break;
+ }
+ }
+
+ if (sent)
+ moko_save_number (recipient);
+ else
+ moko_save_number (author);
- moko_save_number (author);
-
g_free (author);
+ g_free (recipient);
+ g_strfreev (categories);
}
static void
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-04-08 02:27:52 +0200 (Tue, 08 Apr 2008)
New Revision: 4321
Added:
developers/werner/bin/hxd
Log:
hxd: ssh wrapper for HXD8
Added: developers/werner/bin/hxd
===================================================================
--- developers/werner/bin/hxd 2008-04-07 16:01:59 UTC (rev 4320)
+++ developers/werner/bin/hxd 2008-04-08 00:27:52 UTC (rev 4321)
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo 1 >/proc/sys/net/ipv4/ip_forward
+ifconfig usb0 192.168.0.2 up && ssh 192.168.0.1 "$@"
Property changes on: developers/werner/bin/hxd
___________________________________________________________________
Name: svn:executable
+ *
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-08 10:57:41 +0200 (Tue, 08 Apr 2008)
New Revision: 4322
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
Log:
2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
* src/common/Makefile.am: Add missing header file
* src/dialer/dialer-main.c: (program_log), (main): Create the history
widget after everything else has loaded, unless it is explicitly
requested at runtime
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-08 00:27:52 UTC (rev 4321)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-08 08:57:41 UTC (rev 4322)
@@ -1,3 +1,10 @@
+2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/common/Makefile.am: Add missing header file
+ * src/dialer/dialer-main.c: (program_log), (main): Create the history
+ widget after everything else has loaded, unless it is explicitly
+ requested at runtime
+
2008-04-07 Erin Yueh <[EMAIL PROTECTED]>
* src/phone-kit/moko-dialer.c: (moko_dialer_dial)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/Makefile.am
2008-04-08 00:27:52 UTC (rev 4321)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/Makefile.am
2008-04-08 08:57:41 UTC (rev 4322)
@@ -9,4 +9,5 @@
moko-contacts.c moko-contacts.h \
moko-dialer-panel.c moko-dialer-panel.h \
moko-dialer-textview.c moko-dialer-textview.h \
- moko-digit-button.c moko-digit-button.h
+ moko-digit-button.c moko-digit-button.h \
+ dialer-defines.h
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2008-04-08 00:27:52 UTC (rev 4321)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2008-04-08 08:57:41 UTC (rev 4322)
@@ -29,10 +29,13 @@
{
GtkWidget *notebook;
GtkWidget *history;
+
+ GtkWidget *history_placeholder;
GtkWidget *main_window;
DBusGProxy *dialer_proxy;
+ MokoJournal *journal;
} DialerData;
static gboolean show_missed;
@@ -98,6 +101,18 @@
g_free (str);
}
+gboolean
+create_history_window (DialerData *data)
+{
+ /* create the history window in an idle callback, if we don't need it
straight
+ * away */
+ data->history = moko_history_new (data->journal);
+ g_signal_connect (data->history, "dial_number", G_CALLBACK
(dial_clicked_cb), data);
+ gtk_container_add (GTK_CONTAINER (data->history_placeholder), data->history);
+ return FALSE;
+
+}
+
int main (int argc, char **argv)
{
GtkWidget *window, *keypad;
@@ -153,7 +168,7 @@
/* Set up the journal */
program_log ("load journal");
- journal = moko_journal_open_default ();
+ data->journal = journal = moko_journal_open_default ();
if (!journal || !moko_journal_load_from_storage (journal))
{
g_warning ("Could not load journal");
@@ -180,20 +195,32 @@
gtk_notebook_append_page (GTK_NOTEBOOK (data->notebook), keypad,
gtk_image_new_from_file (PKGDATADIR"/dtmf.png"));
gtk_container_child_set (GTK_CONTAINER (data->notebook), keypad,
"tab-expand", TRUE, NULL);
- /* History */
+
program_log ("create history widget");
- data->history = moko_history_new (journal);
- g_signal_connect (data->history, "dial_number", G_CALLBACK
(dial_clicked_cb), data);
- gtk_notebook_append_page (GTK_NOTEBOOK (data->notebook), data->history,
- gtk_image_new_from_icon_name ("moko-call-history",
- GTK_ICON_SIZE_BUTTON));
- gtk_container_child_set (GTK_CONTAINER (data->notebook), data->history,
- "tab-expand", TRUE,
- NULL);
+ if (!show_missed)
+ {
+ /* set a temporary widget while we create the real history widget */
+ data->history_placeholder = gtk_alignment_new (0, 0, 1, 1);
+ gtk_notebook_append_page (GTK_NOTEBOOK (data->notebook),
data->history_placeholder,
+ gtk_image_new_from_icon_name
("moko-call-history",
+ GTK_ICON_SIZE_BUTTON));
+ gtk_container_child_set (GTK_CONTAINER (data->notebook),
data->history_placeholder,
+ "tab-expand", TRUE,
+ NULL);
+ /* wait until everything else finishes before creating the history widget
*/
+ g_idle_add ((GSourceFunc) create_history_window, data);
+ }
+ else
+ {
+ /* we need to show the history window right now, so don't delay creation */
+ create_history_window (data);
+ }
program_log ("show window");
gtk_widget_show_all (window);
+
+ /* History */
if (show_missed)
gtk_notebook_set_current_page (GTK_NOTEBOOK (data->notebook), 1);
else
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
