diff options
| author | Marius Halden <marius.h@lden.org> | 2016-07-26 08:45:29 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-07-26 08:45:29 +0200 |
| commit | 2b08324ee61be94fedd11c7885e297a0f85b9490 (patch) | |
| tree | e2d038633d71787f49fbc8c20abd9a559ed6b988 | |
| parent | 2e2b21996d42f1956db372df6e2bd25a0b089ceb (diff) | |
| parent | dc45a85c1996169df4517dc9bb7f7368cb176de5 (diff) | |
Merge branch 'master' into patched-master
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | protocols/purple/purple.c | 6 | ||||
| -rw-r--r-- | protocols/twitter/twitter_lib.c | 10 |
3 files changed, 23 insertions, 1 deletions
@@ -341,7 +341,13 @@ if [ -z "$PKG_CONFIG" ]; then PKG_CONFIG=pkg-config fi -if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then +if ! $PKG_CONFIG --version > /dev/null 2>/dev/null; then + echo + echo 'Cannot find pkg-config, aborting.' + exit 1 +fi + +if $PKG_CONFIG glib-2.0; then if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then cat<<EOF >>Makefile.settings EFLAGS+=$($PKG_CONFIG --libs glib-2.0 gmodule-2.0) 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. |