Changeset 2dcde94

Timestamp:

2012-12-03T23:30:33Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

573e274

Parents:

3ca001b

Message:

Don't hide own tweets in streaming mode with fetch_mentions off, and move
txs_free() to the right place - fixes a memory leak.

File:

• protocols/twitter/twitter_lib.c (modified) (3 diffs)

protocols/twitter/twitter_lib.c

@@ -814 +814 @@
         
         if ((txs = twitter_xt_get_status(o))) {
-                return twitter_stream_handle_status(ic, txs);
+                gboolean ret = twitter_stream_handle_status(ic, txs);
+                txs_free(txs);
+                return ret;
         } else if ((c = json_o_get(o, "direct_message")) &&
                    (txs = twitter_xt_get_dm(c))) {
@@ -847 +849 @@
                 if (td->log[i].id == txs->id) {
                         /* Got a duplicate (RT, probably). Drop it. */
-                        txs_free(txs);
                         return TRUE;
                 }
         }
         
-        if (!(set_getbool(&ic->acc->set, "fetch_mentions") ||
+        if (!(strcmp(txs->user->screen_name, td->user) == 0 ||
+              set_getbool(&ic->acc->set, "fetch_mentions") ||
               bee_user_by_handle(ic->bee, ic, txs->user->screen_name))) {
                 /* Tweet is from an unknown person and the user does not want
@@ -864 +866 @@
         
         twitter_status_show(ic, txs);
-        txs_free(txs);
         
         return TRUE;