r3693 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/phone-kit
chris at sita.openmoko.org
chris at sita.openmoko.org
Wed Dec 19 16:30:18 CET 2007
Author: chris
Date: 2007-12-19 16:30:17 +0100 (Wed, 19 Dec 2007)
New Revision: 3693
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
Log:
* src/phone-kit/moko-sms.c: (moko_sms_dispose),
(stop_notify_timeout), (update_notification), (moko_sms_init):
Add tone/vibration notification
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2007-12-19 14:16:27 UTC (rev 3692)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2007-12-19 15:30:17 UTC (rev 3693)
@@ -1,5 +1,11 @@
2007-12-19 Chris Lord <chris at openedhand.com>
+ * src/phone-kit/moko-sms.c: (moko_sms_dispose),
+ (stop_notify_timeout), (update_notification), (moko_sms_init):
+ Add tone/vibration notification
+
+2007-12-19 Chris Lord <chris at openedhand.com>
+
* configure.ac:
Add AC_GNU_SOURCE for basename(), add libnotify
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 2007-12-19 14:16:27 UTC (rev 3692)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c 2007-12-19 15:30:17 UTC (rev 3693)
@@ -33,6 +33,7 @@
#include "moko-sms.h"
#include "moko-network.h"
#include "moko-listener.h"
+#include "moko-notify.h"
static void
listener_interface_init (gpointer g_iface, gpointer iface_data);
@@ -70,6 +71,7 @@
GList *unread_uids;
NotifyNotification *notification;
+ MokoNotify *notify;
};
static void start_handling_sms (MokoSms *sms);
@@ -148,6 +150,8 @@
sms = MOKO_SMS (object);
priv = sms->priv;
+
+ while (g_source_remove_by_user_data (object)) moko_notify_stop (priv->notify);
if (priv->sms_store) {
g_object_unref (priv->sms_store);
@@ -406,6 +410,14 @@
iface->on_send_sms = on_send_sms;
}
+static gboolean
+stop_notify_timeout (MokoSms *sms)
+{
+ MokoSmsPrivate *priv = sms->priv;
+ moko_notify_stop (priv->notify);
+ return FALSE;
+}
+
static void
update_notification (MokoSms *sms, gboolean show)
{
@@ -423,7 +435,11 @@
g_free (body);
/* Show notification */
- if (show) notify_notification_show (priv->notification, NULL);
+ if (show) {
+ notify_notification_show (priv->notification, NULL);
+ moko_notify_start (priv->notify);
+ g_timeout_add (1000, (GSourceFunc)stop_notify_timeout, sms);
+ }
}
static void
@@ -548,6 +564,7 @@
"",
MOKO_STOCK_SMS_NEW,
NULL);
+ priv->notify = moko_notify_get_default ();
/* Get the SMS note store */
priv->sms_store = jana_ecal_store_new (JANA_COMPONENT_NOTE);
More information about the commitlog
mailing list