[at-spi2-core/gnome-3-6] Fix atspi_device_listener_new_simple and some other warnings



commit 5c5f6cabf5f19bc382bbb99f03dd6309ddf479dd
Author: Mike Gorse <mgorse suse com>
Date:   Mon Nov 26 13:51:28 2012 -0600

    Fix atspi_device_listener_new_simple and some other warnings

 atspi/atspi-device-listener.c |    4 ++--
 atspi/atspi-value.c           |    2 +-
 dbind/dbind-any.c             |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/atspi/atspi-device-listener.c b/atspi/atspi-device-listener.c
index 9d2796e..3ed34e5 100644
--- a/atspi/atspi-device-listener.c
+++ b/atspi/atspi-device-listener.c
@@ -115,7 +115,7 @@ id_is_free (guint id)
 }
 
 static AtspiDeviceEvent *
-atspi_device_event_copy (AtspiDeviceEvent *src)
+atspi_device_event_copy (const AtspiDeviceEvent *src)
 {
   AtspiDeviceEvent *dst = g_new0 (AtspiDeviceEvent, 1);
   dst->type = src->type;
@@ -247,7 +247,7 @@ AtspiDeviceListener *
 atspi_device_listener_new_simple (AtspiDeviceListenerSimpleCB callback,
                            GDestroyNotify callback_destroyed)
 {
-  return atspi_device_listener_new (device_remove_datum, callback_destroyed, callback);
+  return atspi_device_listener_new (device_remove_datum, callback, callback_destroyed);
 }
 
 /**
diff --git a/atspi/atspi-value.c b/atspi/atspi-value.c
index a8df846..642533d 100644
--- a/atspi/atspi-value.c
+++ b/atspi/atspi-value.c
@@ -116,7 +116,7 @@ atspi_value_set_current_value (AtspiValue *obj, gdouble new_value, GError **erro
                                             accessible->parent.path,
                                             DBUS_INTERFACE_PROPERTIES, "Set");
     if (!message)
-      return NULL;
+      return FALSE;
     dbus_message_append_args (message, DBUS_TYPE_STRING, &atspi_interface_value,
                                DBUS_TYPE_STRING, &str_curval,
                               DBUS_TYPE_INVALID);
diff --git a/dbind/dbind-any.c b/dbind/dbind-any.c
index 9cae2eb..aa54479 100644
--- a/dbind/dbind-any.c
+++ b/dbind/dbind-any.c
@@ -306,7 +306,7 @@ dbind_any_free_r (const char **type, void **data)
 
         offset = 0 ;
         while (**type != DBUS_DICT_ENTRY_END_CHAR) {
-            char *subt = *type;
+            const char *subt = *type;
                         offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type));
                         *data = PTR_PLUS (data0, offset);
             dbind_any_free_r (type, data);
@@ -424,7 +424,7 @@ dbind_any_marshal (DBusMessageIter *iter,
 
         offset = 0 ;
         while (**type != DBUS_DICT_ENTRY_END_CHAR) {
-            char *subt = *type;
+            const char *subt = *type;
                         offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type));
                         *data = PTR_PLUS (data0, offset);
             dbind_any_marshal (&sub, type, data);
@@ -626,7 +626,7 @@ dbind_any_demarshal (DBusMessageIter *iter,
         dbus_message_iter_recurse (iter, &child);
 
         while (**type != DBUS_DICT_ENTRY_END_CHAR) {
-            char *subt = *type;
+            const char *subt = *type;
                         offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type));
                         *data = PTR_PLUS (data0, offset);
             dbind_any_demarshal (&child, type, data);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]