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

Lint fixes.

diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c
index 05d095e..4a177ef 100644 (file)
--- a/atk-adaptor/accessible-register.c
+++ b/atk-adaptor/accessible-register.c
@@ -135,8 +135,8 @@ object_to_ref (AtkObject *accessible)
 /*
  * Converts the Accessible object reference to its D-Bus object path
  */
-static gchar *
-ref_to_path (guint ref)
+gchar *
+atk_dbus_ref_to_path (guint ref)
 {
   return g_strdup_printf(SPI_ATK_OBJECT_REFERENCE_TEMPLATE, ref);
 }
@@ -403,7 +403,7 @@ atk_dbus_object_attempt_registration (AtkObject *accessible)
       ref = object_to_ref (accessible);
       if (ref)
         {
-          return ref_to_path (ref);
+          return atk_dbus_ref_to_path (ref);
         }
       else
         {
@@ -415,7 +415,7 @@ atk_dbus_object_attempt_registration (AtkObject *accessible)
     }
   else
     {
-      return ref_to_path (ref);
+      return atk_dbus_ref_to_path (ref);
     }
 }
 
@@ -502,6 +502,7 @@ tree_update_state_action (GSignalInvocationHint *signal_hint,
                           AtkObject             *accessible)
 {
       update_accessible (accessible);
+  return TRUE;
 }
 
 static gboolean
@@ -511,6 +512,7 @@ tree_update_state_listener (GSignalInvocationHint *signal_hint,
                             gpointer               data)
 {
       tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_state_action);
+  return TRUE;
 }
 
 static gboolean
@@ -532,6 +534,7 @@ tree_update_property_action (GSignalInvocationHint *signal_hint,
           update_accessible (accessible);
         }
       /* Parent value us updated by child-add signal of parent object */
+      return TRUE;
 }
 
 static gboolean
@@ -540,7 +543,8 @@ tree_update_property_listener (GSignalInvocationHint *signal_hint,
                                const GValue          *param_values,
                                gpointer               data)
 {
-      tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_property_action);
+  tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_property_action);
+  return TRUE;
 }
 
 static gboolean
@@ -553,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;
       if (signal_hint->detail)
           detail = g_quark_to_string (signal_hint->detail);
 
@@ -573,6 +577,7 @@ tree_update_children_action (GSignalInvocationHint *signal_hint,
           register_subtree (child);
           update_accessible (accessible);
         }
+      return TRUE;
 }
 
 static gboolean
@@ -582,6 +587,7 @@ tree_update_children_listener (GSignalInvocationHint *signal_hint,
                                gpointer               data)
 {
       tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_children_action);
+      return TRUE;
 }
 
 /*---------------------------------------------------------------------------*/

diff --git a/atk-adaptor/accessible-register.h b/atk-adaptor/accessible-register.h
index e14886a..b238af7 100644 (file)
--- a/atk-adaptor/accessible-register.h
+++ b/atk-adaptor/accessible-register.h
@@ -44,4 +44,6 @@ atk_dbus_object_to_path (AtkObject *accessible);
 gchar *
 atk_dbus_desktop_object_path ();
 
+gchar *
+atk_dbus_ref_to_path (guint ref);
 #endif /* ACCESSIBLE_REGISTER */

diff --git a/atk-adaptor/collection-adaptor.c b/atk-adaptor/collection-adaptor.c
index 749198f..2826feb 100644 (file)
--- a/atk-adaptor/collection-adaptor.c
+++ b/atk-adaptor/collection-adaptor.c
@@ -986,7 +986,7 @@ impl_getMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
 static DBusMessage *
 impl_getMatches(DBusConnection *bus, DBusMessage *message, void *user_data)
 {
-  AtkObject *obj = path_to_object (message);
+  AtkObject *obj = atk_dbus_path_to_object (dbus_message_get_path (message));
   DBusMessageIter iter;
   MatchRulePrivate rule;
   dbus_uint16_t sortby;

diff --git a/atk-adaptor/hypertext-adaptor.c b/atk-adaptor/hypertext-adaptor.c
index 01431bf..09a6d65 100644 (file)
--- a/atk-adaptor/hypertext-adaptor.c
+++ b/atk-adaptor/hypertext-adaptor.c
@@ -63,7 +63,8 @@ impl_getLink (DBusConnection * bus, DBusMessage * message, void *user_data)
       return droute_invalid_arguments_error (message);
     }
   link = atk_hypertext_get_link (hypertext, linkIndex);
-  return spi_dbus_return_object (message, ATK_OBJECT (link), FALSE);
+  return NULL; // TODO
+  //return spi_dbus_return_object (message, ATK_OBJECT (link), FALSE);
 }
 
 static DBusMessage *

