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. r3826 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
2. r3827 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
3. r3828 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
4. r3829 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . data
src/dialer src/phone-kit ([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2008-01-14 15:08:55 +0100 (Mon, 14 Jan 2008)
New Revision: 3826
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
Log:
* src/sms-main.c: (new_clicked_cb), (main):
Add a forward button, clear the text view when composing a new
message
* src/sms-notes.c: (page_shown), (page_hidden),
(forward_clicked_cb), (selection_changed_cb), (sms_notes_page_new):
Add basic forward message functionality (bug #1171)
* src/sms.h:
Add forward buttoN
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-01-14 13:02:21 UTC (rev 3825)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-01-14 14:08:55 UTC (rev 3826)
@@ -1,3 +1,16 @@
+2008-01-14 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/sms-main.c: (new_clicked_cb), (main):
+ Add a forward button, clear the text view when composing a new
+ message
+
+ * src/sms-notes.c: (page_shown), (page_hidden),
+ (forward_clicked_cb), (selection_changed_cb), (sms_notes_page_new):
+ Add basic forward message functionality (bug #1171)
+
+ * src/sms.h:
+ Add forward button
+
2008-01-09 Chris Lord <[EMAIL PROTECTED]>
* data/org.openmoko.OpenmokoMessages2.service.in:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
2008-01-14 13:02:21 UTC (rev 3825)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
2008-01-14 14:08:55 UTC (rev 3826)
@@ -49,6 +49,9 @@
static void
new_clicked_cb (GtkToolButton *button, SmsData *data)
{
+ gtk_text_buffer_set_text (gtk_text_view_get_buffer (
+ GTK_TEXT_VIEW (data->sms_textview)), "", -1);
+
gtk_notebook_set_current_page (
GTK_NOTEBOOK (data->notebook), SMS_PAGE_COMPOSE);
}
@@ -105,25 +108,27 @@
data.new_button = gtk_tool_button_new_from_stock (MOKO_STOCK_SMS_NEW);
gtk_tool_item_set_expand (data.new_button, TRUE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data.new_button, 0);
- /*gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
- gtk_separator_tool_item_new (), 1);*/
g_signal_connect (data.new_button, "clicked",
G_CALLBACK (new_clicked_cb), &data);
+ /* Forward button */
+ data.forward_button = gtk_tool_button_new_from_stock (
+ MOKO_STOCK_MAIL_FORWARD);
+ gtk_tool_item_set_expand (data.forward_button, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data.forward_button, 1);
+
/* Delete all button */
data.delete_all_button = gtk_tool_button_new_from_stock (
MOKO_STOCK_FOLDER_DELETE);
gtk_tool_item_set_expand (data.delete_all_button, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data.delete_all_button, 1);
- /*gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
- gtk_separator_tool_item_new (), 3);*/
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data.delete_all_button, 2);
gtk_widget_set_sensitive (GTK_WIDGET (data.delete_all_button), FALSE);
/* Delete button */
data.delete_button = gtk_tool_button_new_from_stock (
GTK_STOCK_DELETE);
gtk_tool_item_set_expand (data.delete_button, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data.delete_button, 2);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data.delete_button, 3);
gtk_widget_set_sensitive (GTK_WIDGET (data.delete_button), FALSE);
/* Create notebook */
@@ -160,6 +165,7 @@
gtk_window_set_default_size (GTK_WINDOW (data.window), 480, 600);
gtk_widget_show_all (data.window);
+ gtk_widget_hide (GTK_WIDGET (data.forward_button));
gtk_main ();
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-01-14 13:02:21 UTC (rev 3825)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-01-14 14:08:55 UTC (rev 3826)
@@ -179,7 +179,11 @@
gboolean found_match = FALSE;
EContact *contact = NULL;
+ /* Show forward button */
+ gtk_widget_show (GTK_WIDGET (data->forward_button));
+
gtk_widget_set_sensitive (GTK_WIDGET (data->delete_button), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (data->forward_button), FALSE);
if (!open) return;
@@ -275,6 +279,9 @@
{
GtkAdjustment *hadjust, *vadjust;
+ /* Hide forward button */
+ gtk_widget_hide (GTK_WIDGET (data->forward_button));
+
if (data->notes_scroll_idle) g_source_remove (data->notes_scroll_idle);
g_object_get (G_OBJECT (data->notes_treeview),
"hadjustment", &hadjust, "vadjustment", &vadjust, NULL);
@@ -601,6 +608,33 @@
}
static void
+forward_clicked_cb (GtkToolButton *button, SmsData *data)
+{
+ gchar *body;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreeSelection *selection;
+
+ /* Fill in compose box with message text and call new */
+ selection = gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (data->notes_treeview));
+ if ((!selection) ||
+ (!gtk_tree_selection_get_selected (selection, &model, &iter)))
+ return;
+
+ gtk_tree_model_get (model, &iter,
+ JANA_GTK_NOTE_STORE_COL_BODY, &body, -1);
+ gtk_text_buffer_set_text (gtk_text_view_get_buffer (
+ GTK_TEXT_VIEW (data->sms_textview)), body, -1);
+ g_free (body);
+
+ /* TODO: Launch a contact-picker */
+
+ gtk_notebook_set_current_page (
+ GTK_NOTEBOOK (data->notebook), SMS_PAGE_COMPOSE);
+}
+
+static void
delete_clicked_cb (GtkToolButton *button, SmsData *data)
{
gchar *uid;
@@ -752,9 +786,13 @@
if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
gtk_widget_set_sensitive (GTK_WIDGET (
data->delete_button), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (
+ data->forward_button), FALSE);
} else {
gtk_widget_set_sensitive (GTK_WIDGET (
data->delete_button), TRUE);
+ gtk_widget_set_sensitive (GTK_WIDGET (
+ data->forward_button), TRUE);
}
}
@@ -864,7 +902,9 @@
jana_store_open (data->notes);
- /* Connect to toolbar delete buttons */
+ /* Connect to toolbar button-click signals */
+ g_signal_connect (data->forward_button, "clicked",
+ G_CALLBACK (forward_clicked_cb), data);
g_signal_connect (data->delete_button, "clicked",
G_CALLBACK (delete_clicked_cb), data);
g_signal_connect (data->delete_all_button, "clicked",
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2008-01-14 13:02:21 UTC (rev 3825)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2008-01-14 14:08:55 UTC (rev 3826)
@@ -57,6 +57,7 @@
GtkWidget *window;
GtkWidget *notebook;
GtkToolItem *new_button;
+ GtkToolItem *forward_button;
GtkToolItem *delete_all_button;
GtkToolItem *delete_button;
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-14 15:21:51 +0100 (Mon, 14 Jan 2008)
New Revision: 3827
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.h
Log:
Patch by Roman Moravcik <[EMAIL PROTECTED]>, bug #1153
* src/phone-kit/moko-dialer.c: (on_call_progress):
Hide talking window when call missed or caller hung up
* src/phone-kit/moko-talking.h:
* src/phone-kit/moko-talking.c: (moko_talking_incoming_call),
(moko_talking_outgoing_call), (moko_talking_accepted_call),
(moko_talking_hide_window), (on_reject_clicked),
(on_silence_clicked), (on_cancel_clicked), (moko_talking_init):
Add function to hide talking window, be sure timer was initialised
before removal, set window title and don't stop animation when silence
button is pressed.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-14 14:08:55 UTC (rev 3826)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-14 14:21:51 UTC (rev 3827)
@@ -1,3 +1,19 @@
+2008-01-14 Chris Lord <[EMAIL PROTECTED]>
+
+ Patch by Roman Moravcik <[EMAIL PROTECTED]>, bug #1153
+
+ * src/phone-kit/moko-dialer.c: (on_call_progress):
+ Hide talking window when call missed or caller hung up
+
+ * src/phone-kit/moko-talking.h:
+ * src/phone-kit/moko-talking.c: (moko_talking_incoming_call),
+ (moko_talking_outgoing_call), (moko_talking_accepted_call),
+ (moko_talking_hide_window), (on_reject_clicked),
+ (on_silence_clicked), (on_cancel_clicked), (moko_talking_init):
+ Add function to hide talking window, be sure timer was initialised
+ before removal, set window title and don't stop animation when silence
+ button is pressed.
+
2008-01-11 Chris Lord <[EMAIL PROTECTED]>
* src/dialer/moko-alsa-volume-button.[ch]:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
2008-01-14 14:08:55 UTC (rev 3826)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
2008-01-14 14:21:51 UTC (rev 3827)
@@ -598,11 +598,13 @@
priv->incoming_clip = NULL;
moko_notify_stop (priv->notify);
+ moko_talking_hide_window (MOKO_TALKING (priv->talking));
g_debug ("mokogsmd disconnect");
break;
case GSMD_CALLPROG_REJECT:
moko_dialer_rejected (dialer);
+ moko_talking_hide_window (MOKO_TALKING (priv->talking));
g_debug ("mokogsmd reject");
break;
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2008-01-14 14:08:55 UTC (rev 3826)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2008-01-14 14:21:51 UTC (rev 3827)
@@ -156,6 +156,7 @@
gtk_widget_hide (priv->main_bar);
gtk_widget_show_all (priv->incoming_bar);
+ gtk_window_set_title (GTK_WINDOW (priv->window), "Incoming Call");
gtk_label_set_text (GTK_LABEL (priv->title), "Incoming Call");
gtk_label_set_text (GTK_LABEL (priv->duration), "");
gtk_image_set_from_file (GTK_IMAGE (priv->icon),
@@ -215,6 +216,7 @@
else
markup = g_strdup (number);
+ gtk_window_set_title (GTK_WINDOW (priv->window), "Dialing");
gtk_label_set_text (GTK_LABEL (priv->title), "Outgoing Call");
gtk_label_set_text (GTK_LABEL (priv->duration), "");
@@ -293,6 +295,7 @@
else
markup = g_strdup (number);
+ gtk_window_set_title (GTK_WINDOW (priv->window), "Talking");
gtk_label_set_text (GTK_LABEL (priv->title), "Talking");
gtk_label_set_text (GTK_LABEL (priv->duration), "00:00:00");
gtk_image_set_from_file (GTK_IMAGE (priv->icon),
@@ -315,7 +318,27 @@
g_free (markup);
}
+void
+moko_talking_hide_window (MokoTalking *talking)
+{
+ MokoTalkingPrivate *priv;
+ g_return_if_fail (MOKO_IS_TALKING (talking));
+ priv = talking->priv;
+
+ moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
+
+ if (priv->dtimer)
+ g_timer_destroy(priv->dtimer);
+ priv->dtimer = NULL;
+
+ if (priv->timeout)
+ g_source_remove (priv->timeout);
+
+ gtk_widget_hide (priv->window);
+}
+
+
/* Toolbar callbacks */
static void
on_answer_clicked (GtkToolButton *button, MokoTalking *talking)
@@ -326,29 +349,42 @@
static void
on_reject_clicked (GtkToolButton *button, MokoTalking *talking)
{
- g_source_remove (talking->priv->timeout);
- gtk_widget_hide (talking->priv->window);
+ MokoTalkingPrivate *priv;
+
+ g_return_if_fail (MOKO_IS_TALKING (talking));
+ priv = talking->priv;
+
+ if (priv->timeout)
+ g_source_remove (priv->timeout);
+
+ gtk_widget_hide (priv->window);
g_signal_emit (G_OBJECT (talking), talking_signals[REJECT_CALL], 0);
}
static void
on_silence_clicked (GtkToolButton *button, MokoTalking *talking)
{
- g_source_remove (talking->priv->timeout);
g_signal_emit (G_OBJECT (talking), talking_signals[SILENCE], 0);
}
static void
on_cancel_clicked (GtkToolButton *button, MokoTalking *talking)
{
+ MokoTalkingPrivate *priv;
+
+ g_return_if_fail (MOKO_IS_TALKING (talking));
+ priv = talking->priv;
+
/* stop call duration timer */
- if (talking->priv->dtimer)
- g_timer_destroy(talking->priv->dtimer);
+ if (priv->dtimer)
+ g_timer_destroy(priv->dtimer);
+ priv->dtimer = NULL;
- gtk_widget_hide (talking->priv->window);
+ if (priv->timeout)
+ g_source_remove (priv->timeout);
- g_source_remove (talking->priv->timeout);
moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
+ gtk_widget_hide (priv->window);
g_signal_emit (G_OBJECT (talking), talking_signals[CANCEL_CALL], 0);
}
@@ -479,6 +515,9 @@
priv = talking->priv = MOKO_TALKING_GET_PRIVATE (talking);
+ /* initialize dtimer to NULL */
+ priv->dtimer = NULL;
+
notebook = gtk_notebook_new ();
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_BOTTOM);
priv->notebook = notebook;
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.h
2008-01-14 14:08:55 UTC (rev 3826)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.h
2008-01-14 14:21:51 UTC (rev 3827)
@@ -94,6 +94,9 @@
const gchar *number,
MokoContactEntry *entry);
+void
+moko_talking_hide_window (MokoTalking *talking);
+
G_END_DECLS
#endif /* _HAVE_MOKO_TALKING_H */
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-14 16:20:00 +0100 (Mon, 14 Jan 2008)
New Revision: 3828
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
Log:
* src/phone-kit/moko-network.c: (retry_oper_get),
(retry_opers_get), (retry_get_imsi), (on_network_registered),
(net_msghandler), (phone_msghandler), (moko_network_init):
Only retry n amount of times before giving up on getting imsi,
subscriber number and network number
* src/phone-kit/moko-sms.c: (moko_sms_send):
Don't rely on subscriber number to send messages
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-14 14:21:51 UTC (rev 3827)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-14 15:20:00 UTC (rev 3828)
@@ -1,5 +1,16 @@
2008-01-14 Chris Lord <[EMAIL PROTECTED]>
+ * src/phone-kit/moko-network.c: (retry_oper_get),
+ (retry_opers_get), (retry_get_imsi), (on_network_registered),
+ (net_msghandler), (phone_msghandler), (moko_network_init):
+ Only retry n amount of times before giving up on getting imsi,
+ subscriber number and network number
+
+ * src/phone-kit/moko-sms.c: (moko_sms_send):
+ Don't rely on subscriber number to send messages
+
+2008-01-14 Chris Lord <[EMAIL PROTECTED]>
+
Patch by Roman Moravcik <[EMAIL PROTECTED]>, bug #1153
* src/phone-kit/moko-dialer.c: (on_call_progress):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
2008-01-14 14:21:51 UTC (rev 3827)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
2008-01-14 15:20:00 UTC (rev 3828)
@@ -41,6 +41,9 @@
#define MOKO_NETWORK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
MOKO_TYPE_NETWORK, MokoNetworkPrivate))
+#define RETRY_MAX 5
+#define RETRY_DELAY 15
+
enum {
PROP_STATUS = 1,
};
@@ -70,8 +73,11 @@
gchar *imsi;
guint retry_oper;
+ gint retry_oper_n;
guint retry_opers;
+ gint retry_opers_n;
guint retry_imsi;
+ gint retry_imsi_n;
/* gsmd connection variables */
struct lgsm_handle *handle;
@@ -107,25 +113,26 @@
static gboolean
retry_oper_get (MokoNetwork *network)
{
- g_debug ("Retrying operator retrieval");
+ g_debug ("Retrying operator retrieval (%d)", network->priv->retry_oper_n);
lgsm_oper_get (network->priv->handle);
- return TRUE;
+ return (--network->priv->retry_oper_n) ? TRUE : FALSE;
}
static gboolean
retry_opers_get (MokoNetwork *network)
{
- g_debug ("Retrying operators list retrieval");
+ g_debug ("Retrying operators list retrieval (%d)",
+ network->priv->retry_opers_n);
lgsm_opers_get (network->priv->handle);
- return TRUE;
+ return (--network->priv->retry_opers_n) ? TRUE : FALSE;
}
static gboolean
retry_get_imsi (MokoNetwork *network)
{
- g_debug ("Retrying imsi retrieval");
+ g_debug ("Retrying imsi retrieval (%d)", network->priv->retry_imsi_n);
lgsm_get_imsi (network->priv->handle);
- return TRUE;
+ return (--network->priv->retry_imsi_n) ? TRUE : FALSE;
}
static void
@@ -195,17 +202,21 @@
/* Retrieve IMSI to get home country code */
lgsm_get_imsi (handle);
- /* Add a time-out in case retrieval fails - retry every 10 seconds */
+ /* Add a time-out in case retrieval fails,
+ * retry every RETRY_DELAY seconds */
stop_retrying (MOKO_NETWORK (listener));
- priv->retry_oper = g_timeout_add_seconds (15,
- (GSourceFunc)retry_oper_get,
- listener);
- priv->retry_opers = g_timeout_add_seconds (15,
-
(GSourceFunc)retry_opers_get,
- listener);
- priv->retry_imsi = g_timeout_add_seconds (15,
- (GSourceFunc)retry_get_imsi,
- listener);
+ if (priv->retry_oper_n)
+ priv->retry_oper = g_timeout_add_seconds (RETRY_DELAY,
+
(GSourceFunc)retry_oper_get,
+ listener);
+ if (priv->retry_opers_n)
+ priv->retry_opers = g_timeout_add_seconds (RETRY_DELAY,
+
(GSourceFunc)retry_opers_get,
+ listener);
+ if (priv->retry_imsi_n)
+ priv->retry_imsi = g_timeout_add_seconds (RETRY_DELAY,
+
(GSourceFunc)retry_get_imsi,
+ listener);
}
break;
@@ -557,6 +568,7 @@
if (priv->retry_oper) {
g_source_remove (priv->retry_oper);
priv->retry_oper = 0;
+ priv->retry_oper_n = RETRY_MAX;
}
for (l = priv->listeners; l; l = l->next) {
moko_listener_on_network_name (MOKO_LISTENER (l->data),
@@ -567,6 +579,7 @@
if (priv->retry_opers) {
g_source_remove (priv->retry_opers);
priv->retry_opers = 0;
+ priv->retry_opers_n = RETRY_MAX;
}
for (l = priv->listeners; l; l = l->next) {
moko_listener_on_network_list (MOKO_LISTENER (l->data),
@@ -594,6 +607,7 @@
if (priv->retry_imsi) {
g_source_remove (priv->retry_imsi);
priv->retry_imsi = 0;
+ priv->retry_imsi_n = RETRY_MAX;
}
for (l = priv->listeners; l; l = l->next) {
moko_listener_on_imsi (MOKO_LISTENER (l->data), priv->handle,
@@ -754,6 +768,10 @@
MokoNetworkPrivate *priv;
priv = network->priv = MOKO_NETWORK_GET_PRIVATE (network);
+
+ priv->retry_oper_n = RETRY_MAX;
+ priv->retry_opers_n = RETRY_MAX;
+ priv->retry_imsi_n = RETRY_MAX;
network_init_gsmd (network);
}
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
2008-01-14 14:21:51 UTC (rev 3827)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
2008-01-14 15:20:00 UTC (rev 3828)
@@ -638,8 +638,7 @@
return FALSE;
}
- if (!moko_network_get_subscriber_number (priv->network, &sub_num, error))
- return FALSE;
+ moko_network_get_subscriber_number (priv->network, &sub_num, NULL);
/* Ask for delivery report */
sms.ask_ds = report ? 1 : 0;
@@ -693,9 +692,11 @@
g_free (full_number);
} else
jana_note_set_recipient (note, number);
- jana_note_set_author (note, sub_num);
+ if (sub_num) {
+ jana_note_set_author (note, sub_num);
+ g_free (sub_num);
+ }
g_free (dialcode);
- g_free (sub_num);
jana_note_set_body (note, message);
if (report) {
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-14 16:53:02 +0100 (Mon, 14 Jan 2008)
New Revision: 3829
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unknown.png
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unkown.png
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
Patch by: Roman Moracvik <[EMAIL PROTECTED]>, bug #1157
* configure.ac:
* src/dialer/Makefile.am:
Add libjana-gtk to dependencies
* data/Makefile.am:
* src/phone-kit/moko-talking.c: (moko_talking_set_clip),
(moko_talking_incoming_call), (moko_talking_outgoing_call):
Rename unkown.png -> unknown.png
* src/dialer/moko-history.c: (history_add_entry),
(moko_history_load_entries), (moko_history_init):
Use JanaGtkCellRendererNote to display more details in the dialer
history
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-14 15:53:02 UTC (rev 3829)
@@ -1,5 +1,23 @@
2008-01-14 Chris Lord <[EMAIL PROTECTED]>
+ Patch by: Roman Moracvik <[EMAIL PROTECTED]>, bug #1157
+
+ * configure.ac:
+ * src/dialer/Makefile.am:
+ Add libjana-gtk to dependencies
+
+ * data/Makefile.am:
+ * src/phone-kit/moko-talking.c: (moko_talking_set_clip),
+ (moko_talking_incoming_call), (moko_talking_outgoing_call):
+ Rename unkown.png -> unknown.png
+
+ * src/dialer/moko-history.c: (history_add_entry),
+ (moko_history_load_entries), (moko_history_init):
+ Use JanaGtkCellRendererNote to display more details in the dialer
+ history
+
+2008-01-14 Chris Lord <[EMAIL PROTECTED]>
+
* src/phone-kit/moko-network.c: (retry_oper_get),
(retry_opers_get), (retry_get_imsi), (on_network_registered),
(net_msghandler), (phone_msghandler), (moko_network_init):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
2008-01-14 15:53:02 UTC (rev 3829)
@@ -21,7 +21,7 @@
libmokoui2
libpulse)
-PKG_CHECK_MODULES(JANA, libjana libjana-ecal)
+PKG_CHECK_MODULES(JANA, libjana libjana-ecal libjana-gtk)
PKG_CHECK_MODULES(NOTIFY, libnotify)
old_cflags=$CFLAGS
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am
2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am
2008-01-14 15:53:02 UTC (rev 3829)
@@ -1,7 +1,7 @@
# A shell check command that I find convenient:
# ls -1 *.png | xargs --replace=pngimg sh -c '(grep -qw "pngimg" Makefile.am
|| echo "Missing pngimg")'
-dist_pkgdata_DATA =unkown.png\
+dist_pkgdata_DATA =unknown.png\
dialed.png\
missed.png\
received.png\
Copied:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unknown.png (from
rev 3824,
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unkown.png)
Deleted:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unkown.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
2008-01-14 15:20:00 UTC (rev 3828)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
2008-01-14 15:53:02 UTC (rev 3829)
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall @DIALER_CFLAGS@
+AM_CFLAGS = -Wall @DIALER_CFLAGS@ @JANA_CFLAGS@
INCLUDES = -I$(top_srcdir)/src/common
@@ -11,4 +11,4 @@
moko-tips.c moko-tips.h \
dialer-main.c
-openmoko_dialer_LDADD = @DIALER_LIBS@
$(top_srcdir)/src/common/libdialer-common.a
+openmoko_dialer_LDADD = @DIALER_LIBS@ @JANA_LIBS@
$(top_srcdir)/src/common/libdialer-common.a
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2008-01-14 15:20:00 UTC (rev 3828)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2008-01-14 15:53:02 UTC (rev 3829)
@@ -21,6 +21,8 @@
#include <gtk/gtk.h>
+#include <libjana-gtk/jana-gtk.h>
+
#include <string.h>
#include <moko-journal.h>
@@ -88,6 +90,7 @@
DSTART_COLUMN,
ICON_NAME_COLUMN,
DISPLAY_TEXT_COLUMN,
+ CALL_DETAILS_COLUMN,
CALL_TYPE_COLUMN,
ENTRY_POINTER_COLUMN
};
@@ -233,16 +236,22 @@
MokoContactEntry *contacts;
GdkPixbuf *icon = NULL;
const gchar *display_text;
- time_t dstart;
+ const gchar *details;
+ time_t dstart, dend, duration;
MessageDirection direction;
gboolean was_missed;
const MokoTime *time;
+ gchar dstart_str[256];
+ gchar duration_str[9];
gint type;
uid = moko_journal_entry_get_uid (entry);
moko_journal_entry_get_direction (entry, &direction);
time = moko_journal_entry_get_dtstart (entry);
dstart = moko_time_as_timet (time);
+ time = moko_journal_entry_get_dtend (entry);
+ dend = moko_time_as_timet (time);
+ duration = dend - dstart;
was_missed = moko_journal_voice_info_get_was_missed (entry);
number = moko_journal_voice_info_get_distant_number (entry);
@@ -279,6 +288,11 @@
display_text = number;
}
+ strftime (dstart_str, sizeof (dstart_str), "%d/%m/%Y %H:%M:%S",
+ localtime (&dstart));
+ strftime (duration_str, sizeof (duration_str), "%H:%M:%S", gmtime
(&duration));
+ details = g_strdup_printf ("%s\t\t%s", dstart_str, duration_str);
+
if (display_text == NULL || uid == NULL)
{
/*g_debug ("Not adding");
@@ -289,6 +303,7 @@
DSTART_COLUMN, dstart,
ICON_NAME_COLUMN, icon,
DISPLAY_TEXT_COLUMN, display_text,
+ CALL_DETAILS_COLUMN, details,
CALL_TYPE_COLUMN, type,
ENTRY_POINTER_COLUMN, uid,
-1);
@@ -385,7 +400,6 @@
GtkListStore *store;
GtkTreeModel *sorted;
GtkTreeModel *filtered;
- GtkTreeViewColumn *col;
GtkCellRenderer *renderer;
MokoJournalEntry *entry;
gint i, j, n_entries;
@@ -394,27 +408,24 @@
g_return_if_fail (MOKO_IS_HISTORY (history));
priv = history->priv;
- /* Create the columns */
- col = gtk_tree_view_column_new ();
+ /* Create renderer and column */
+ renderer = jana_gtk_cell_renderer_note_new ();
+ g_object_set (G_OBJECT (renderer), "show_created", FALSE,
+ "show_recipient", FALSE, NULL);
- renderer = gtk_cell_renderer_pixbuf_new ();
- gtk_tree_view_column_pack_start (col, renderer, FALSE);
- gtk_tree_view_column_set_attributes (col, renderer,
- "pixbuf", ICON_NAME_COLUMN,
- NULL);
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->treeview),
+ 0, NULL, renderer, "author", DISPLAY_TEXT_COLUMN, "body",
+ CALL_DETAILS_COLUMN, "icon", ICON_NAME_COLUMN, NULL);
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (col, renderer, TRUE);
- gtk_tree_view_column_set_attributes (col, renderer,
- "text", DISPLAY_TEXT_COLUMN,
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), col);
+ g_signal_connect (priv->treeview, "size-allocate",
+ G_CALLBACK (jana_gtk_utils_treeview_resize), renderer);
/* Set up the list store */
- store = gtk_list_store_new (6, G_TYPE_STRING,
+ store = gtk_list_store_new (7, G_TYPE_STRING,
G_TYPE_INT,
GDK_TYPE_PIXBUF,
G_TYPE_STRING,
+ G_TYPE_STRING,
G_TYPE_INT,
G_TYPE_STRING);
priv->main_model = GTK_TREE_MODEL (store);
@@ -665,6 +676,7 @@
gtk_box_pack_start (GTK_BOX (history), scroll, TRUE, TRUE, 0);
treeview = priv->treeview = gtk_tree_view_new ();
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_container_add (GTK_CONTAINER (scroll), treeview);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2008-01-14 15:20:00 UTC (rev 3828)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2008-01-14 15:53:02 UTC (rev 3829)
@@ -106,7 +106,7 @@
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->person),
entry->contact->photo);
else
gtk_image_set_from_file (GTK_IMAGE (priv->person),
- PKGDATADIR"/unkown.png");
+ PKGDATADIR"/unknown.png");
g_free (markup);
}
@@ -164,7 +164,7 @@
gtk_label_set_text (GTK_LABEL (priv->status), number);
gtk_image_set_from_file (GTK_IMAGE (priv->person),
- PKGDATADIR"/unkown.png");
+ PKGDATADIR"/unknown.png");
if (priv->timeout)
g_source_remove (priv->timeout);
priv->timeout = g_timeout_add (1000,
@@ -226,7 +226,7 @@
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->person),
entry->contact->photo);
else
gtk_image_set_from_file (GTK_IMAGE (priv->person),
- PKGDATADIR"/unkown.png");
+ PKGDATADIR"/unknown.png");
if (priv->timeout)
g_source_remove (priv->timeout);
priv->timeout = g_timeout_add (1000,
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
