Changeset 3689

Timestamp:

12/19/07 13:29:45 (5 years ago)

Author:

chris

Message:

• configure.ac: Add AC_GNU_SOURCE for basename(), add libnotify

• src/phone-kit/Makefile.am: Add libnotify

• src/phone-kit/dialer-main.c: (main): Initialise libnotify

• src/phone-kit/moko-dialer.c: (moko_dialer_init): Use moko_notify_get_default()

• src/phone-kit/moko-notify.c: (moko_notify_start), (moko_notify_stop), (moko_notify_init), (moko_notify_get_default):
• src/phone-kit/moko-notify.h: Add moko_notify_get_default() to share MokoNotify? with other objects

• src/phone-kit/moko-sms.c: (update_notification), (note_added_cb), (note_modified_cb), (note_removed_cb), (sms_store_opened_cb), (moko_sms_init): Add notifications with libnotify

Location:

trunk/src/target/OM-2007.2/applications/openmoko-dialer2

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• src/phone-kit/Makefile.am (modified) (2 diffs)
• src/phone-kit/dialer-main.c (modified) (3 diffs)
• src/phone-kit/moko-dialer.c (modified) (1 diff)
• src/phone-kit/moko-notify.c (modified) (5 diffs)
• src/phone-kit/moko-notify.h (modified) (1 diff)
• src/phone-kit/moko-sms.c (modified) (5 diffs)

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog

@@ +1 @@
+2007-12-19  Chris Lord  <chris@openedhand.com>
+
+        * configure.ac:
+        Add AC_GNU_SOURCE for basename(), add libnotify
+
+        * src/phone-kit/Makefile.am:
+        Add libnotify
+
+        * src/phone-kit/dialer-main.c: (main):
+        Initialise libnotify
+
+        * src/phone-kit/moko-dialer.c: (moko_dialer_init):
+        Use moko_notify_get_default()
+
+        * src/phone-kit/moko-notify.c: (moko_notify_start),
+        (moko_notify_stop), (moko_notify_init), (moko_notify_get_default):
+        * src/phone-kit/moko-notify.h:
+        Add moko_notify_get_default() to share MokoNotify with other objects
+
+        * src/phone-kit/moko-sms.c: (update_notification), (note_added_cb),
+        (note_modified_cb), (note_removed_cb), (sms_store_opened_cb),
+        (moko_sms_init):
+        Add notifications with libnotify
+
 2007-12-04  Thomas Wood  <thomas@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac

@@ -10 +10 @@
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
+AC_GNU_SOURCE
 
 # base deps
@@ -22 +23 @@
 
 PKG_CHECK_MODULES(JANA, libjana libjana-ecal)
+PKG_CHECK_MODULES(NOTIFY, libnotify)
 
 old_cflags=$CFLAGS

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall @DIALER_CFLAGS@ @JANA_CFLAGS@
+AM_CFLAGS = -Wall @DIALER_CFLAGS@ @JANA_CFLAGS@ @NOTIFY_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/src/common
@@ -18 +18 @@
         moko-mcc-dc.h
 
-phone_kit_LDADD = @DIALER_LIBS@ @JANA_LIBS@ $(top_srcdir)/src/common/libdialer-common.a
+phone_kit_LDADD = @DIALER_LIBS@ @JANA_LIBS@ @NOTIFY_LIBS@ $(top_srcdir)/src/common/libdialer-common.a
 
 

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c

@@ -14 +14 @@
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <gtk/gtk.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <glib-object.h>
+#include <libnotify/notify.h>
 
 #include "moko-network.h"
@@ -65 +71 @@
   GError *error = NULL;
   guint32 ret;
+  char *prog;
 
   /* initialise type system */
@@ -111 +118 @@
   /* Initialize Threading & GTK+ */
   gtk_init (&argc, &argv);
+  
+  /* Initialise libnotify */
+  notify_init (basename (argv[0]));
 
   /* Create the PhoneKit objects */

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c

@@ -812 +812 @@
 
   /* Load the notification object */
-  priv->notify = moko_notify_new ();
+  priv->notify = moko_notify_get_default ();
 
 

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-notify.c

@@ -43 +43 @@
 struct _MokoNotifyPrivate
 {
-  gboolean    started;
+  int    started;
 
   /* Sound stuff */
@@ -255 +255 @@
   priv = notify->priv;
 
-  if (priv->started)
-    return;
-  priv->started = TRUE;
+  priv->started ++;
+  if (priv->started != 1)
+    return;
 
   moko_notify_check_brightness ();
@@ -275 +275 @@
   if (!priv->started)
     return;
-  priv->started = FALSE;
-
-  moko_notify_stop_vibrate ();
-  moko_notify_stop_ringtone (notify);
+  priv->started --;
+
+  if (!priv->started) {
+    moko_notify_stop_vibrate ();
+    moko_notify_stop_ringtone (notify);
+  }
 }
 
@@ -314 +316 @@
   priv = notify->priv = MOKO_NOTIFY_GET_PRIVATE (notify);
 
-  priv->started = FALSE;
+  priv->started = 0;
   priv->pac = NULL;
 
