social: AppPlaceState doc

diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index 7ecdf1d537e6971408caca64345382c6d61b7ef5..88ebc3dad0f2b7196da06da0896ce14d986682b3 100644 (file)
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -307,24 +307,27 @@ typedef void
 
 
 /**
- * Entry status of a place.
- *
- * Note: The intermediate status of having entered a place without
- * being subscribed to it may be obsoleted in future unless we find a
- * compelling reason for it to exist. FIXME: See questions.org.
+ * Entry status of a place per application.
  */
-enum GNUNET_SOCIAL_PlaceState
+enum GNUNET_SOCIAL_AppPlaceState
 {
   /**
-   * Place was once entered but left since.
+   * The place was once entered by the ego, but left since.
+   * It's possible to establish a local connection to the place
+   * without re-entering to fetch history from the PSYCstore.
+   * @see enum GNUNET_PSYC_SlaveJoinFlags and GNUNET_SOCIAL_guest_enter()
    */
   GNUNET_SOCIAL_PLACE_STATE_ARCHIVED = 0,
+
   /**
-   * Place is entered but not subscribed.
+   * The place is entered by the ego,
+   * but this application is not subscribed to it.
    */
   GNUNET_SOCIAL_PLACE_STATE_ENTERED = 1,
+
   /**
-   * Place is entered and subscribed.
+   * The place is entered by the ego and
+   * and this application is subscribed to it.
    */
   GNUNET_SOCIAL_PLACE_STATE_SUBSCRIBED = 2,
 };
@@ -342,14 +345,14 @@ enum GNUNET_SOCIAL_PlaceState
  * @param place_pub_key
  *        Public key of the place.
  * @param place_state
- *        @see enum GNUNET_SOCIAL_PlaceState
+ *        @see enum GNUNET_SOCIAL_AppPlaceState
  */
 typedef void
 (*GNUNET_SOCIAL_AppHostPlaceCallback) (void *cls,
                                        struct GNUNET_SOCIAL_HostConnection *hconn,
                                        struct GNUNET_SOCIAL_Ego *ego,
                                        const struct GNUNET_CRYPTO_EddsaPublicKey *place_pub_key,
-                                       enum GNUNET_SOCIAL_PlaceState place_state);
+                                       enum GNUNET_SOCIAL_AppPlaceState place_state);
 
 /**
  * Notification about a place.
@@ -363,14 +366,14 @@ typedef void
  * @param place_pub_key
  *        Public key of the place.
  * @param place_state
- *        @see enum GNUNET_SOCIAL_PlaceState
+ *        @see enum GNUNET_SOCIAL_AppPlaceState
  */
 typedef void
 (*GNUNET_SOCIAL_AppGuestPlaceCallback) (void *cls,
                                         struct GNUNET_SOCIAL_GuestConnection *gconn,
                                         struct GNUNET_SOCIAL_Ego *ego,
                                         const struct GNUNET_CRYPTO_EddsaPublicKey *place_pub_key,
-                                        enum GNUNET_SOCIAL_PlaceState place_state);
+                                        enum GNUNET_SOCIAL_AppPlaceState place_state);
 
 
 /**

diff --git a/src/social/social_api.c b/src/social/social_api.c
index 63ff677a43013b89044ce5fadca0d38a32471551..edda0203e9be0f8cf691d12edaa832778ddce65c 100644 (file)
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -103,12 +103,6 @@ struct GNUNET_SOCIAL_App
   GNUNET_SOCIAL_AppHostPlaceCallback host_cb;
   GNUNET_SOCIAL_AppGuestPlaceCallback guest_cb;
   void *cb_cls;
-
-  /**
-   * Is this place in the process of disconnecting from the service?
-   * #GNUNET_YES or #GNUNET_NO
-   */
-  uint8_t is_disconnecting;
 };
 
 
@@ -182,12 +176,6 @@ struct GNUNET_SOCIAL_Place
    * Does this place belong to a host (#GNUNET_YES) or guest (#GNUNET_NO)?
    */
   uint8_t is_host;
-
-  /**
-   * Is this place in the process of disconnecting from the service?
-   * #GNUNET_YES or #GNUNET_NO
-   */
-  uint8_t is_disconnecting;
 };
 
 
@@ -1509,7 +1497,6 @@ place_disconnect (struct GNUNET_SOCIAL_Place *plc,
                   GNUNET_ContinuationCallback disconnect_cb,
                   void *disconnect_cls)
 {
-  plc->is_disconnecting = GNUNET_YES;
   plc->disconnect_cb = disconnect_cb;
   plc->disconnect_cls = disconnect_cls;