[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36913 - in gnunet/src: include social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36913 - in gnunet/src: include social |
Date: |
Sun, 21 Feb 2016 15:09:17 +0100 |
Author: tg
Date: 2016-02-21 15:09:16 +0100 (Sun, 21 Feb 2016)
New Revision: 36913
Modified:
gnunet/src/include/gnunet_social_service.h
gnunet/src/social/social_api.c
Log:
social: AppPlaceState doc
Modified: gnunet/src/include/gnunet_social_service.h
===================================================================
--- gnunet/src/include/gnunet_social_service.h 2016-02-21 13:41:29 UTC (rev
36912)
+++ gnunet/src/include/gnunet_social_service.h 2016-02-21 14:09:16 UTC (rev
36913)
@@ -307,24 +307,27 @@
/**
- * 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,7 +345,7 @@
* @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,
@@ -349,7 +352,7 @@
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,7 +366,7 @@
* @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,
@@ -370,7 +373,7 @@
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);
/**
Modified: gnunet/src/social/social_api.c
===================================================================
--- gnunet/src/social/social_api.c 2016-02-21 13:41:29 UTC (rev 36912)
+++ gnunet/src/social/social_api.c 2016-02-21 14:09:16 UTC (rev 36913)
@@ -103,12 +103,6 @@
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 @@
* 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 @@
GNUNET_ContinuationCallback disconnect_cb,
void *disconnect_cls)
{
- plc->is_disconnecting = GNUNET_YES;
plc->disconnect_cb = disconnect_cb;
plc->disconnect_cls = disconnect_cls;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36913 - in gnunet/src: include social,
gnunet <=