diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-15 13:24:25 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-12-15 13:24:25 +0100 |
| commit | bd69a219c0a618354fd80a98dd0d9a04fee755e0 (patch) | |
| tree | b4477537e48c6d7b2e5a261aa860a0688d69fb66 /protocols/yahoo | |
| parent | 2983f5e8c2d3046bf01337e5caefa3af55ba6bff (diff) | |
| parent | bf02a679c61b0f030ee8f2f01698699a7775f7d5 (diff) | |
Merge Wilmer
Diffstat (limited to 'protocols/yahoo')
| -rw-r--r-- | protocols/yahoo/crypt.c | 4 | ||||
| -rw-r--r-- | protocols/yahoo/libyahoo2.c | 4 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo.c | 10 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo_httplib.c | 4 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo_util.c | 4 |
5 files changed, 8 insertions, 18 deletions
diff --git a/protocols/yahoo/crypt.c b/protocols/yahoo/crypt.c index 00eed70b..5122e3af 100644 --- a/protocols/yahoo/crypt.c +++ b/protocols/yahoo/crypt.c @@ -22,10 +22,6 @@ * already had. isn't that lovely. people should just use linux or * freebsd, crypt works properly on those systems. i hate solaris */ -#if HAVE_CONFIG_H -# include <config.h> -#endif - #if HAVE_STRING_H # include <string.h> #elif HAVE_STRINGS_H diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c index 62ceb0af..c691f18b 100644 --- a/protocols/yahoo/libyahoo2.c +++ b/protocols/yahoo/libyahoo2.c @@ -43,10 +43,6 @@ * */ -#if HAVE_CONFIG_H -# include <config.h> -#endif - #ifndef _WIN32 #include <unistd.h> #endif diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c index e55b30af..832d1ab4 100644 --- a/protocols/yahoo/yahoo.c +++ b/protocols/yahoo/yahoo.c @@ -634,8 +634,14 @@ void ext_yahoo_got_file( int id, char *who, char *url, long expires, char *msg, void ext_yahoo_typing_notify( int id, char *who, int stat ) { struct gaim_connection *gc = byahoo_get_gc_by_id( id ); - - serv_got_typing( gc, who, 1 ); + if (stat == 1) { + /* User is typing */ + serv_got_typing( gc, who, 1, 1 ); + } + else { + /* User stopped typing */ + serv_got_typing( gc, who, 1, 0 ); + } } void ext_yahoo_system_message( int id, char *msg ) diff --git a/protocols/yahoo/yahoo_httplib.c b/protocols/yahoo/yahoo_httplib.c index 41e31a23..dbbe2a84 100644 --- a/protocols/yahoo/yahoo_httplib.c +++ b/protocols/yahoo/yahoo_httplib.c @@ -19,10 +19,6 @@ * */ -#if HAVE_CONFIG_H -# include <config.h> -#endif - #include <stdio.h> #include <stdlib.h> diff --git a/protocols/yahoo/yahoo_util.c b/protocols/yahoo/yahoo_util.c index cb155e3c..3c99cf44 100644 --- a/protocols/yahoo/yahoo_util.c +++ b/protocols/yahoo/yahoo_util.c @@ -19,10 +19,6 @@ * */ -#if HAVE_CONFIG_H -# include <config.h> -#endif - #if STDC_HEADERS # include <string.h> #else |