aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2010-04-20 00:25:33 +0200
committerMiklos Vajna <vmiklos@frugalware.org>2010-04-20 00:25:33 +0200
commit1aacc0c054c7ac90e15b80a85f239e843cf01bcc (patch)
treeeb273ca63d6abeedc4faf87e1caf4c381c1cab23
parent7cf146f37ae8fbc071c255cf20eb14e82186daf3 (diff)
update for 1.2.6
also a bit of cleanup. you can still build for 1.2.5 using '-DBITLBEE_VER(a,b,c)'='(((a) << 16) + ((b) << 8) + (c))' if you really want, though.
-rw-r--r--skype/Makefile2
-rw-r--r--skype/skype.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/skype/Makefile b/skype/Makefile
index 4aeb2e5e..4b1f2d5f 100644
--- a/skype/Makefile
+++ b/skype/Makefile
@@ -3,7 +3,7 @@
VERSION = 0.8.2
DATE := $(shell date +%Y-%m-%d)
# latest stable
-BITLBEE_VERSION = 1.2.5
+BITLBEE_VERSION = 1.2.6
AMPATH = $(shell grep automake- $(shell which automake)|sed "s|.*'\(.*\)';|\1|")
diff --git a/skype/skype.c b/skype/skype.c
index d19a0d0b..2e96d72e 100644
--- a/skype/skype.c
+++ b/skype/skype.c
@@ -768,20 +768,16 @@ static void skype_parse_chat(struct im_connection *ic, char *line)
imcb_chat_free(gc);
if (!strcmp(info, "STATUS MULTI_SUBSCRIBED")) {
gc = imcb_chat_new(ic, id);
-#ifdef BITLBEE_VERSION_CODE
#if BITLBEE_VERSION_CODE >= BITLBEE_VER(1, 2, 6)
imcb_chat_name_hint(gc, id);
#endif
-#endif
skype_printf(ic, "GET CHAT %s ADDER\n", id);
skype_printf(ic, "GET CHAT %s TOPIC\n", id);
} else if (!strcmp(info, "STATUS DIALOG") && sd->groupchat_with) {
gc = imcb_chat_new(ic, id);
-#ifdef BITLBEE_VERSION_CODE
#if BITLBEE_VERSION_CODE >= BITLBEE_VER(1, 2, 6)
imcb_chat_name_hint(gc, id);
#endif
-#endif
/* According to the docs this
* is necessary. However it
* does not seem the situation