[pkg-fso-commits] [SCM] libframeworkd-glib branch, master, updated. ad3bb0a5bb521ce8de424cf5ca702f23731c6333

[quickdev]

The following commit has been merged in the master branch:
commit ad3bb0a5bb521ce8de424cf5ca702f23731c6333
Author: quickdev <niklas.coding at gmail.com>
Date:   Tue Dec 23 15:00:22 2008 +0100

    API Breackage! Renamed new_frameworkd_handler() to frameworkd_handler_new() and dbus_connect_to_bus() to frameworkd_handler_connect().

diff --git a/src/frameworkd-glib-dbus.c b/src/frameworkd-glib-dbus.c
index d60eb9e..2029386 100644
--- a/src/frameworkd-glib-dbus.c
+++ b/src/frameworkd-glib-dbus.c
@@ -102,7 +102,73 @@ GError* dbus_handle_internal_errors(GError *error) {
     return g_error_new (FRAMEWORKD_GLIB_DBUS_ERROR, dbusError, error->message);
 }
 
-void dbus_connect_to_bus(FrameworkdHandlers* frameworkdHandler ) {
+DBusGProxy *dbus_connect_to_interface(char *bus_name, char *path, char *interface, char *interface_name) {
+    DBusGProxy *itf = NULL;
+    if(bus != NULL) {
+        itf = dbus_g_proxy_new_for_name (bus, bus_name, path, interface);
+        if(itf == NULL) {
+            printf("Couln't connect to the %s Interface", interface_name);
+        }
+    }
+    return itf;
+}
+
+void dbus_free_data(GType type, gpointer data) {
+    GValue foo;
+    g_value_init(&foo, type);
+    g_value_take_boxed(&foo, data);
+    g_value_unset(&foo);
+}
+
+GType dbus_get_type_g_string_variant_hashtable() {
+    static GType foo = 0; 
+    if (G_UNLIKELY (foo ==0)) 
+        foo = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
+    return foo;
+}
+GType dbus_get_type_g_string_int_int_int_array() {
+    static GType foo = 0;
+    if (G_UNLIKELY (foo ==0))
+        foo = dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID)); 
+    return foo;
+}
+GType dbus_get_type_int_g_string_g_string_variant_hashtable_array() {
+    static GType foo = 0;
+    if (G_UNLIKELY (foo ==0))
+        foo = dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_STRING, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), G_TYPE_INVALID)); 
+    return foo;
+}
+
+GType dbus_get_type_int_g_string_g_string_g_string_array() {
+    static GType foo = 0;
+    if (G_UNLIKELY (foo ==0))
+        foo = dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID));
+    return foo;
+}
+
+
+FrameworkdHandler *frameworkd_handler_new() {
+        FrameworkdHandler *h = NULL;
+        h = malloc(sizeof(FrameworkdHandler));
+        if(h == NULL) {
+                g_debug("Couldn't alloc frameworkdHandler.");
+                return NULL;
+        }
+        
+        h->networkStatus = NULL;
+        h->networkSignalStrength = NULL;
+        h->simAuthStatus = NULL;
+        h->simIncomingStoredMessage = NULL;
+        h->callCallStatus = NULL;
+        h->deviceIdleNotifierState = NULL;
+        h->incomingUssd = NULL;
+
+        return h;
+}
+
+
+
+void frameworkd_handler_connect(FrameworkdHandler* frameworkdHandler ) {
     if(frameworkdHandler != NULL)
         fwdHandlers = frameworkdHandler;
 
@@ -188,67 +254,3 @@ void dbus_connect_to_bus(FrameworkdHandlers* frameworkdHandler ) {
     }
 }
 
-
-DBusGProxy *dbus_connect_to_interface(char *bus_name, char *path, char *interface, char *interface_name) {
-    DBusGProxy *itf = NULL;
-    if(bus != NULL) {
-        itf = dbus_g_proxy_new_for_name (bus, bus_name, path, interface);
-        if(itf == NULL) {
-            printf("Couln't connect to the %s Interface", interface_name);
-        }
-    }
-    return itf;
-}
-
-void dbus_free_data(GType type, gpointer data) {
-    GValue foo;
-    g_value_init(&foo, type);
-    g_value_take_boxed(&foo, data);
-    g_value_unset(&foo);
-}
-
-GType dbus_get_type_g_string_variant_hashtable() {
-    static GType foo = 0; 
-    if (G_UNLIKELY (foo ==0)) 
-        foo = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
-    return foo;
-}
-GType dbus_get_type_g_string_int_int_int_array() {
-    static GType foo = 0;
-    if (G_UNLIKELY (foo ==0))
-        foo = dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID)); 
-    return foo;
-}
-GType dbus_get_type_int_g_string_g_string_variant_hashtable_array() {
-    static GType foo = 0;
-    if (G_UNLIKELY (foo ==0))
-        foo = dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_STRING, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), G_TYPE_INVALID)); 
-    return foo;
-}
-
-GType dbus_get_type_int_g_string_g_string_g_string_array() {
-    static GType foo = 0;
-    if (G_UNLIKELY (foo ==0))
-        foo = dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID));
-    return foo;
-}
-
-FrameworkdHandlers *new_frameworkd_handler() {
-        FrameworkdHandlers *frameworkdHandler= NULL;
-        frameworkdHandler = malloc(sizeof(FrameworkdHandlers));
-        if(frameworkdHandler == NULL) {
-                g_debug("Couldn't alloc frameworkdHandler.");
-                return NULL;
-        }
-        
-        frameworkdHandler->networkStatus = NULL;
-        frameworkdHandler->networkSignalStrength = NULL;
-        frameworkdHandler->simAuthStatus = NULL;
-        frameworkdHandler->simIncomingStoredMessage = NULL;
-        frameworkdHandler->callCallStatus = NULL;
-        frameworkdHandler->deviceIdleNotifierState = NULL;
-        frameworkdHandler->incomingUssd = NULL;
-
-        return frameworkdHandler;
-}
-
diff --git a/src/frameworkd-glib-dbus.h b/src/frameworkd-glib-dbus.h
index b64f318..fa35869 100644
--- a/src/frameworkd-glib-dbus.h
+++ b/src/frameworkd-glib-dbus.h
@@ -38,11 +38,10 @@ typedef struct {
     void (*callCallStatus)(const int, const int, GHashTable *);
     void (*deviceIdleNotifierState)(const int);
     void (*incomingUssd)(int, const char*);
-} FrameworkdHandlers;
+} FrameworkdHandler;
 
 void lose (const char *str, ...);
 void lose_gerror (const char *prefix, GError *error);
-void dbus_connect_to_bus(FrameworkdHandlers* fwHandler);
 DBusGProxy *dbus_connect_to_interface(char *bus_name, char *path, char *interface, char *interface_name);
 GType dbus_get_type_g_string_variant_hashtable();
 GType dbus_get_type_g_string_int_int_int_array();
@@ -51,7 +50,9 @@ GType dbus_get_type_int_g_string_g_string_g_string_array();
 void dbus_free_data(GType type, gpointer data);
 GError* dbus_handle_errors(GError *dbus_error);
 GError* dbus_handle_internal_errors(GError *error);
-FrameworkdHandlers *new_frameworkd_handler();
-FrameworkdHandlers *fwdHandlers;
+
+FrameworkdHandler *frameworkd_handler_new();
+void frameworkd_handler_connect(FrameworkdHandler* frameworkdHandler);
+FrameworkdHandler *fwdHandlers;
 
 #endif

-- 
libframeworkd-glib