summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gorse <mgorse@suse.com>2012-11-26 13:51:28 -0600
committerMike Gorse <mgorse@suse.com>2012-12-10 10:18:35 -0600
commit5c5f6cabf5f19bc382bbb99f03dd6309ddf479dd (patch)
treea4fc43e00a426047cc214d0238daa8b8909c7a27
parent930e3a8d15011600132c2302234acb410b54f88f (diff)
downloadat-spi2-core-5c5f6cabf5f19bc382bbb99f03dd6309ddf479dd.tar.gz
Fix atspi_device_listener_new_simple and some other warnings
-rw-r--r--atspi/atspi-device-listener.c4
-rw-r--r--atspi/atspi-value.c2
-rw-r--r--dbind/dbind-any.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/atspi/atspi-device-listener.c b/atspi/atspi-device-listener.c
index 9d2796ef..3ed34e52 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 a8df8465..642533d8 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 9cae2eba..aa54479a 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);