From bd464dfd5c55203e30b0937e963947b6e78a04e4 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
Date: Mon, 4 Feb 2013 12:53:46 -0600
Subject: [PATCH] Fix some warnings

---
 atspi/atspi-accessible.c     |  2 ++
 atspi/atspi-event-listener.c |  1 -
 atspi/atspi-misc-private.h   |  1 +
 atspi/atspi-misc.c           | 30 ++++++++++++++++++++++--------
 atspi/atspi-registry.c       |  3 +--
 atspi/atspi.h                |  1 +
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
index 9d79a81..64cbf7e 100644
--- a/atspi/atspi-accessible.c
+++ b/atspi/atspi-accessible.c
@@ -104,6 +104,7 @@ atspi_accessible_init (AtspiAccessible *accessible)
 {
 #ifdef DEBUG_REF_COUNTS
   accessible_count++;
+  g_hash_table_insert (_atspi_get_live_refs (), accessible, NULL);
   g_print("at-spi: init: %d objects\n", accessible_count);
 #endif
 }
@@ -180,6 +181,7 @@ atspi_accessible_finalize (GObject *object)
 
 #ifdef DEBUG_REF_COUNTS
   accessible_count--;
+  g_hash_table_remove (_atspi_get_live_refs (), accessible);
   g_print ("at-spi: finalize: %d objects\n", accessible_count);
 #endif
 
diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c
index 5cc805f..e545bda 100644
--- a/atspi/atspi-event-listener.c
+++ b/atspi/atspi-event-listener.c
@@ -556,7 +556,6 @@ atspi_event_listener_register_from_callback (AtspiEventListenerCB callback,
 {
   EventListenerEntry *e;
   DBusError d_error;
-  DBusMessage *message, *reply;
   GPtrArray *matchrule_array;
   gint i;
 
diff --git a/atspi/atspi-misc-private.h b/atspi/atspi-misc-private.h
index f3f4d71..c7de37b 100644
--- a/atspi/atspi-misc-private.h
+++ b/atspi/atspi-misc-private.h
@@ -155,6 +155,7 @@ typedef enum
 extern GMainLoop *atspi_main_loop;
 extern gboolean atspi_no_cache;
 
+GHashTable *_atspi_get_live_refs ();
 G_END_DECLS
 
 #endif	/* _ATSPI_MISC_PRIVATE_H_ */
diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c
index d018119..67b92df 100644
--- a/atspi/atspi-misc.c
+++ b/atspi/atspi-misc.c
@@ -101,8 +101,8 @@ _atspi_get_iface_num (const char *iface)
   return -1;
 }
 
-static GHashTable *
-get_live_refs (void)
+GHashTable *
+_atspi_get_live_refs (void)
 {
   if (!live_refs) 
     {
@@ -709,7 +709,6 @@ static DBusHandlerResult
 handle_add_accessible (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   DBusMessageIter iter;
-  const char *sender = dbus_message_get_sender (message);
 
   if (strcmp (dbus_message_get_signature (message), cache_signal_type) != 0)
   {
@@ -773,7 +772,7 @@ _atspi_process_deferred_messages (gpointer data)
   if (in_process_deferred_messages)
     return TRUE;
   in_process_deferred_messages = 1;
-  while (closure = g_queue_pop_head (deferred_messages))
+  while ((closure = g_queue_pop_head (deferred_messages)))
   {
     process_deferred_message (closure);
     dbus_message_unref (closure->message);
@@ -904,7 +903,7 @@ atspi_init (void)
 
   g_type_init ();
 
-  get_live_refs();
+  _atspi_get_live_refs();
 
   bus = atspi_get_a11y_bus ();
   if (!bus)
@@ -1009,7 +1008,6 @@ static GSList *hung_processes;
 static void
 remove_hung_process (DBusPendingCall *pending, void *data)
 {
-  gchar *bus_name = data;
 
   hung_processes = g_slist_remove (hung_processes, data);
   g_free (data);
@@ -1466,7 +1464,7 @@ get_accessibility_bus_address_x11 (void)
 		      &nitems, &leftover, &data_x11);
   XCloseDisplay (bridge_display);
 
-  data = g_strdup (data_x11);
+  data = g_strdup ((gchar *)data_x11);
   XFree (data_x11);
   return data;
 }
@@ -1538,7 +1536,6 @@ a11y_bus_free (void *data)
 DBusConnection *
 atspi_get_a11y_bus (void)
 {
-  DBusConnection *bus = NULL;
   DBusError error;
   char *address;
 
@@ -1612,3 +1609,20 @@ atspi_set_timeout (gint val, gint startup_time)
   method_call_timeout = val;
   app_startup_time = startup_time;
 }
+
+#ifdef DEBUG_REF_COUNTS
+static void
+print_disposed (gpointer key, gpointer value, gpointer data)
+{
+  AtspiAccessible *accessible = key;
+  if (accessible->parent.app)
+    return;
+  g_print ("disposed: %s %d\n", accessible->name, accessible->role);
+}
+
+void
+debug_disposed ()
+{
+  g_hash_table_foreach (live_refs, print_disposed, NULL);
+}
+#endif
diff --git a/atspi/atspi-registry.c b/atspi/atspi-registry.c
index 28a76e1..116da19 100644
--- a/atspi/atspi-registry.c
+++ b/atspi/atspi-registry.c
@@ -101,7 +101,6 @@ static gboolean
 notify_keystroke_listener (DeviceListenerEntry *e)
 {
   gchar *path = _atspi_device_listener_get_path (e->listener);
-  gint                                i;
   dbus_uint32_t d_modmask = e->modmask;
   dbus_uint32_t d_event_types = e->event_types;
   AtspiEventListenerMode     listener_mode;
@@ -120,7 +119,7 @@ notify_keystroke_listener (DeviceListenerEntry *e)
                                atspi_path_dec, atspi_interface_dec,
                                "RegisterKeystrokeListener", &d_error,
                                "oa(iisi)uu(bbb)=>b", path, e->key_set,
-                               e->modmask, e->event_types, &listener_mode,
+                               d_modmask, d_event_types, &listener_mode,
                                &retval);
   if (dbus_error_is_set (&d_error))
     {
diff --git a/atspi/atspi.h b/atspi/atspi.h
index 7915760..276769e 100644
--- a/atspi/atspi.h
+++ b/atspi/atspi.h
@@ -50,4 +50,5 @@
 #include "atspi-value.h"
 
 #include "atspi-gmain.h"
+#define DEBUG_REF_COUNTS 1	/* TODO: remove before committing */
 #endif
-- 
2.7.4