r2781 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
njp at sita.openmoko.org
njp at sita.openmoko.org
Wed Aug 22 16:41:04 CEST 2007
Author: njp
Date: 2007-08-22 16:41:02 +0200 (Wed, 22 Aug 2007)
New Revision: 2781
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
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.h
Log:
2007-08-22 Neil J. Patel <njp at o-hand.com>
* src/moko-dialer.c: (on_talking_silence), (moko_dialer_init):
* src/moko-talking.c: (on_silence_clicked),
(moko_talking_class_init), (moko_talking_init):
* src/moko-talking.h:
Add 'silence/ignore' capability to incoming calls i.e. stop the ringing and
vibration, but don't hangup.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2007-08-22 14:36:56 UTC (rev 2780)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2007-08-22 14:41:02 UTC (rev 2781)
@@ -1,5 +1,14 @@
2007-08-22 Neil J. Patel <njp at o-hand.com>
+ * src/moko-dialer.c: (on_talking_silence), (moko_dialer_init):
+ * src/moko-talking.c: (on_silence_clicked),
+ (moko_talking_class_init), (moko_talking_init):
+ * src/moko-talking.h:
+ Add 'silence/ignore' capability to incoming calls i.e. stop the ringing and
+ vibration, but don't hangup.
+
+2007-08-22 Neil J. Patel <njp at o-hand.com>
+
* src/moko-contacts.c: (moko_contacts_fuzzy_lookup):
* src/moko-notify.c: (moko_notify_check_brightness):
Remove some unnecessary printf's.
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-08-22 14:36:56 UTC (rev 2780)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c 2007-08-22 14:41:02 UTC (rev 2781)
@@ -384,6 +384,19 @@
}
static void
+on_talking_silence (MokoTalking *talking, MokoDialer *dialer)
+{
+ MokoDialerPrivate *priv;
+
+ g_return_if_fail (MOKO_IS_DIALER (dialer));
+ priv = dialer->priv;
+
+ priv->status = DIALER_STATUS_NORMAL;
+
+ moko_notify_stop (priv->notify);
+}
+
+static void
on_talking_speaker_toggle (MokoTalking *talking,
gboolean speaker_phone,
MokoDialer *dialer)
@@ -810,6 +823,8 @@
G_CALLBACK (on_talking_reject_call), (gpointer)dialer);
g_signal_connect (G_OBJECT (priv->talking), "cancel_call",
G_CALLBACK (on_talking_cancel_call), (gpointer)dialer);
+ g_signal_connect (G_OBJECT (priv->talking), "silence",
+ G_CALLBACK (on_talking_silence), (gpointer)dialer);
g_signal_connect (G_OBJECT (priv->talking), "speaker_toggle",
G_CALLBACK (on_talking_speaker_toggle), (gpointer)dialer);
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-08-22 14:36:56 UTC (rev 2780)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c 2007-08-22 14:41:02 UTC (rev 2781)
@@ -56,6 +56,7 @@
ACCEPT_CALL = 0,
REJECT_CALL,
CANCEL_CALL,
+ SILENCE,
SPEAKER_TOGGLE,
LAST_SIGNAL
@@ -265,6 +266,13 @@
}
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)
{
g_source_remove (talking->priv->timeout);
@@ -327,6 +335,14 @@
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ talking_signals[SILENCE] =
+ g_signal_new ("silence",
+ G_TYPE_FROM_CLASS (obj_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MokoTalkingClass, silence),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
talking_signals[SPEAKER_TOGGLE] =
g_signal_new ("speaker_toggle",
@@ -366,6 +382,18 @@
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), 1);
+ image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PAUSE,
+ GTK_ICON_SIZE_LARGE_TOOLBAR);
+ item = gtk_tool_button_new (image, "Reject");
+ gtk_widget_show_all (GTK_WIDGET (item));
+ gtk_tool_item_set_expand (item, TRUE);
+ g_signal_connect (G_OBJECT (item), "clicked",
+ G_CALLBACK (on_silence_clicked), (gpointer)talking);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
+
+
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), 3);
+
icon = gdk_pixbuf_new_from_file (PKGDATADIR"/cancel.png", NULL);
image = gtk_image_new_from_pixbuf (icon);
item = gtk_tool_button_new (image, "Reject");
@@ -373,8 +401,7 @@
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (G_OBJECT (item), "clicked",
G_CALLBACK (on_reject_clicked), (gpointer)talking);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
-
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 4);
/* Outgoing call and talking share the same toolbar */
priv->main_bar = toolbar = gtk_toolbar_new ();
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.h 2007-08-22 14:36:56 UTC (rev 2780)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.h 2007-08-22 14:41:02 UTC (rev 2781)
@@ -65,6 +65,7 @@
void (*accept_call) (MokoTalking *talking);
void (*reject_call) (MokoTalking *talking);
void (*cancel_call) (MokoTalking *talking);
+ void (*silence) (MokoTalking *talking);
void (*speaker_toggle) (MokoTalking *talking, gboolean speaker_phone);
};
More information about the commitlog
mailing list
