r3140 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-10-10 10:26:02 +0200 (Wed, 10 Oct 2007)
New Revision: 3140

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-keypad.c
Log:
Patch by: Roman Moravcik <roman.moravcik at gmail.com>

* moko-keypad.c: (on_panel_user_input): Emit signal DIGIT_PRESSED
  when keypad digit was pressed,

* moko-dialer.c: (on_call_progress_changed): Check if status was
  changed to TALKING when dialer received MOKO_GSMD_PROG_CONNECTED,
  (on_keypad_digit_pressed): Implemented sending of DTMF tones
  during active call. Fixes bug 53.


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-10-10 02:36:19 UTC (rev 3139)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-10-10 08:26:02 UTC (rev 3140)
@@ -1,3 +1,15 @@
+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
+	  when keypad digit was pressed,
+
+	* moko-dialer.c: (on_call_progress_changed): Check if status was
+	  changed to TALKING when dialer received MOKO_GSMD_PROG_CONNECTED,
+	  (on_keypad_digit_pressed): Implemented sending of DTMF tones
+	  during active call. Fixes bug 53.
+
 2007-10-06  Holger Hans Peter Freyther  <zecke at selfish.org>
 
 	openmoko-dialer display isn't cleared after pin is sent

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 02:36:19 UTC (rev 3139)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-10-10 08:26:02 UTC (rev 3140)
@@ -440,8 +440,16 @@
                          const gchar digit,
                          MokoDialer *dialer)
 {
-  /* If in call, dtmf it, otherwise ignore */
-  /* FIXME: When libgsmd implements it, we should */
+  MokoDialerPrivate *priv;
+
+  g_return_if_fail (MOKO_IS_DIALER (dialer));
+  priv = dialer->priv;
+
+  if ((digit == '+') || (digit == 'w') || (digit == 'p'))
+    return;
+
+  if (priv->status == DIALER_STATUS_TALKING)
+    moko_gsmd_connection_voice_dtmf (priv->connection, digit);
 }
 
 static void
@@ -631,6 +639,8 @@
       break;
     
     case MOKO_GSMD_PROG_CONNECTED:
+      if (priv->status != DIALER_STATUS_TALKING)
+        moko_dialer_talking (dialer);
       moko_talking_accepted_call (MOKO_TALKING (priv->talking), NULL, NULL);
       moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), TRUE);
       g_debug ("mokogsmd connected");

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c	2007-10-10 02:36:19 UTC (rev 3139)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c	2007-10-10 08:26:02 UTC (rev 3140)
@@ -253,6 +253,7 @@
                                           MOKO_DIALER_TEXTVIEW (priv->textview), 
                                           TRUE));
     moko_tips_set_matches (MOKO_TIPS (priv->tips), matches);
+    g_signal_emit (G_OBJECT (keypad), keypad_signals[DIGIT_PRESSED], 0, digit);
  }
 }