aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/purple/purple.c6
-rw-r--r--protocols/twitter/twitter_lib.c10
2 files changed, 16 insertions, 0 deletions
diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c
index 4f10c9e7..87d628c3 100644
--- a/protocols/purple/purple.c
+++ b/protocols/purple/purple.c
@@ -1587,6 +1587,12 @@ void purple_initmodule()
GString *help;
char *dir;
+ if (purple_get_core() != NULL) {
+ log_message(LOGLVL_ERROR, "libpurple already initialized. "
+ "Please use inetd or ForkDaemon mode instead.");
+ return;
+ }
+
g_assert((int) B_EV_IO_READ == (int) PURPLE_INPUT_READ);
g_assert((int) B_EV_IO_WRITE == (int) PURPLE_INPUT_WRITE);
diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c
index a1e969a1..4ef22345 100644
--- a/protocols/twitter/twitter_lib.c
+++ b/protocols/twitter/twitter_lib.c
@@ -383,6 +383,11 @@ static void twitter_http_get_mutes_ids(struct http_request *req)
td = ic->proto_data;
+ if (req->status_code != 200) {
+ /* Fail silently */
+ return;
+ }
+
// Parse the data.
if (!(parsed = twitter_parse_response(ic, req))) {
return;
@@ -421,6 +426,11 @@ static void twitter_http_get_noretweets_ids(struct http_request *req)
return;
}
+ if (req->status_code != 200) {
+ /* Fail silently */
+ return;
+ }
+
td = ic->proto_data;
// Parse the data.