2009-05-14 Mike Gorse <mgorse@novell.com>

Fix more lint issues.

diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c
index 4a177ef..1256fc1 100644 (file)
--- a/atk-adaptor/accessible-register.c
+++ b/atk-adaptor/accessible-register.c
@@ -432,7 +432,7 @@ atk_dbus_object_to_path (AtkObject *accessible)
   if (!ref)
       return NULL;
   else
-      return ref_to_path (ref);
+      return atk_dbus_ref_to_path (ref);
 }
 
 gchar *
@@ -557,7 +557,7 @@ tree_update_children_action (GSignalInvocationHint *signal_hint,
       const gchar *detail = NULL;
       AtkObject *child;
 
-      if (has_manages_descendants (accessible)) return;
+      if (has_manages_descendants (accessible)) return TRUE;
       if (signal_hint->detail)
           detail = g_quark_to_string (signal_hint->detail);
 

diff --git a/cspi/spi-accessible.c b/cspi/spi-accessible.c
index fb5a4c7..345be4f 100644 (file)
--- a/cspi/spi-accessible.c
+++ b/cspi/spi-accessible.c
@@ -894,6 +894,7 @@ Accessible_getCollection (Accessible *obj)
          obj, spi_interface_collection);
 #else
   g_warning ("Collections not implemented");
+  return NULL;
 #endif
 }
 
@@ -997,6 +998,7 @@ Accessible_getMatchRule (Accessible *obj)
          obj, spi_interface_match_rule);
 #else
   g_warning ("Match rules not supported");
+  return NULL;
 #endif
 }
 

diff --git a/cspi/spi-main.c b/cspi/spi-main.c
index 3d1c626..96f992e 100644 (file)
--- a/cspi/spi-main.c
+++ b/cspi/spi-main.c
@@ -405,7 +405,7 @@ cspi_dbus_handle_remove_accessible (DBusConnection *bus, DBusMessage *message, v
   if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID))
   {
     g_warning ("Received RemoveAccessible with invalid arguments");
-    return;
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
   }
   a = ref_accessible (app, path);
   if (a->parent && g_list_find (a->parent->children, a))
@@ -583,6 +583,7 @@ cspi_dbus_handle_update_accessible (DBusConnection *bus, DBusMessage *message, v
   // TODO: Check signature
   dbind_any_demarshal (&iter, &type, &p);      /* additions */
   handle_addition (app, &ca);
+  return DBUS_HANDLER_RESULT_HANDLED;
 }
 
 static DBusHandlerResult

diff --git a/tests/cspi/test-simple.c b/tests/cspi/test-simple.c
index 5ec2584..62bcb31 100644 (file)
--- a/tests/cspi/test-simple.c
+++ b/tests/cspi/test-simple.c
@@ -30,6 +30,7 @@
 #include <locale.h>
 #include <gtk/gtk.h>
 #include <cspi/spi.h>
+#include <cspi/spi-private.h>
 
 #include "dbus/dbus.h"