diff --git a/atk-adaptor/selection-adaptor.c b/atk-adaptor/selection-adaptor.c
index b46651f..5e1c4ab 100644 (file)
--- a/atk-adaptor/selection-adaptor.c
+++ b/atk-adaptor/selection-adaptor.c
@@ -26,6 +26,7 @@
 #include <droute/droute.h>
 
 #include "spi-common/spi-dbus.h"
+#include "accessible-marshaller.h"
 
 static dbus_bool_t
 impl_get_nSelectedChildren (DBusMessageIter * iter,

diff --git a/cspi/spi-accessible.c b/cspi/spi-accessible.c
index 62aa594..fb5a4c7 100644 (file)
--- a/cspi/spi-accessible.c
+++ b/cspi/spi-accessible.c
@@ -1035,6 +1035,7 @@ Accessible_getStreamableContent (Accessible *obj)
          obj, spi_interface_streamable_content);
 #else
   g_warning ("Streamable content not supported");
+  return NULL;
 #endif
 }
 

diff --git a/cspi/spi-event.c b/cspi/spi-event.c
index d0cc84c..fe704a1 100644 (file)
--- a/cspi/spi-event.c
+++ b/cspi/spi-event.c
@@ -1196,14 +1196,15 @@ cspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data)
     }
     category++;
   }
-  g_return_if_fail (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_STRING);
+  g_return_val_if_fail (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_STRING, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
   dbus_message_iter_get_basic (&iter, &detail);
   dbus_message_iter_next (&iter);
-  g_return_if_fail (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_INT32);
+  /* TODO: Return error indicating invalid arguments  in next line */
+  g_return_val_if_fail (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_INT32, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
   dbus_message_iter_get_basic (&iter, &detail1);
   e.detail1 = detail1;
   dbus_message_iter_next (&iter);
-  g_return_if_fail (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_INT32);
+  g_return_val_if_fail (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_INT32, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
   dbus_message_iter_get_basic (&iter, &detail2);
   e.detail2 = detail2;
   dbus_message_iter_next (&iter);

diff --git a/cspi/spi-hyperlink.c b/cspi/spi-hyperlink.c
index 45f7256..6bbc82d 100644 (file)
--- a/cspi/spi-hyperlink.c
+++ b/cspi/spi-hyperlink.c
@@ -121,6 +121,7 @@ AccessibleHyperlink_getObject (AccessibleHyperlink *obj,
   cspi_dbus_call (obj, spi_interface_hyperlink, "getObject", NULL, "i=>o", d_i, &path);
   retval = cspi_ref_related_accessible (obj, path);
   g_free (path);
+  return retval;
 }
 
 /**

diff --git a/cspi/spi-main.c b/cspi/spi-main.c
index 246bd33..3d1c626 100644 (file)
--- a/cspi/spi-main.c
+++ b/cspi/spi-main.c
@@ -293,7 +293,7 @@ cspi_get_application (const char *bus_name)
   if (!app_hash)
   {
     app_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_hash_table_unref);
-    if (!app_hash) return;
+    if (!app_hash) return NULL;
   }
   app = g_hash_table_lookup (app_hash, bus_name);
   if (app) return app;
@@ -577,7 +577,7 @@ cspi_dbus_handle_update_accessible (DBusConnection *bus, DBusMessage *message, v
   if (!app)
   {
     g_warning ("UpdateAccessible from unknown app.  Should we add it?", sender);
-    return;
+    return DBUS_HANDLER_RESULT_HANDLED;
   }
   dbus_message_iter_init (message, &iter);
   // TODO: Check signature

diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h
index fb00a37..392cc5e 100644 (file)
--- a/registryd/deviceeventcontroller.h
+++ b/registryd/deviceeventcontroller.h
@@ -62,6 +62,7 @@ SpiDEController *spi_device_event_controller_new      (SpiRegistry    *registry,
 
 void spi_remove_device_listeners (SpiDEController *controller, const char *bus_name);
 
+SpiDEController *spi_registry_dec_new (SpiRegistry *reg, DBusConnection *bus, DRouteContext *droute);
 G_END_DECLS
 
 #endif /* DEVICEEVENTCONTROLLER_H_ */

diff --git a/tests/cspi/test-simple.c b/tests/cspi/test-simple.c
index d68ffd6..5ec2584 100644 (file)
--- a/tests/cspi/test-simple.c
+++ b/tests/cspi/test-simple.c
@@ -31,6 +31,7 @@
 #include <gtk/gtk.h>
 #include <cspi/spi.h>
 
+#include "dbus/dbus.h"
 
 /* Known bugs */
 #define WHOLE_STRING -1