[pkg-fso-commits] [SCM] libframeworkd-glib branch, master, updated. ad3bb0a5bb521ce8de424cf5ca702f23731c6333
Julien 'Ainulindale' Cassignol
ainulindale at gmail.com
Sat Dec 27 20:46:38 UTC 2008
The following commit has been merged in the master branch:
commit 703017c8f874a325d917931378071c614597110e
Author: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>
Date: Mon Dec 1 14:23:26 2008 +0100
* Implemented a FrameworkdHandlers constructor, in order to avoid duplication.
* Corrected a typo in frameworkd-glib-ogsmd-sim.[c|h]. Thanks to "gotterdammerung"
diff --git a/src/frameworkd-glib-dbus.c b/src/frameworkd-glib-dbus.c
index 74aaf6a..9370201 100644
--- a/src/frameworkd-glib-dbus.c
+++ b/src/frameworkd-glib-dbus.c
@@ -94,10 +94,13 @@ GError* dbus_handle_internal_errors(GError *error) {
} else {
lose_gerror("Unknown internal dbus error", error);
}
+ //dbus_connect_to_bus(NULL);
return g_error_new (DBUS_ERROR, dbusError, error->message);
}
-void dbus_connect_to_bus(FrameworkdHandlers* fwHandler ) {
+void dbus_connect_to_bus(FrameworkdHandlers* frameworkdHandler ) {
+ if(frameworkdHandler != NULL)
+ fwdHandlers = frameworkdHandler;
GError *error = NULL;
g_type_init ();
@@ -109,9 +112,7 @@ void dbus_connect_to_bus(FrameworkdHandlers* fwHandler ) {
fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
g_log_set_always_fatal (fatal_mask);
}
-#ifdef DEBUG
- printf("Trying to get the system bus\n");
-#endif
+ g_debug("Trying to get the system bus");
bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
@@ -123,66 +124,52 @@ void dbus_connect_to_bus(FrameworkdHandlers* fwHandler ) {
dbus_g_object_register_marshaller (g_cclosure_user_marshal_VOID__UINT_BOOLEAN_STRING, G_TYPE_NONE, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__INT, G_TYPE_NONE, G_TYPE_INT, G_TYPE_INVALID);
- if(fwHandler != NULL) {
-#ifdef DEBUG
- printf("Adding signals.\n");
-#endif
- if(fwHandler->networkStatus != NULL) {
+ if(frameworkdHandler != NULL) {
+ g_debug("Adding signals.");
+ if(frameworkdHandler->networkStatus != NULL) {
dbus_connect_to_ogsmd_network();
dbus_g_proxy_add_signal (networkBus, "Status", dbus_get_type_g_string_variant_hashtable(), G_TYPE_INVALID);
dbus_g_proxy_connect_signal (networkBus, "Status", G_CALLBACK (ogsmd_network_status_handler),
- fwHandler->networkStatus, NULL);
+ frameworkdHandler->networkStatus, NULL);
-#ifdef DEBUG
- printf("Added network Status.\n");
-#endif
+ g_debug("Added network Status.");
}
- if(fwHandler->networkSignalStrength != NULL) {
+ if(frameworkdHandler->networkSignalStrength != NULL) {
dbus_connect_to_ogsmd_network();
dbus_g_proxy_add_signal (networkBus, "SignalStrength", G_TYPE_UINT , G_TYPE_INVALID);
dbus_g_proxy_connect_signal (networkBus, "SignalStrength", G_CALLBACK (ogsmd_network_signal_strength_handler),
- fwHandler->networkSignalStrength, NULL);
-#ifdef DEBUG
- printf("Added network SignalStrength.\n");
-#endif
+ frameworkdHandler->networkSignalStrength, NULL);
+ g_debug("Added network SignalStrength.");
}
- if(fwHandler->simAuthStatus != NULL) {
+ if(frameworkdHandler->simAuthStatus != NULL) {
dbus_connect_to_ogsmd_sim();
dbus_g_proxy_add_signal (simBus, "AuthStatus", G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (simBus, "AuthStatus", G_CALLBACK (ogsmd_sim_auth_status_handler),
- fwHandler->simAuthStatus, NULL);
-#ifdef DEBUG
- printf("Added sim AuthStatus.\n");
-#endif
+ frameworkdHandler->simAuthStatus, NULL);
+ g_debug("Added sim AuthStatus.");
}
- if(fwHandler->simIncomingStoredMessage != NULL) {
+ if(frameworkdHandler->simIncomingStoredMessage != NULL) {
dbus_connect_to_ogsmd_sim();
dbus_g_proxy_add_signal (simBus, "IncomingStoredMessage", G_TYPE_INT, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (simBus, "IncomingStoredMessage", G_CALLBACK (ogsmd_sim_incoming_stored_message_handler),
- fwHandler->simIncomingStoredMessage, NULL);
-#ifdef DEBUG
- printf("Added sim IncomingStoredMessage.\n");
-#endif
+ frameworkdHandler->simIncomingStoredMessage, NULL);
+ g_debug("Added sim IncomingStoredMessage.");
}
- if(fwHandler->callCallStatus != NULL) {
+ if(frameworkdHandler->callCallStatus != NULL) {
dbus_connect_to_ogsmd_call();
dbus_g_proxy_add_signal (callBus, "CallStatus", G_TYPE_INT, G_TYPE_STRING, dbus_get_type_g_string_variant_hashtable(), G_TYPE_INVALID);
dbus_g_proxy_connect_signal (callBus, "CallStatus", G_CALLBACK (ogsmd_call_status_handler),
- fwHandler->callCallStatus, NULL);
-#ifdef DEBUG
- printf("Added call CallStatus.\n");
-#endif
+ frameworkdHandler->callCallStatus, NULL);
+ g_debug("Added call CallStatus.");
}
- if(fwHandler->deviceIdleNotifierState != NULL) {
+ if(frameworkdHandler->deviceIdleNotifierState != NULL) {
dbus_connect_to_odeviced_idle_notifier();
dbus_g_proxy_add_signal (odevicedIdleNotifierBus, "State", G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (odevicedIdleNotifierBus, "State", G_CALLBACK (odeviced_idle_notifier_state_handler),
- fwHandler->deviceIdleNotifierState, NULL);
-#ifdef DEBUG
- printf("Added device Idle Notifier State.\n");
-#endif
+ frameworkdHandler->deviceIdleNotifierState, NULL);
+ g_debug("Added device Idle Notifier State.");
}
}
@@ -232,3 +219,22 @@ GType dbus_get_type_int_g_string_g_string_g_string_array() {
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;
+
+ return frameworkdHandler;
+}
+
diff --git a/src/frameworkd-glib-dbus.h b/src/frameworkd-glib-dbus.h
index 8b545fa..99afc5b 100644
--- a/src/frameworkd-glib-dbus.h
+++ b/src/frameworkd-glib-dbus.h
@@ -50,5 +50,7 @@ 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;
#endif
diff --git a/src/ogsmd/frameworkd-glib-ogsmd-sim.c b/src/ogsmd/frameworkd-glib-ogsmd-sim.c
index ab62d16..5afb9c6 100644
--- a/src/ogsmd/frameworkd-glib-ogsmd-sim.c
+++ b/src/ogsmd/frameworkd-glib-ogsmd-sim.c
@@ -198,15 +198,15 @@ void ogsmd_sim_change_auth_code_callback(DBusGProxy* bus, GError *dbus_error, gp
g_free(data);
}
-void ogsmd_sim_change_auth_code(const char* old, const char* new, void (*callback)(GError*, gpointer), gpointer userdata) {
+void ogsmd_sim_change_auth_code(const char* old_code, const char* new_code, void (*callback)(GError*, gpointer), gpointer userdata) {
dbus_connect_to_ogsmd_sim();
ogsmd_sim_change_auth_code_data_t *data = g_malloc (sizeof (ogsmd_sim_change_auth_code_data_t));
data->callback = callback;
data->userdata = userdata;
- if(old != NULL && new != NULL)
- org_freesmartphone_GSM_SIM_change_auth_code_async(simBus, old, new, ogsmd_sim_change_auth_code_callback, data);
+ if(old_code != NULL && new_code != NULL)
+ org_freesmartphone_GSM_SIM_change_auth_code_async(simBus, old_code, new_code, ogsmd_sim_change_auth_code_callback, data);
}
typedef struct
diff --git a/src/ogsmd/frameworkd-glib-ogsmd-sim.h b/src/ogsmd/frameworkd-glib-ogsmd-sim.h
index 1d8f44d..f0d9532 100644
--- a/src/ogsmd/frameworkd-glib-ogsmd-sim.h
+++ b/src/ogsmd/frameworkd-glib-ogsmd-sim.h
@@ -63,7 +63,7 @@ void ogsmd_sim_send_auth_code(const char* pin, void (*callback)(GError*, gpointe
void ogsmd_sim_unlock(const char* puk, const char* pin, void (*callback)(GError*, gpointer), gpointer userdata);
-void ogsmd_sim_change_auth_code(const char* old, const char* new, void (*callback)(GError*, gpointer), gpointer userdata);
+void ogsmd_sim_change_auth_code(const char* old_code, const char* new_code, void (*callback)(GError*, gpointer), gpointer userdata);
void ogsmd_sim_retrieve_message(const int index, void (*callback)(GError*, char* status, char* number, char* content, GHashTable*properties, gpointer), gpointer userdata);
--
libframeworkd-glib
More information about the pkg-fso-commits
mailing list