[pkg-fso-commits] [SCM] libframeworkd-phonegui branch, upstream, updated. 640da47bfcff755388d0fb8f443eb34e0dea3c72

[quickdev]

The following commit has been merged in the upstream branch:
commit 1c1c1cd7b263bc4995c033bc57771a6b544e3615
Author: quickdev <niklas.coding at gmail.com>
Date:   Tue Dec 23 15:04:54 2008 +0100

    Followed libframeworkd-glib API changes.

diff --git a/openmoko-contacts3/src/contacts-main.c b/openmoko-contacts3/src/contacts-main.c
index 9755ee8..080e082 100644
--- a/openmoko-contacts3/src/contacts-main.c
+++ b/openmoko-contacts3/src/contacts-main.c
@@ -27,7 +27,7 @@
 
 int main(int argc, char **argv) {
     /* Connect to frameworkd */
-    connect_to_frameworkd();
+    frameworkd_handler_connect(frameworkd_handler_new());
 
     /* Load, connect and initiate phonegui */
     phonegui_load(CONFIG_FILE);
@@ -51,17 +51,6 @@ gboolean start() {
     return FALSE;
 }
 
-void connect_to_frameworkd() {
-    FrameworkdHandlers fwHandler;
-    fwHandler.networkStatus = NULL;
-    fwHandler.networkSignalStrength = NULL;
-    fwHandler.simAuthStatus = NULL;
-    fwHandler.simIncomingStoredMessage = NULL;
-    fwHandler.callCallStatus = NULL;
-    fwHandler.deviceIdleNotifierState = NULL;
-    dbus_connect_to_bus(&fwHandler);
-}
-
 void exit_callback() {
     g_debug("exit_callback()");
     phonegui_contacts_hide();
diff --git a/openmoko-dialer3/src/dialer-main.c b/openmoko-dialer3/src/dialer-main.c
index b3b5ddf..f80d8f5 100644
--- a/openmoko-dialer3/src/dialer-main.c
+++ b/openmoko-dialer3/src/dialer-main.c
@@ -26,7 +26,7 @@
 
 int main(int argc, char **argv) {
     /* Connect to frameworkd */
-    connect_to_frameworkd();
+    frameworkd_handler_connect(frameworkd_handler_new());
 
     /* Load, connect and initiate phonegui */
     phonegui_load("openmoko-dialer3");
@@ -50,17 +50,6 @@ gboolean start() {
     return FALSE;
 }
 
-void connect_to_frameworkd() {
-    FrameworkdHandlers fwHandler;
-    fwHandler.networkStatus = NULL;
-    fwHandler.networkSignalStrength = NULL;
-    fwHandler.simAuthStatus = NULL;
-    fwHandler.simIncomingStoredMessage = NULL;
-    fwHandler.callCallStatus = NULL;
-    fwHandler.deviceIdleNotifierState = NULL;
-    dbus_connect_to_bus(&fwHandler);
-}
-
 void exit_callback() {
     exit(EXIT_SUCCESS);
 }
diff --git a/openmoko-messages3/src/messages-main.c b/openmoko-messages3/src/messages-main.c
index d609e04..c319d32 100644
--- a/openmoko-messages3/src/messages-main.c
+++ b/openmoko-messages3/src/messages-main.c
@@ -25,7 +25,7 @@
 
 int main(int argc, char **argv) {
     /* Connect to frameworkd */
-    connect_to_frameworkd();
+    frameworkd_handler_connect(frameworkd_handler_new());
 
     /* Load, connect and initiate phonegui */
     phonegui_load("openmoko-messages3");
@@ -49,17 +49,6 @@ gboolean start() {
     return FALSE;
 }
 
-void connect_to_frameworkd() {
-    FrameworkdHandlers fwHandler;
-    fwHandler.networkStatus = NULL;
-    fwHandler.networkSignalStrength = NULL;
-    fwHandler.simAuthStatus = NULL;
-    fwHandler.simIncomingStoredMessage = NULL;
-    fwHandler.callCallStatus = NULL;
-    fwHandler.deviceIdleNotifierState = NULL;
-    dbus_connect_to_bus(&fwHandler);
-}
-
 void exit_callback() {
     exit(EXIT_SUCCESS);
 }
diff --git a/ophonekitd/src/ophonekitd-main.c b/ophonekitd/src/ophonekitd-main.c
index 6596b00..98674ad 100644
--- a/ophonekitd/src/ophonekitd-main.c
+++ b/ophonekitd/src/ophonekitd-main.c
@@ -51,7 +51,7 @@ GHashTable *contact_cache = NULL;
 
 int main(int argc, char ** argv) {
     GMainLoop *mainloop = NULL;
-    FrameworkdHandlers fwHandler;
+    FrameworkdHandler *fwHandler;
     DBusGConnection *bus = NULL;
     DBusGProxy *bus_proxy = NULL;
 
@@ -66,13 +66,12 @@ int main(int argc, char ** argv) {
     g_debug("Phonelog database initiated");
 
     /* Register dbus handlers */
-    fwHandler.networkStatus = NULL;
-    fwHandler.networkSignalStrength = NULL;
-    fwHandler.simAuthStatus = ophonekitd_sim_auth_status_handler;
-    fwHandler.simIncomingStoredMessage = ophonekitd_sim_incoming_stored_message_handler;
-    fwHandler.callCallStatus = ophonekitd_call_status_handler;
-    fwHandler.deviceIdleNotifierState = ophonekitd_device_idle_notifier_state_handler;
-    fwHandler.incomingUssd = ophonekitd_incoming_ussd_handler;
+    fwHandler = frameworkd_handler_new();
+    fwHandler->simAuthStatus = ophonekitd_sim_auth_status_handler;
+    fwHandler->simIncomingStoredMessage = ophonekitd_sim_incoming_stored_message_handler;
+    fwHandler->callCallStatus = ophonekitd_call_status_handler;
+    fwHandler->deviceIdleNotifierState = ophonekitd_device_idle_notifier_state_handler;
+    fwHandler->incomingUssd = ophonekitd_incoming_ussd_handler;
 
     if (!g_thread_supported ())
         g_thread_init (NULL);
@@ -85,7 +84,7 @@ int main(int argc, char ** argv) {
     
     ophonekitd_dbus_start();
     
-    dbus_connect_to_bus(&fwHandler);
+    frameworkd_handler_connect(fwHandler);
     g_debug("Connected to the buses");
     
     /* Start glib main loop and run list_resources() */

-- 
libframeworkd-phonegui