Changeset e900442 for protocols

Timestamp:

2007-07-05T23:39:47Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c9c7ca7

Parents:

9da0bbf (diff), 19a8088 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from devel. Added documentation for the join_chat command, adding
a debian/ tree and a merge from Jelmer (mainly unittest stuff).

Location:

protocols

Files:

• Makefile (modified) (1 diff)
• jabber/Makefile (modified) (1 diff)
• msn/Makefile (modified) (1 diff)
• oscar/Makefile (modified) (1 diff)
• oscar/oscar.c (modified) (1 diff)
• yahoo/Makefile (modified) (1 diff)

protocols/Makefile

@@ -27 +27 @@
 all: protocols.o
 check: all
+lcov:
 gcov:
         gcov *.c

protocols/jabber/Makefile

@@ -18 +18 @@
 all: jabber_mod.o
 check: all
+lcov:
 gcov: 
         gcov *.c

protocols/msn/Makefile

@@ -18 +18 @@
 all: msn_mod.o
 check: all
+lcov:
 gcov: 
         gcov *.c

protocols/oscar/Makefile

@@ -18 +18 @@
 all: oscar_mod.o
 check: all
+lcov:
 gcov:
         gcov *.c

protocols/oscar/oscar.c

@@ -2256 +2256 @@
         }
         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];

protocols/yahoo/Makefile

@@ -18 +18 @@
 all: yahoo_mod.o
 check: all
+lcov:
 gcov: 
         gcov *.c