Fix a few more warnings

diff --git a/atspi/atspi-device-listener.h b/atspi/atspi-device-listener.h
index b7bcf1c..3b1b96d 100644 (file)
--- a/atspi/atspi-device-listener.h
+++ b/atspi/atspi-device-listener.h
@@ -79,7 +79,7 @@ typedef struct _AtspiDeviceListenerClass AtspiDeviceListenerClass;
 struct _AtspiDeviceListenerClass
 {
   GObjectClass parent_class;
-  gboolean (*device_event) (AtspiDeviceListener *, const AtspiDeviceEvent *);
+  gboolean (*device_event) (AtspiDeviceListener *listener, const AtspiDeviceEvent *event);
 };
 
 GType atspi_device_listener_get_type (void);

diff --git a/atspi/atspi-gmain.c b/atspi/atspi-gmain.c
index e0dd7b3..3ab985b 100644 (file)
--- a/atspi/atspi-gmain.c
+++ b/atspi/atspi-gmain.c
@@ -512,10 +512,6 @@ connection_setup_new_from_old (GMainContext    *context,
 
 /** @} */ /* End of GLib bindings internals */
 
-/** @addtogroup DBusGLib
- * @{
- */
-
 /**
  * atspi_dbus_connection_setup_with_g_main: (skip)
  * @connection: the connection

diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index 45a6727..2e26f17 100644 (file)
--- a/registryd/deviceeventcontroller-x11.c
+++ b/registryd/deviceeventcontroller-x11.c
@@ -731,7 +731,7 @@ spi_controller_register_with_devices (SpiDEController *controller)
       {
          if (priv->xkb_desc->map->key_sym_map[i].kt_index[0] == XkbOneLevelIndex)
          { 
-             if (XKeycodeToKeysym (spi_get_display (), i, 0) != 0)
+             if (XkbKeycodeToKeysym (spi_get_display (), i, 0, 0) != 0)
              {
                  /* don't use this one if there's a grab client! */
 
@@ -762,7 +762,7 @@ spi_controller_register_with_devices (SpiDEController *controller)
       if (reserved) 
       {
          priv->reserved_keycode = reserved;
-         priv->reserved_keysym = XKeycodeToKeysym (spi_get_display (), reserved, 0);
+         priv->reserved_keysym = XkbKeycodeToKeysym (spi_get_display (), reserved, 0, 0);
       }
       else
       { 

diff --git a/registryd/reentrant-list.c b/registryd/reentrant-list.c
index 6e9911e..29bdfca 100644 (file)
--- a/registryd/reentrant-list.c
+++ b/registryd/reentrant-list.c
@@ -45,6 +45,7 @@ spi_re_entrant_list_delete_link (GList * const *element_ptr)
   GList     *next;
   GList     *element;
   gboolean   first_item;
+  GList *dummy; /* suppress warning */
 
   g_return_if_fail (element_ptr != NULL);
 
@@ -54,7 +55,7 @@ spi_re_entrant_list_delete_link (GList * const *element_ptr)
   next = element->next;
   first_item = (element->prev == NULL);
 
-  g_list_remove_link (NULL, element);
+  dummy = g_list_remove_link (NULL, element);
 
   for (l = working_list; l; l = l->next)
     {

diff --git a/registryd/registry.c b/registryd/registry.c
index b45d022..8448bb2 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -362,7 +362,7 @@ impl_Embed (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   SpiRegistry *reg = SPI_REGISTRY (user_data);
   DBusMessageIter iter, iter_struct;
-  gchar *app_name, *obj_path;
+  const gchar *app_name, *obj_path;
 
   DBusMessage *reply = NULL;
   DBusMessageIter reply_iter;