@@ -345 +347 @@
 }
 
+MokoNotify*
+moko_notify_get_default (void)
+{
+  static MokoNotify *notify = NULL;
+  
+  if (!notify) notify = moko_notify_new ();
+  
+  return notify;
+}
+

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-notify.h

@@ -67 +67 @@
 moko_notify_new (void);
 
+MokoNotify*
+moko_notify_get_default (void);
+
 void
 moko_notify_start (MokoNotify *notify);

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c

@@ -27 +27 @@
 #include <libjana-ecal/jana-ecal.h>
 
+#include <libnotify/notification.h>
+
+#include <libmokoui2/moko-stock.h>
+
 #include "moko-sms.h"
 #include "moko-network.h"
@@ -64 +68 @@
   gboolean           sms_store_open;
   JanaNote           *last_msg;
+  
+  GList              *unread_uids;
+  NotifyNotification *notification;
 };
 
@@ -401 +408 @@
 
 static void
+update_notification (MokoSms *sms, gboolean show)
+{
+  gchar *body;
+  MokoSmsPrivate *priv = sms->priv;
+  
+  if (!priv->unread_uids) {
+    notify_notification_close (priv->notification, NULL);
+    return;
+  }
+  
+  body = g_strdup_printf ("%d unread message(s)",
+                          g_list_length (priv->unread_uids));
+  g_object_set (G_OBJECT (priv->notification), "body", body, NULL);
+  g_free (body);
+  
+  /* Show notification */
+  if (show) notify_notification_show (priv->notification, NULL);
+}
+
+static void
+note_added_cb (JanaStoreView *store_view, GList *components, MokoSms *sms)
+{
+  MokoSmsPrivate *priv = sms->priv;
+  gboolean update = FALSE;
+  
+  for (; components; components = components->next) {
+    JanaComponent *comp = JANA_COMPONENT (components->data);
+    
+    if (!comp) continue;
+    
+    if (!jana_utils_component_has_category (comp, "Read")) {
+      gchar *uid = jana_component_get_uid (comp);
+      priv->unread_uids = g_list_prepend (priv->unread_uids, uid);
+      update = TRUE;
+    }
+  }
+  
+  /* TODO: Put this in an idle? */
+  if (update) update_notification (sms, TRUE);
+}
+
+static void
+note_modified_cb (JanaStoreView *store_view, GList *components, MokoSms *sms)
+{
+  MokoSmsPrivate *priv = sms->priv;
+  gboolean update = FALSE;
+  
+  for (; components; components = components->next) {
+    gchar *uid;
+    GList *found;
+    JanaComponent *comp = JANA_COMPONENT (components->data);
+    
+    if (!comp) continue;
+    
+    uid = jana_component_get_uid (comp);
+    if ((found = g_list_find_custom (
+         priv->unread_uids, uid, (GCompareFunc)strcmp))) {
+      g_free (uid);
+      if (jana_utils_component_has_category (comp, "Read")) {
+        g_free (found->data);
+        priv->unread_uids = g_list_delete_link (priv->unread_uids, found);
+        update = TRUE;
+      }
+    } else if (!jana_utils_component_has_category (comp, "Read")) {
+      priv->unread_uids = g_list_prepend (priv->unread_uids, uid);
+      update = TRUE;
+    } else {
+      g_free (uid);
+    }
+  }
+  
+  if (update) update_notification (sms, FALSE);
+}
+
+static void
+note_removed_cb (JanaStoreView *store_view, GList *uids, MokoSms *sms)
+{
+  MokoSmsPrivate *priv = sms->priv;
+  gboolean update = FALSE;
+  
+  for (; uids; uids = uids->next) {
+    GList *found = g_list_find_custom (priv->unread_uids, uids->data,
+                                       (GCompareFunc)strcmp);
+    if (found) {
+      g_free (found->data);
+      priv->unread_uids = g_list_delete_link (priv->unread_uids, found);
+      update = TRUE;
+    }
+  }
+  
+  if (update) update_notification (sms, FALSE);
+}
+
+static void
 start_handling_sms (MokoSms *sms)
 {
@@ -422 +523 @@
 sms_store_opened_cb (JanaStore *store, MokoSms *self)
 {
+  JanaStoreView *view;
   MokoSmsPrivate *priv = self->priv;
   priv->sms_store_open = TRUE;
+
+  /* Hook onto added/modified/removed signals for SMS notification */
+  view = jana_store_get_view (store);
+  g_signal_connect (view, "added", G_CALLBACK (note_added_cb), self);
+  g_signal_connect (view, "modified", G_CALLBACK (note_modified_cb), self);
+  g_signal_connect (view, "removed", G_CALLBACK (note_removed_cb), self);
+  jana_store_view_start (view);
 
   if (!priv->handling_sms) start_handling_sms (self);
@@ -436 +545 @@
 
   priv = sms->priv = MOKO_SMS_GET_PRIVATE (sms);
+  priv->notification = notify_notification_new ("New SMS message",
+                                                "",
+                                                MOKO_STOCK_SMS_NEW,
+                                                NULL);
 
   /* Get the SMS note store */