Changeset 3903

Timestamp:

01/21/08 17:10:20 (5 years ago)

Author:

chris

Message:

• src/openmoko-panel-memory.c: (update), (sim_full_cb), (phone_full_cb), (mb_panel_applet_create): Update to match new dbus API

Location:

trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory

Files:

• ChangeLog (modified) (1 diff)
• src/openmoko-panel-memory.c (modified) (6 diffs)

trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog

@@ +1 @@
+2008-01-21  Chris Lord  <chris@openedhand.com>
+
+        * src/openmoko-panel-memory.c: (update), (sim_full_cb),
+        (phone_full_cb), (mb_panel_applet_create):
+        Update to match new dbus API
+
 2008-01-21  Chris Lord  <chris@openedhand.com>
 

trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c

@@ -29 +29 @@
         
         guint blink_idle;
+        
+        gboolean sim_full;
+        gboolean phone_full;
 } MemoryAppletData;
 
@@ -41 +44 @@
 
 static void
-memory_full_cb (DBusGProxy *proxy, gboolean sim_full, gboolean phone_full,
-                MemoryAppletData *data)
+update (MemoryAppletData *data)
 {
-        if (sim_full || phone_full) {
+        if (data->sim_full || data->phone_full) {
                 const gchar *message;
                 
@@ -53 +55 @@
                 }
                 
-                if (sim_full && phone_full) {
+                if (data->sim_full && data->phone_full) {
                         message = "Phone and SIM memory full";
-                } else if (sim_full) {
+                } else if (data->sim_full) {
                         message = "SIM memory full";
                 } else {
@@ -72 +74 @@
                 notify_notification_close (data->notification, NULL);
         }
+}
+
+static void
+sim_full_cb (DBusGProxy *proxy, gboolean full, MemoryAppletData *data)
+{
+        data->sim_full = full;
+        update (data);
+}
+
+static void
+phone_full_cb (DBusGProxy *proxy, gboolean full, MemoryAppletData *data)
+{
+        data->phone_full = full;
+        update (data);
 }
 
@@ -94 +110 @@
                 "org.openmoko.PhoneKit.Sms");
         
-        dbus_g_proxy_add_signal (data->sms_proxy, "MemoryFull",
-                G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_INVALID);
-        dbus_g_proxy_connect_signal (data->sms_proxy, "MemoryFull",
-                G_CALLBACK (memory_full_cb), data, NULL);
+        dbus_g_proxy_add_signal (data->sms_proxy, "SimMemoryState",
+                G_TYPE_BOOLEAN, G_TYPE_INVALID);
+        dbus_g_proxy_add_signal (data->sms_proxy, "PhoneMemoryState",
+                G_TYPE_BOOLEAN, G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal (data->sms_proxy, "SimMemoryState",
+                G_CALLBACK (sim_full_cb), data, NULL);
+        dbus_g_proxy_connect_signal (data->sms_proxy, "PhoneMemoryState",
+                G_CALLBACK (phone_full_cb), data, NULL);
         
         notify_init ("openmoko-panel-memory");
@@ -110 +130 @@
         moko_panel_applet_set_widget (data->applet, data->image);
         
+        if (!dbus_g_proxy_call (data->sms_proxy, "GetMemoryStatus", &error,
+             G_TYPE_INVALID, G_TYPE_BOOLEAN, &data->sim_full,
+             G_TYPE_BOOLEAN, &data->phone_full, G_TYPE_INVALID)) {
+                g_warning ("Error calling GetMemoryStatus: %s", error->message);
+                g_error_free (error);
+        } else {
+                update (data);
+        }
+        
         return GTK_WIDGET (data->applet);
 }