[GNUnet-SVN] r36179 - gnunet-dbus/src/lib/common

[gnunet]

Author: grothoff
Date: 2015-08-03 11:38:34 +0200 (Mon, 03 Aug 2015)
New Revision: 36179

Modified:
   gnunet-dbus/src/lib/common/gnunet_dbus_lib_service.c
Log:
-avoid deprecated API

Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_service.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_service.c        2015-08-03 
09:35:48 UTC (rev 36178)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_service.c        2015-08-03 
09:38:34 UTC (rev 36179)
@@ -160,10 +160,10 @@
 {
   struct GNUNET_DBUS_Service *service = (struct GNUNET_DBUS_Service *)data;
   struct Timeout *t = timeout_create (timeout);
-  
+
   if (dbus_timeout_get_enabled (timeout))
     timeout_schedule (t);
-  
+
   struct TimeoutIter *ti = GNUNET_new (struct TimeoutIter);
   ti->t = t;
   GNUNET_CONTAINER_DLL_insert (service->timeouts_front,
@@ -216,11 +216,13 @@
     timeout_schedule (t);
 };
 
+
 static void
 dispatch (
     void *cls,
     const struct GNUNET_SCHEDULER_TaskContext *tc);
 
+
 static void
 handle_dispatch (
     DBusConnection *dbus_connection,
@@ -229,10 +231,8 @@
   switch (status)
   {
   case DBUS_DISPATCH_DATA_REMAINS:
-    GNUNET_SCHEDULER_add_continuation (
-        dispatch,
-        dbus_connection,
-        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (dispatch,
+                              dbus_connection);
     break;
   case DBUS_DISPATCH_COMPLETE:
     break;
@@ -246,6 +246,7 @@
   };
 };
 
+
 static void
 dispatch (
     void *cls,
@@ -256,6 +257,7 @@
   handle_dispatch (dbus_connection, dbus_connection_get_dispatch_status 
(dbus_connection));
 };
 
+
 static void
 dispatch_status_changed (
     DBusConnection *dbus_connection,
@@ -320,8 +322,8 @@
                                  client_it);
     if (service->client_connects)
       service->client_connects (service, client);
-    /*  
-     
+    /*
+
         ** TODO **
 
         detect when a client is no longer on the bus and
@@ -430,7 +432,7 @@
 
   DBusError err;
   dbus_error_init(&err);
-  
+
   service->root_object = GNUNET_DBUS_object_create ("", NULL);
   if (! service->root_object)
     LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create root object for 
service.\n");
@@ -585,7 +587,7 @@
 {
   DBusError err;
   dbus_error_init(&err);
-    
+
   const char *path = GNUNET_DBUS_object_get_path (object);
 
   DBusObjectPathVTable vtable;
@@ -682,5 +684,3 @@
 {
   return service->root_object;
 }
-
-