diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/msn/soap.h | 2 | ||||
| -rw-r--r-- | protocols/oscar/rxqueue.c | 2 | ||||
| -rw-r--r-- | protocols/oscar/txqueue.c | 2 | ||||
| -rw-r--r-- | protocols/twitter/twitter.c | 6 | ||||
| -rw-r--r-- | protocols/yahoo/libyahoo2.c | 2 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo_httplib.c | 2 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo_util.h | 2 |
7 files changed, 4 insertions, 14 deletions
diff --git a/protocols/msn/soap.h b/protocols/msn/soap.h index cb731ea7..1fd1f32b 100644 --- a/protocols/msn/soap.h +++ b/protocols/msn/soap.h @@ -35,12 +35,10 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifndef _WIN32 #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> #include <unistd.h> -#endif #include "nogaim.h" diff --git a/protocols/oscar/rxqueue.c b/protocols/oscar/rxqueue.c index 081e967c..9ac8466e 100644 --- a/protocols/oscar/rxqueue.c +++ b/protocols/oscar/rxqueue.c @@ -8,9 +8,7 @@ #include <aim.h> -#ifndef _WIN32 #include <sys/socket.h> -#endif /* * diff --git a/protocols/oscar/txqueue.c b/protocols/oscar/txqueue.c index d38986d0..e48511fa 100644 --- a/protocols/oscar/txqueue.c +++ b/protocols/oscar/txqueue.c @@ -8,9 +8,7 @@ #include <aim.h> #include "im.h" -#ifndef _WIN32 #include <sys/socket.h> -#endif /* * Allocate a new tx frame. diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c index 5aefc008..2a6ae88f 100644 --- a/protocols/twitter/twitter.c +++ b/protocols/twitter/twitter.c @@ -322,7 +322,7 @@ static void twitter_init(account_t * acc) s = set_add(&acc->set, "show_ids", "true", set_eval_bool, acc); - s = set_add(&acc->set, "show_old_mentions", "20", set_eval_int, acc); + s = set_add(&acc->set, "show_old_mentions", "0", set_eval_int, acc); s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc); @@ -616,7 +616,9 @@ static void twitter_handle_command(struct im_connection *ic, char *message) twitter_log(ic, "Could not undo last action"); goto eof; - } else if (g_strcasecmp(cmd[0], "favourite") == 0 && cmd[1]) { + } else if ((g_strcasecmp(cmd[0], "favourite") == 0 || + g_strcasecmp(cmd[0], "favorite") == 0 || + g_strcasecmp(cmd[0], "fav") == 0) && cmd[1]) { if ((id = twitter_message_id_from_command_arg(ic, cmd[1], NULL))) { twitter_favourite_tweet(ic, id); } else { diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c index da427279..972ee134 100644 --- a/protocols/yahoo/libyahoo2.c +++ b/protocols/yahoo/libyahoo2.c @@ -47,9 +47,7 @@ * */ -#ifndef _WIN32 #include <unistd.h> -#endif #include <errno.h> #include <stdio.h> #include <stdarg.h> diff --git a/protocols/yahoo/yahoo_httplib.c b/protocols/yahoo/yahoo_httplib.c index fd63d507..93fdb263 100644 --- a/protocols/yahoo/yahoo_httplib.c +++ b/protocols/yahoo/yahoo_httplib.c @@ -37,9 +37,7 @@ char *strchr(), *strrchr(); #endif #include <errno.h> -#ifndef _WIN32 #include <unistd.h> -#endif #include <ctype.h> #include "yahoo2.h" #include "yahoo2_callbacks.h" diff --git a/protocols/yahoo/yahoo_util.h b/protocols/yahoo/yahoo_util.h index 8cb721c1..6b4da304 100644 --- a/protocols/yahoo/yahoo_util.h +++ b/protocols/yahoo/yahoo_util.h @@ -64,7 +64,6 @@ void *y_memdup(const void *addr, int n); char **y_strsplit(char *str, char *sep, int nelem); void y_strfreev(char **vector); -#ifndef _WIN32 int strncasecmp(const char *s1, const char *s2, size_t n); int strcasecmp(const char *s1, const char *s2); @@ -72,7 +71,6 @@ char *strdup(const char *s); int snprintf(char *str, size_t size, const char *format, ...); int vsnprintf(char *str, size_t size, const char *format, va_list ap); -#endif #endif |