r3141 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Wed Oct 10 16:35:53 CEST 2007
Author: thomas
Date: 2007-10-10 16:35:51 +0200 (Wed, 10 Oct 2007)
New Revision: 3141
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
Log:
Based on patch by: Roman Moravcik <roman.moravcik at gmail.com>
* src/moko-dialer.c: (on_incoming_call), (on_incoming_clip),
(on_call_progress_changed), (moko_dialer_init): Fix problem
with displaying CLIP on incoming call.
* src/moko-talking.c: (moko_talking_set_clip): Display
"Unknown number" if number is NULL (CLIR).
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2007-10-10 08:26:02 UTC (rev 3140)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2007-10-10 14:35:51 UTC (rev 3141)
@@ -1,5 +1,16 @@
2007-10-10 Thomas Wood <thomas at openedhand.com>
+ Based on patch by: Roman Moravcik <roman.moravcik at gmail.com>
+
+ * src/moko-dialer.c: (on_incoming_call), (on_incoming_clip),
+ (on_call_progress_changed), (moko_dialer_init): Fix problem
+ with displaying CLIP on incoming call.
+
+ * src/moko-talking.c: (moko_talking_set_clip): Display
+ "Unknown number" if number is NULL (CLIR).
+
+2007-10-10 Thomas Wood <thomas at openedhand.com>
+
Patch by: Roman Moravcik <roman.moravcik at gmail.com>
* moko-keypad.c: (on_panel_user_input): Emit signal DIGIT_PRESSED
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c 2007-10-10 08:26:02 UTC (rev 3140)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c 2007-10-10 14:35:51 UTC (rev 3141)
@@ -48,6 +48,7 @@
struct _MokoDialerPrivate
{
gint status;
+ gchar *incoming_clip;
/* Main Widgets */
GtkWidget *window;
@@ -517,6 +518,10 @@
}
priv->status = DIALER_STATUS_INCOMING;
+ if (priv->incoming_clip)
+ g_free (priv->incoming_clip);
+ priv->incoming_clip = NULL;
+
/* Prepare a voice journal entry */
if (priv->journal)
{
@@ -553,22 +558,16 @@
{
MokoDialerPrivate *priv;
MokoContactEntry *entry;
- static gint timestamp = 0;
- static gchar *last = NULL;
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
- if (last
- && (strcmp (number, last) == 0)
- && ((GDK_CURRENT_TIME - timestamp) < 1500))
+ if (priv->incoming_clip && (strcmp (number, priv->incoming_clip) == 0))
{
return;
}
- if (last)
- g_free (last);
- last = g_strdup (number);
- timestamp = GDK_CURRENT_TIME;
+
+ priv->incoming_clip = g_strdup (number);
entry = moko_contacts_lookup (moko_contacts_get_default (), number);
moko_talking_set_clip (MOKO_TALKING (priv->talking), number, entry);
@@ -628,6 +627,11 @@
priv->entry = NULL;
priv->time = NULL;
}
+
+ if (priv->incoming_clip)
+ g_free (priv->incoming_clip);
+ priv->incoming_clip = NULL;
+
moko_notify_stop (priv->notify);
g_debug ("mokogsmd disconnect");
break;
@@ -817,6 +821,9 @@
/* create the dialer_data struct */
priv->status = DIALER_STATUS_NORMAL;
+
+ /* clear incoming clip */
+ priv->incoming_clip = NULL;
/* Initialise the contacts list */
//contact_init_contact_data (&(priv->data->g_contactlist));
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c 2007-10-10 08:26:02 UTC (rev 3140)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c 2007-10-10 14:35:51 UTC (rev 3141)
@@ -76,6 +76,9 @@
g_return_if_fail (MOKO_IS_TALKING (talking));
priv = talking->priv;
+ if (number == NULL)
+ number = "Unknown number";
+
if (entry)
markup = g_strdup_printf ("<b>%s</b>\n%s", entry->contact->name, number);
else
More information about the commitlog
mailing list