[maemo-commits] [maemo-commits] r10333 - projects/haf/trunk/libosso/src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-03-02 17:16:50 +0200 (Fri, 02 Mar 2007)
New Revision: 10333

Modified:
   projects/haf/trunk/libosso/src/libosso.h
   projects/haf/trunk/libosso/src/osso-locale.c
Log:
some minor tunings


Modified: projects/haf/trunk/libosso/src/libosso.h
===================================================================
--- projects/haf/trunk/libosso/src/libosso.h	2007-03-02 15:00:42 UTC (rev 10332)
+++ projects/haf/trunk/libosso/src/libosso.h	2007-03-02 15:16:50 UTC (rev 10333)
@@ -875,7 +875,7 @@
 }
  * @endcode
  */
-typedef void(osso_locale_change_cb_f)(char *new_locale, gpointer data);
+typedef void(osso_locale_change_cb_f)(const char *new_locale, gpointer data);
 
 /**
  * This function registers a callback that is called whenever the locale is
@@ -901,7 +901,7 @@
  * @return #OSSO_OK if all goes well, #OSSO_ERROR if an error occurred, or
  * #OSSO_INVALID if new_locale is NULL or the osso context is invalid.
  */
-osso_return_t osso_locale_set(osso_context_t *osso, char *new_locale);
+osso_return_t osso_locale_set(osso_context_t *osso, const char *new_locale);
 
 /* @}*/
 /**

Modified: projects/haf/trunk/libosso/src/osso-locale.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-locale.c	2007-03-02 15:00:42 UTC (rev 10332)
+++ projects/haf/trunk/libosso/src/osso-locale.c	2007-03-02 15:16:50 UTC (rev 10333)
@@ -79,7 +79,7 @@
 }
 
 /************************************************************************/
-osso_return_t osso_locale_set(osso_context_t *osso, char *new_locale)
+osso_return_t osso_locale_set(osso_context_t *osso, const char *new_locale)
 {
   DBusMessage* m = NULL;
   dbus_bool_t ret = FALSE;
@@ -91,7 +91,8 @@
   }
 
   /* send a signal about the locale change */
-  m = dbus_message_new_signal(LOCALE_CHANGED_PATH, LOCALE_CHANGED_INTERFACE, LOCALE_CHANGED_SIG_NAME);
+  m = dbus_message_new_signal(LOCALE_CHANGED_PATH, LOCALE_CHANGED_INTERFACE,
+                              LOCALE_CHANGED_SIG_NAME);
   if (m == NULL) {
       ULOG_ERR_F("dbus_message_new_signal failed");
       return OSSO_ERROR;
@@ -122,20 +123,22 @@
                                     _osso_callback_data_t *ot,
                                     muali_bus_type dbus_type)
 {
-    if (dbus_message_is_signal(msg, LOCALE_CHANGED_INTERFACE, (char*)ot->data)) {
+    if (dbus_message_is_signal(msg, LOCALE_CHANGED_INTERFACE,
+                               (char*)ot->data)) {
         osso_locale_change_cb_f *handler = ot->user_cb;
-        char *new_locale = NULL ;
-        DBusMessageIter iter ;
+        char *new_locale = NULL;
+        DBusMessageIter iter;
 
-        if(!dbus_message_iter_init(msg, &iter)) {
+        if (!dbus_message_iter_init(msg, &iter)) {
             ULOG_ERR_F("Message has no arguments");
             return;
         }
-        if(dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING) {
+        if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING) {
             dbus_message_iter_get_basic(&iter, &new_locale);
         }
 
-        ULOG_DEBUG_F("arguments = '%s'", NULL == new_locale ? "<NULL>" : new_locale);
+        ULOG_DEBUG_F("arguments = '%s'", NULL == new_locale ? "<NULL>"
+                     : new_locale);
 
         (*handler)(new_locale, ot->user_data);
     }