Merge branch 'master' into track-messages

1 files changed, 26 insertions, 4 deletions

diff --git a/facebook/facebook-api.c b/facebook/facebook-api.c
index 4a54e41..184cb89 100644
--- a/facebook/facebook-api.c
+++ b/facebook/facebook-api.c
@@ -436,6 +436,23 @@ fb_api_class_init(FbApiClass *klass)
                  1, FB_TYPE_ID);
 
     /**
+     * FbApi::thread-kicked:
+     * @api: The #FbApi.
+     * @thrd: The #FbApiThread.
+     *
+     * Emitted upon the reply of a thread request when the user is no longer
+     * part of that thread. This is emitted as a result of #fb_api_thread().
+     */
+    g_signal_new("thread-kicked",
+                 G_TYPE_FROM_CLASS(klass),
+                 G_SIGNAL_ACTION,
+                 0,
+                 NULL, NULL,
+                 fb_marshal_VOID__POINTER,
+                 G_TYPE_NONE,
+                 1, G_TYPE_POINTER);
+
+    /**
      * FbApi::threads:
      * @api: The #FbApi.
      * @thrds: The #GSList of #FbApiThread's.
@@ -2535,6 +2552,7 @@ fb_api_thread_parse(FbApi *api, FbApiThread *thrd, JsonNode *root,
     FbId uid;
     FbJsonValues *values;
     gboolean haself = FALSE;
+    guint num_users = 0;
     GError *err = NULL;
 
     values = fb_json_values_new(root);
@@ -2570,6 +2588,7 @@ fb_api_thread_parse(FbApi *api, FbApiThread *thrd, JsonNode *root,
     while (fb_json_values_update(values, &err)) {
         str = fb_json_values_next_str(values, "0");
         uid = FB_ID_FROM_STR(str);
+        num_users++;
 
         if (uid != priv->uid) {
             user = fb_api_user_dup(NULL, FALSE);
@@ -2588,8 +2607,7 @@ fb_api_thread_parse(FbApi *api, FbApiThread *thrd, JsonNode *root,
         return FALSE;
     }
 
-    if ((g_slist_length(thrd->users) < 2) || !haself) {
-        fb_api_thread_reset(thrd, TRUE);
+    if (num_users < 2 || !haself) {
         g_object_unref(values);
         return FALSE;
     }
@@ -2624,8 +2642,12 @@ fb_api_cb_thread(FbHttpRequest *req, gpointer data)
 
     if (!fb_api_thread_parse(api, &thrd, node, &err)) {
         if (G_LIKELY(err == NULL)) {
-            fb_api_error(api, FB_API_ERROR_GENERAL,
-                         "Failed to parse thread information");
+            if (thrd.tid) {
+                g_signal_emit_by_name(api, "thread-kicked", &thrd);
+            } else {
+                fb_api_error(api, FB_API_ERROR_GENERAL,
+                             "Failed to parse thread information");
+            }
         } else {
             fb_api_error_emit(api, err);
         }