diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2010-11-04 23:37:02 +0200 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2010-11-05 16:08:53 +0200 |
| commit | 82e6a64450da35aa7d31be2bb66420233c281c86 (patch) | |
| tree | 4893f4d5e1929031d2a7a58e5a529b6b2f2b1b10 | |
| parent | 5488a82753f70a84e0c13861c71006f24f6b382a (diff) | |
ring-emergency-service: do not abuse const
| -rw-r--r-- | src/ring-emergency-service.c | 13 | ||||
| -rw-r--r-- | src/ring-emergency-service.h | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/ring-emergency-service.c b/src/ring-emergency-service.c index 8d81c89..2b5db20 100644 --- a/src/ring-emergency-service.c +++ b/src/ring-emergency-service.c @@ -65,7 +65,7 @@ ring_emergency_service_free(RingEmergencyService *service) /* Return a pointer to a boxed service struct */ RingEmergencyServiceInfo * ring_emergency_service_info_new(char const *service, - char const * const *aliases) + char * const *aliases) { RingEmergencyService *es; GValue value[1] = {{ 0 }}; @@ -117,10 +117,11 @@ ring_emergency_service_info_list_free(RingEmergencyServiceInfoList *list) } RingEmergencyServiceInfoList * -ring_emergency_service_info_list_default(char const * const * numbers) +ring_emergency_service_info_list_default (char * const *numbers) { - return ring_emergency_service_info_list_new( - ring_emergency_service_info_new(RING_EMERGENCY_SERVICE_URN, - numbers), - NULL); + RingEmergencyServiceInfo *base; + + base = ring_emergency_service_info_new(RING_EMERGENCY_SERVICE_URN, numbers); + + return ring_emergency_service_info_list_new(base, NULL); } diff --git a/src/ring-emergency-service.h b/src/ring-emergency-service.h index 254a160..0c5ad87 100644 --- a/src/ring-emergency-service.h +++ b/src/ring-emergency-service.h @@ -39,7 +39,7 @@ RingEmergencyService *ring_emergency_service_new(char const *service); void ring_emergency_service_free(RingEmergencyService *service); RingEmergencyServiceInfo *ring_emergency_service_info_new(char const *service, - char const * const *aliases); + char * const *aliases); void ring_emergency_service_info_free(RingEmergencyServiceInfo *service); @@ -49,7 +49,7 @@ RingEmergencyServiceInfoList *ring_emergency_service_info_list_new( void ring_emergency_service_info_list_free(RingEmergencyServiceInfoList *); RingEmergencyServiceInfoList *ring_emergency_service_info_list_default( - char const * const *numbers); + char * const *numbers); G_END_DECLS |