Changeset 451f121

Timestamp:

2010-12-13T02:22:20Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

a618ea6

Parents:

71c4bb6

Message:

Drop <3.0 compatibility

Location:

skype

Files:

• README (modified) (1 diff)
• skype.c (modified) (9 diffs)

skype/README

@@ -32 +32 @@
 
 * Skype >= 1.4.0.99. The latest version I've tested is 2.1.0.81.
-* BitlBee >= 1.2.6. The lastest version I've tested is @BITLBEE_VERSION@. Use
+* BitlBee >= 3.0. The latest version I've tested is @BITLBEE_VERSION@. Use
   old versions (see the NEWS file about which one) if you have older BitlBee
   installed.

skype/skype.c

@@ -30 +30 @@
 #define IRC_LINE_SIZE 1024
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
-
-/*
- * Compatibility with BitlBee 1.3+
- */
-#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
-#define B_EV_IO_READ GAIM_INPUT_READ
-#endif
 
 /*
@@ -243 +236 @@
         imcb_ask(ic, message, bla, skype_call_ask_yes, skype_call_ask_no);
 }
-struct groupchat *skype_chat_by_name(struct im_connection *ic, char *name)
-{
-#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
-        struct groupchat *ret;
-
-        for (ret = ic->groupchats; ret; ret = ret->next)
-                if (strcmp(name, ret->title) == 0)
-                        break;
-
-        return ret;
-#else
-        return bee_chat_by_title(ic->bee, ic, name);
-#endif
-}
 
 static char *skype_call_strerror(int err)
@@ -342 +321 @@
         } 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);
-                buf = ptr + 10;
-                if (u) {
-                        if (u->status_msg)
-                                g_free(u->status_msg);
-                        if (strlen(buf))
-                                u->status_msg = g_strdup(buf);
-                        else
-                                u->status_msg = NULL;
-                }
-#else
                 bee_user_t *bu = bee_user_by_handle(ic->bee, ic, buf);
                 g_free(buf);
                 buf = ptr + 10;
-                if (bu) {
+                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);
@@ -589 +553 @@
                 info += 9;
                 if (sd->handle && sd->body && sd->type) {
-                        struct groupchat *gc = skype_chat_by_name(ic, info);
+                        struct groupchat *gc = bee_chat_by_title(ic->bee, ic, info);
                         int i;
                         for (i = 0; i < g_list_length(sd->body); i++) {
@@ -788 +752 @@
         info++;
         /* Remove fake chat if we created one in skype_chat_with() */
-        gc = skype_chat_by_name(ic, "");
+        gc = bee_chat_by_title(ic->bee, ic, "");
         if (gc)
                 imcb_chat_free(gc);
@@ -815 +779 @@
                 skype_printf(ic, "GET CHAT %s TOPIC\n", id);
         } else if (!strcmp(info, "STATUS UNSUBSCRIBED")) {
-                gc = skype_chat_by_name(ic, id);
+                gc = bee_chat_by_title(ic->bee, ic, id);
                 if (gc)
                         gc->data = (void *)FALSE;
@@ -824 +788 @@
         } else if (!strncmp(info, "TOPIC ", 6)) {
                 info += 6;
-                gc = skype_chat_by_name(ic, id);
+                gc = bee_chat_by_title(ic->bee, ic, id);
                 if (gc && (sd->adder || sd->topic_wait)) {
                         if (sd->topic_wait) {
@@ -836 +800 @@
         } else if (!strncmp(info, "ACTIVEMEMBERS ", 14)) {
                 info += 14;
-                gc = skype_chat_by_name(ic, id);
+                gc = bee_chat_by_title(ic->bee, ic, id);
                 /* Hack! We set ->data to TRUE
                  * while we're on the channel
@@ -1145 +1109 @@
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
-        char *nick;
 
         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)
-                        nick = u->handle;
-                else
-#endif
-                        nick = value;
-                skype_call(ic, nick);
+                skype_call(ic, value);
         } else
                 skype_hangup(ic);