Changeset 78d22cd0

Timestamp:

2010-08-03T11:12:59Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

3adc247

Parents:

8fcb196

git-author:

Wilmer van der Gaast <wilmer@…> (03-08-10 11:12:59)

git-committer:

Miklos Vajna <vmiklos@…> (03-08-10 11:12:59)

Message:

BitlBee 1.3.0 compatibility patch

File:

• skype/skype.c (modified) (6 diffs)

skype/skype.c

@@ -30 +30 @@
 #define IRC_LINE_SIZE 1024
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+
+/*
+ * Compatibility with BitlBee 1.3+
+ */
+#ifndef GAIM_INPUT_READ
+#define GAIM_INPUT_READ B_EV_IO_READ
+#endif
 
 /*
@@ -235 +242 @@
 struct groupchat *skype_chat_by_name(struct im_connection *ic, char *name)
 {
+#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
         struct groupchat *ret;
 
@@ -242 +250 @@
 
         return ret;
+#else
+        return bee_chat_by_title(ic->bee, ic, name);
+#endif
 }
 
@@ -326 +337 @@
                         g_free(buf);
                 }
-        } else if (!strncmp(ptr, "MOOD_TEXT ", 10) && set_getbool(&ic->acc->set, "show_moods")) {
+        } else if (!strncmp(ptr, "MOOD_TEXT ", 10)) {
                 char *buf = g_strdup_printf("%s@skype.com", user);
+#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
                 user_t *u = user_findhandle(ic, buf);
                 g_free(buf);
@@ -339 +351 @@
                                 u->status_msg = NULL;
                 }
-                imcb_log(ic, "User `%s' changed mood text to `%s'", user, buf);
+#else
+                bee_user_t *bu = bee_user_by_handle(ic->bee, ic, buf);
+                g_free(buf);
+                buf = ptr + 10;
+                if (bu) {
+                        imcb_buddy_status(ic, bu->handle, bu->flags, NULL,
+                                          *buf ? buf : NULL);
+                }
+#endif
+                if (set_getbool(&ic->acc->set, "show_moods"))
+                        imcb_log(ic, "User `%s' changed mood text to `%s'", user, buf);
         } else if (!strncmp(ptr, "FULLNAME ", 9))
                 sd->info_fullname = g_strdup(ptr + 9);
@@ -1085 +1107 @@
 
         if (value) {
+#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
+                /* IRC stuff shouldn't be touched from inside IM modules. */
                 user_t *u = user_find(acc->irc, value);
                 /* We are starting a call */
-                if (!u)
+                if (u)
+                        nick = g_strdup(u->handle);
+                else
+#endif
                         nick = g_strdup(value);
-                else
-                        nick = g_strdup(u->handle);
                 ptr = strchr(nick, '@');
                 if (ptr)