r3902 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/phone-kit

[chris at sita.openmoko.org]

Author: chris
Date: 2008-01-21 17:05:58 +0100 (Mon, 21 Jan 2008)
New Revision: 3902

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-dbus.xml
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms-marshal.list
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
Log:
        * src/phone-kit/moko-sms-dbus.xml:
        * src/phone-kit/moko-sms-marshal.list:
        * src/phone-kit/moko-sms.c: (moko_sms_class_init), (on_error),
        (memory_check_idle):
        Separate MemoryFull signal into separate phone and sim memory signals,
        to avoid custom marshaller and ease client-side usage


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-01-21 15:54:18 UTC (rev 3901)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-01-21 16:05:58 UTC (rev 3902)
@@ -1,5 +1,14 @@
 2008-01-21  Chris Lord  <chris at openedhand.com>
 
+	* src/phone-kit/moko-sms-dbus.xml:
+	* src/phone-kit/moko-sms-marshal.list:
+	* src/phone-kit/moko-sms.c: (moko_sms_class_init), (on_error),
+	(memory_check_idle):
+	Separate MemoryFull signal into separate phone and sim memory signals,
+	to avoid custom marshaller and ease client-side usage
+
+2008-01-21  Chris Lord  <chris at openedhand.com>
+
 	* src/phone-kit/moko-sms.c: (memory_check_idle):
 	Removing free file handles check for now
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms-dbus.xml
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms-dbus.xml	2008-01-21 15:54:18 UTC (rev 3901)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms-dbus.xml	2008-01-21 16:05:58 UTC (rev 3902)
@@ -21,10 +21,13 @@
     <arg type="i" name="status" />
   </signal>
 
-  <signal name="MemoryFull">
-    <arg type="b" name="sim" />
-    <arg type="b" name="phone" />
+  <signal name="SimMemoryState">
+    <arg type="b" name="full" />
   </signal>
 
+  <signal name="PhoneMemoryState">
+    <arg type="b" name="full" />
+  </signal>
+
 </interface>
 </node>

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms-marshal.list
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms-marshal.list	2008-01-21 15:54:18 UTC (rev 3901)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms-marshal.list	2008-01-21 16:05:58 UTC (rev 3902)
@@ -1 +0,0 @@
-VOID:BOOLEAN,BOOLEAN

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	2008-01-21 15:54:18 UTC (rev 3901)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c	2008-01-21 16:05:58 UTC (rev 3902)
@@ -55,6 +55,7 @@
 enum
 {
   STATUS_CHANGED,
+  SIM_FULL,
   MEMORY_FULL,
   
   LAST_SIGNAL
@@ -238,20 +239,27 @@
                   G_TYPE_NONE, 
                   1, G_TYPE_INT);
 
+  signals[SIM_FULL] =
+    g_signal_new ("sim_memory_state", 
+                  G_TYPE_FROM_CLASS (obj_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (MokoSmsClass, memory_full),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__BOOLEAN,
+                  G_TYPE_NONE, 
+                  1, G_TYPE_BOOLEAN);
+
   signals[MEMORY_FULL] =
-    g_signal_new ("memory_full", 
+    g_signal_new ("phone_memory_state", 
                   G_TYPE_FROM_CLASS (obj_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (MokoSmsClass, memory_full),
                   NULL, NULL,
-                  _moko_sms_marshal_VOID__BOOLEAN_BOOLEAN,
+                  g_cclosure_marshal_VOID__BOOLEAN,
                   G_TYPE_NONE, 
-                  2, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+                  1, G_TYPE_BOOLEAN);
 
   g_type_class_add_private (obj_class, sizeof (MokoSmsPrivate));
-  dbus_g_object_register_marshaller (_moko_sms_marshal_VOID__BOOLEAN_BOOLEAN,
-                                     G_TYPE_NONE, G_TYPE_BOOLEAN,
-                                     G_TYPE_BOOLEAN, G_TYPE_INVALID);
   dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), 
                                    &dbus_glib_moko_sms_object_info);
 }
@@ -440,8 +448,10 @@
   MokoSmsPrivate *priv = ((MokoSms *)listener)->priv;
 
   if (cms == 322) {
-    priv->sim_full = TRUE;
-    g_signal_emit (listener, signals[MEMORY_FULL], 0, TRUE, priv->memory_full);
+    if (!priv->sim_full) {
+      priv->sim_full = TRUE;
+      g_signal_emit (listener, signals[SIM_FULL], 0, TRUE);
+    }
   }
 }
 
@@ -656,14 +666,14 @@
       (buf.f_ffree < 100)*/) {
     if (!priv->memory_full) {
       priv->memory_full = TRUE;
-      g_signal_emit (sms, signals[MEMORY_FULL], 0, priv->sim_full, TRUE);
+      g_signal_emit (sms, signals[MEMORY_FULL], 0, TRUE);
       if (priv->sms_store) {
         stop_handling_sms (sms);
       }
     }
   } else if (priv->memory_full) {
     priv->memory_full = FALSE;
-    g_signal_emit (sms, signals[MEMORY_FULL], 0, priv->sim_full, FALSE);
+    g_signal_emit (sms, signals[MEMORY_FULL], 0, FALSE);
     open_sms_store (sms);
   }