diff options
author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-01 17:18:54 +0200 |
---|---|---|
committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-01 19:13:17 +0200 |
commit | 19de82ca471768b61ada1fe7eec55209b18edb60 (patch) | |
tree | 94819ef2c2bd588f0ce6e4e59dde17003bef0968 | |
parent | f28590bb70cb8ce5a71532bfd4b57afc27186695 (diff) |
modem: removed oface-specific quarks
-rw-r--r-- | modem/call-service.c | 16 | ||||
-rw-r--r-- | modem/call.h | 3 | ||||
-rw-r--r-- | modem/service.c | 4 | ||||
-rw-r--r-- | modem/sim-service.c | 16 | ||||
-rw-r--r-- | modem/sim.h | 3 | ||||
-rw-r--r-- | modem/sms-service.c | 16 | ||||
-rw-r--r-- | modem/sms.h | 2 |
7 files changed, 0 insertions, 60 deletions
diff --git a/modem/call-service.c b/modem/call-service.c index b790d2b..a0884d6 100644 --- a/modem/call-service.c +++ b/modem/call-service.c @@ -90,22 +90,6 @@ struct _ModemCallServicePrivate /* ---------------------------------------------------------------------- */ -GQuark -modem_oface_quark_call_manager (void) -{ - static gsize quark = 0; - - if (g_once_init_enter (&quark)) - { - GQuark q = g_quark_from_static_string (MODEM_OFACE_CALL_MANAGER); - g_once_init_leave (&quark, q); - } - - return quark; -} - -/* ---------------------------------------------------------------------- */ - static void modem_call_service_connect_to_instance (ModemCallService *self, ModemCall *ci); diff --git a/modem/call.h b/modem/call.h index b62925c..085a214 100644 --- a/modem/call.h +++ b/modem/call.h @@ -103,9 +103,6 @@ GType modem_call_get_type (void); #define MODEM_OFACE_CALL_MANAGER "org.ofono.VoiceCallManager" #define MODEM_OFACE_CALL "org.ofono.VoiceCall" -#define MODEM_OFACE_QUARK_CALL_MANAGER modem_oface_quark_call_manager () -GQuark modem_oface_quark_call_manager (void); - /** * Call properties */ diff --git a/modem/service.c b/modem/service.c index 11dcf6b..30bb862 100644 --- a/modem/service.c +++ b/modem/service.c @@ -346,10 +346,6 @@ modem_service_class_init(ModemServiceClass *klass) DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); modem_error_domain_prefix (0); /* Init errors */ - - modem_oface_quark_sim (); - modem_oface_quark_call_manager (); - modem_oface_quark_sms (); } /* ------------------------------------------------------------------------ */ diff --git a/modem/sim-service.c b/modem/sim-service.c index c939cbe..2180c33 100644 --- a/modem/sim-service.c +++ b/modem/sim-service.c @@ -80,22 +80,6 @@ struct _ModemSIMServicePrivate }; /* ------------------------------------------------------------------------ */ - -GQuark -modem_oface_quark_sim (void) -{ - static gsize quark = 0; - - if (g_once_init_enter (&quark)) - { - GQuark q = g_quark_from_static_string (MODEM_OFACE_SIM); - g_once_init_leave (&quark, q); - } - - return quark; -} - -/* ------------------------------------------------------------------------ */ /* Local functions */ /* ------------------------------------------------------------------------ */ diff --git a/modem/sim.h b/modem/sim.h index 7901aad..4a9eb11 100644 --- a/modem/sim.h +++ b/modem/sim.h @@ -66,9 +66,6 @@ GType modem_sim_service_get_type (void); /* ---------------------------------------------------------------------- */ #define MODEM_OFACE_SIM "org.ofono.SimManager" -#define MODEM_OFACE_QUARK_SIM modem_oface_quark_sim () - -GQuark modem_oface_quark_sim (void); enum _ModemSIMState { diff --git a/modem/sms-service.c b/modem/sms-service.c index 8523ebc..268ba32 100644 --- a/modem/sms-service.c +++ b/modem/sms-service.c @@ -93,22 +93,6 @@ struct _ModemSMSServicePrivate /* ------------------------------------------------------------------------ */ -GQuark -modem_oface_quark_sms (void) -{ - static gsize quark = 0; - - if (g_once_init_enter (&quark)) - { - GQuark q = g_quark_from_static_string (MODEM_OFACE_SMS); - g_once_init_leave (&quark, q); - } - - return quark; -} - -/* ------------------------------------------------------------------------ */ - static void modem_sms_incoming_deliver (ModemSMSService *self, SMSGDeliver *deliver); static void on_incoming_message (DBusGProxy *, char const *, GHashTable *, gpointer); diff --git a/modem/sms.h b/modem/sms.h index 09f98ce..6470ad7 100644 --- a/modem/sms.h +++ b/modem/sms.h @@ -66,8 +66,6 @@ GType modem_sms_service_get_type (void); /* ---------------------------------------------------------------------- */ #define MODEM_OFACE_SMS "org.ofono.MessageManager" -#define MODEM_OFACE_QUARK_SMS modem_oface_quark_sms () -GQuark modem_oface_quark_sms (void); typedef void ModemSMSConnectedHandler (ModemSMSService *, gpointer); typedef void ModemSMSDeliverHandler (ModemSMSService *, |