about summary refs log tree commit diff stats
path: root/src/profanity.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-06-05 23:02:56 +0100
committerJames Booth <boothj5@gmail.com>2015-06-05 23:02:56 +0100
commit9aff8abd2ed405e2790bb3918834ef501542d4f5 (patch)
treef78d54491b01c2c8d259f37459ad2229e6919d71 /src/profanity.c
parenta3693cfbe744c6ba8274b56a437f1faaaad414bf (diff)
parentae4e07ad87968072893b58c2ee778b52fc3059da (diff)
downloadprofani-tty-9aff8abd2ed405e2790bb3918834ef501542d4f5.tar.gz
Merge branch 'master' into openpgp
Conflicts:
	.travis.yml
Diffstat (limited to 'src/profanity.c')
-rw-r--r--src/profanity.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/profanity.c b/src/profanity.c
index 277fe4ad..7aee7a67 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -103,7 +103,7 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
         otr_poll();
 #endif
         notify_remind();
-        jabber_process_events();
+        jabber_process_events(10);
         ui_update();
     }
 }