diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2007-07-06 00:39:47 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2007-07-06 00:39:47 +0100 |
| commit | e90044208fc88636f843cdd188faa12e5db8c1c0 (patch) | |
| tree | 1238997e7436af5192ce8e127a783d3d687a9ff4 /protocols | |
| parent | 9da0bbfd42609f0f3864b5a16a3c1c378b7217c9 (diff) | |
| parent | 19a8088455308088139d0b2f6a8d0d4fbf982b29 (diff) | |
Merging from devel. Added documentation for the join_chat command, adding
a debian/ tree and a merge from Jelmer (mainly unittest stuff).
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Makefile | 1 | ||||
| -rw-r--r-- | protocols/jabber/Makefile | 1 | ||||
| -rw-r--r-- | protocols/msn/Makefile | 1 | ||||
| -rw-r--r-- | protocols/oscar/Makefile | 1 | ||||
| -rw-r--r-- | protocols/oscar/oscar.c | 3 | ||||
| -rw-r--r-- | protocols/yahoo/Makefile | 1 |
6 files changed, 7 insertions, 1 deletions
diff --git a/protocols/Makefile b/protocols/Makefile index 7f793bc4..f7d76e0f 100644 --- a/protocols/Makefile +++ b/protocols/Makefile @@ -26,6 +26,7 @@ LFLAGS += -r # [SH] Phony targets all: protocols.o check: all +lcov: gcov: gcov *.c diff --git a/protocols/jabber/Makefile b/protocols/jabber/Makefile index 1d5368b1..e042f812 100644 --- a/protocols/jabber/Makefile +++ b/protocols/jabber/Makefile @@ -17,6 +17,7 @@ LFLAGS += -r # [SH] Phony targets all: jabber_mod.o check: all +lcov: gcov: gcov *.c diff --git a/protocols/msn/Makefile b/protocols/msn/Makefile index f53b34ba..3440658d 100644 --- a/protocols/msn/Makefile +++ b/protocols/msn/Makefile @@ -17,6 +17,7 @@ LFLAGS += -r # [SH] Phony targets all: msn_mod.o check: all +lcov: gcov: gcov *.c diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile index ed2d7f83..95e85ec2 100644 --- a/protocols/oscar/Makefile +++ b/protocols/oscar/Makefile @@ -17,6 +17,7 @@ LFLAGS += -r # [SH] Phony targets all: oscar_mod.o check: all +lcov: gcov: gcov *.c diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index 39d14811..4d18e832 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -2255,7 +2255,8 @@ static int gaim_icqinfo(aim_session_t *sess, aim_frame_t *fr, ...) } } info_string_append(str, "\n", _("Mobile Phone"), info->mobile); - info_string_append(str, "\n", _("Gender"), info->gender==1 ? _("Female") : info->gender==2 ? _("Male") : _("Unknown")); + if (info->gender != 0) + info_string_append(str, "\n", _("Gender"), info->gender==1 ? _("Female") : _("Male")); if (info->birthyear || info->birthmonth || info->birthday) { char date[30]; struct tm tm; diff --git a/protocols/yahoo/Makefile b/protocols/yahoo/Makefile index 34c3551a..2cfd147b 100644 --- a/protocols/yahoo/Makefile +++ b/protocols/yahoo/Makefile @@ -17,6 +17,7 @@ LFLAGS += -r # [SH] Phony targets all: yahoo_mod.o check: all +lcov: gcov: gcov *.c |