Changeset bf8ee39


Ignore:
Timestamp:
2011-06-16T21:59:06Z (9 years ago)
Author:
unknown <vmiklos@…>
Branches:
master
Children:
2ff0f37
Parents:
370899f (diff), 05d964c (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:

Merge IPv6 and groupchat fixes from hrubi.

Location:
protocols/skype
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/skype.c

    r370899f rbf8ee39  
    912912                imcb_chat_free(gc);
    913913        if (!strcmp(info, "STATUS MULTI_SUBSCRIBED")) {
    914                 gc = imcb_chat_new(ic, id);
    915                 imcb_chat_name_hint(gc, id);
     914                gc = bee_chat_by_title(ic->bee, ic, id);
     915                if (!gc) {
     916                        gc = imcb_chat_new(ic, id);
     917                        imcb_chat_name_hint(gc, id);
     918                }
    916919                skype_printf(ic, "GET CHAT %s ADDER\n", id);
    917920                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
     
    11981201        skype_printf(ic, "SET USERSTATUS OFFLINE\n");
    11991202
     1203        while( ic->groupchats )
     1204                imcb_chat_free(ic->groupchats->data);
     1205
    12001206        for (i = 0; i < g_list_length(sd->groups); i++) {
    12011207                struct skype_group *sg = (struct skype_group *)g_list_nth_data(sd->groups, i);
     
    13921398        char *ptr, *nick;
    13931399
    1394         /* Unused parameter */
    1395         who = who;
    1396 
    1397         nick = g_strdup(message);
     1400        nick = g_strdup(who);
    13981401        ptr = strchr(nick, '@');
    13991402        if (ptr)
  • protocols/skype/skyped.py

    r370899f rbf8ee39  
    180180def server(host, port, skype = None):
    181181        global options
    182         sock = socket.socket()
     182        if ":" in host:
     183                sock = socket.socket(socket.AF_INET6)
     184        else:
     185                sock = socket.socket()
    183186        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
    184187        sock.bind((host, port))
     
    360363        -d      --debug         enable debug messages
    361364        -h      --help          this help
    362         -H      --host          set the tcp host (default: %s)
     365        -H      --host          set the tcp host, supports IPv4 and IPv6 (default: %s)
    363366        -l      --log           set the log file in background mode (default: none)
    364367        -n      --nofork        don't run as daemon in the background
Note: See TracChangeset for help on using the changeset viewer.