Changeset 62a2bf9 for protocols

Timestamp:

2013-01-05T13:47:56Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cfbecc9

Parents:

e6298e5 (diff), 757e1e0 (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 from vmiklos.

Location:

protocols/skype

Files:

• HACKING (modified) (1 diff)
• Makefile (modified) (3 diffs)
• README (modified) (3 diffs)
• asciidoc.conf (modified) (1 diff)
• skype.c (modified) (9 diffs)
• skyped.txt (modified) (1 diff)

protocols/skype/HACKING

@@ -17 +17 @@
 
 4) irssi
-
-== Get the code from git
-
-To get the code directly from git, you need:
-
-git clone git://vmiklos.hu/bitlbee-skype
-cd bitlbee-skype
-make autogen

protocols/skype/Makefile

@@ -4 +4 @@
 endif
 
-VERSION = 0.9.0
 DATE := $(shell date +%Y-%m-%d)
-# latest stable
-BITLBEE_VERSION = 3.0.1
 INSTALL = install
 ASCIIDOC = yes
@@ -17 +14 @@
 endif
 
-ifeq ($(BITLBEE),yes)
-LIBS = skype.$(SHARED_EXT)
-else
-LIBS =
-endif
-
-all: $(LIBS) $(MANPAGES)
-
-skype.$(SHARED_EXT): $(_SRCDIR_)skype.c config.mak
-ifeq ($(BITLBEE),yes)
-        $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(_SRCDIR_)skype.c $(LDFLAGS)
-endif
-
-install: all install-doc
-ifeq ($(BITLBEE),yes)
-        $(INSTALL) -d $(DESTDIR)$(plugindir)
-        $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir)
-endif
-ifeq ($(SKYPE4PY),yes)
-        $(INSTALL) -d $(DESTDIR)$(bindir)
-        $(INSTALL) -d $(DESTDIR)$(sysconfdir)
-        $(INSTALL) skyped.py $(DESTDIR)$(bindir)/skyped
-        perl -p -i -e 's|/usr/local/etc/skyped|$(sysconfdir)|' $(DESTDIR)$(bindir)/skyped
-        $(INSTALL) -m644 skyped.conf.dist $(DESTDIR)$(sysconfdir)/skyped.conf
-        perl -p -i -e 's|\$${prefix}|$(prefix)|' $(DESTDIR)$(sysconfdir)/skyped.conf
-        $(INSTALL) -m644 skyped.cnf $(DESTDIR)$(sysconfdir)
-endif
-
-client: $(_SRCDIR_)client.c
-
-autogen: configure.ac
-        cp $(shell ls /usr/share/automake-*/install-sh | tail -n1) ./
-        autoconf
+all: $(MANPAGES)
 
 clean:
-        rm -f $(LIBS) $(MANPAGES)
-
-distclean: clean
-        rm -f config.log config.mak config.status $(MANPAGES)
-
-autoclean: distclean
-        rm -rf aclocal.m4 autom4te.cache configure install-sh
+        rm -f $(MANPAGES)
 
 # take this from the kernel
 check:
-        perl checkpatch.pl --no-tree --file skype.c
+        perl checkpatch.pl --show-types --ignore LONG_LINE,CAMELCASE --no-tree --file skype.c
 
 test: all
         $(MAKE) -C t/ all
-
-dist:
-        git archive --format=tar --prefix=bitlbee-skype-$(VERSION)/ HEAD | tar xf -
-        mkdir -p bitlbee-skype-$(VERSION)
-        git log --no-merges |git name-rev --tags --stdin > bitlbee-skype-$(VERSION)/Changelog
-        make -C bitlbee-skype-$(VERSION) autogen
-        tar czf bitlbee-skype-$(VERSION).tar.gz bitlbee-skype-$(VERSION)
-        rm -rf bitlbee-skype-$(VERSION)
-
-release:
-        git tag $(VERSION)
-        $(MAKE) dist
-        gpg --comment "See http://vmiklos.hu/gpg/ for info" \
-                -ba bitlbee-skype-$(VERSION).tar.gz
 
 doc: $(MANPAGES)
@@ -92 +37 @@
         rm -f $(DESTDIR)$(MANDIR)/man1/skyped.1*
 
-HEADER.html: README Makefile
-        asciidoc -a toc -a numbered -a sectids -o HEADER.html -a icons -a data-uri --attribute iconsdir=./images/icons README
-        sed -i 's|@VERSION@|$(VERSION)|g' HEADER.html
-        sed -i 's|@BITLBEE_VERSION@|$(BITLBEE_VERSION)|g' HEADER.html
-
-Changelog: .git/refs/heads/master
-        git log --no-merges |git name-rev --tags --stdin >Changelog
-
-AUTHORS: .git/refs/heads/master
-        git shortlog -s -n |sed 's/.*\t//'> AUTHORS
-
 %.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf
-        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" \
-                -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage -D . $<
+        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage -D . $<

protocols/skype/README

@@ -347 +347 @@
   * `account skype set test_join true`
 
-- Mood texts are not shown by default. If you want to see it:
-
-  * `account skype set show_moods true`
+- Mood texts are not shown by default.
+
+  * If you want to see them: `account skype set show_moods true`
+  * If you want to change your mood text: `account skype set mood_text 'foo bar'`
 
 - Group support:
@@ -373 +374 @@
 
 If something does not work and it's not in the TODO section, then please
-contact me! Please also try the link:HACKING[git version] before reporting a bug, your
+contact me! Please also try the bzr version before reporting a bug, your
 problem may be already fixed there.
 
@@ -392 +393 @@
 
 == Additional resources
-
-You can reach the Changelog link:Changelog[here], and a gitweb interface
-http://vmiklos.hu/gitweb/?p=bitlbee-skype.git[here].
 
 The Skype API documentation is

protocols/skype/asciidoc.conf

@@ -5 +5 @@
 <refentry>
         <refentryinfo>
-                <date>{bs_date}</date>
+                <date>{bee_date}</date>
         </refentryinfo>
         <refmeta>
                 <refentrytitle>{mantitle}</refentrytitle>
                 <manvolnum>{manvolnum}</manvolnum>
-                <refmiscinfo class="source">bitlbee-skype</refmiscinfo>
-                <refmiscinfo class="version">{bs_version}</refmiscinfo>
-                <refmiscinfo class="manual">bitlbee-skype manual</refmiscinfo>
+                <refmiscinfo class="source">BitlBee</refmiscinfo>
+                <refmiscinfo class="manual">BitlBee manual</refmiscinfo>
         </refmeta>
         <refnamediv>

protocols/skype/skype.c

@@ -2 +2 @@
  *  skype.c - Skype plugin for BitlBee
  *
- *  Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 by Miklos Vajna <vmiklos@frugalware.org>
+ *  Copyright (c) 2007-2013 by Miklos Vajna <vmiklos@frugalware.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -214 +214 @@
         bla->handle = g_strdup(handle);
 
-        buf = g_strdup_printf("The user %s wants to add you to "
-                "his/her buddy list, saying: '%s'.", handle, message);
+        buf = g_strdup_printf("The user %s wants to add you to his/her buddy list, saying: '%s'.", handle, message);
         imcb_ask(ic, buf, bla, skype_buddy_ask_yes, skype_buddy_ask_no);
         g_free(buf);
@@ -409 +408 @@
                         g_string_free(st, TRUE);
                 }
-        }
-        else if (!strncmp(ptr, "BIRTHDAY ", 9)) {
+        } else if (!strncmp(ptr, "BIRTHDAY ", 9)) {
                 sd->info_birthday = g_strdup(ptr + 9);
 
@@ -566 +564 @@
 }
 
+static void skype_parse_chatmessage_said_emoted(struct im_connection *ic, struct groupchat *gc, char *body)
+{
+        struct skype_data *sd = ic->proto_data;
+        char buf[IRC_LINE_SIZE];
+        if (!strcmp(sd->type, "SAID")) {
+                if (!sd->is_edit)
+                        g_snprintf(buf, IRC_LINE_SIZE, "%s", body);
+                else {
+                        g_snprintf(buf, IRC_LINE_SIZE, "%s %s", set_getstr(&ic->acc->set, "edit_prefix"), body);
+                        sd->is_edit = 0;
+                }
+        } else
+                g_snprintf(buf, IRC_LINE_SIZE, "/me %s", body);
+        if (!gc)
+                /* Private message */
+                imcb_buddy_msg(ic, sd->handle, buf, 0, 0);
+        else
+                /* Groupchat message */
+                imcb_chat_msg(gc, sd->handle, buf, 0, 0);
+}
+
 static void skype_parse_chatmessage(struct im_connection *ic, char *line)
 {
         struct skype_data *sd = ic->proto_data;
-        char buf[IRC_LINE_SIZE];
         char *id = strchr(line, ' ');
 
@@ -627 +645 @@
                                 if (!strcmp(sd->type, "SAID") ||
                                         !strcmp(sd->type, "EMOTED")) {
-                                        if (!strcmp(sd->type, "SAID")) {
-                                                if (!sd->is_edit)
-                                                        g_snprintf(buf, IRC_LINE_SIZE, "%s",
-                                                                body);
-                                                else {
-                                                        g_snprintf(buf, IRC_LINE_SIZE, "%s %s",
-                                                                set_getstr(&ic->acc->set, "edit_prefix"),
-                                                                body);
-                                                        sd->is_edit = 0;
-                                                }
-                                        } else
-                                                g_snprintf(buf, IRC_LINE_SIZE, "/me %s",
-                                                        body);
-                                        if (!gc)
-                                                /* Private message */
-                                                imcb_buddy_msg(ic,
-                                                        sd->handle, buf, 0, 0);
-                                        else
-                                                /* Groupchat message */
-                                                imcb_chat_msg(gc,
-                                                        sd->handle, buf, 0, 0);
+                                        skype_parse_chatmessage_said_emoted(ic, gc, body);
                                 } else if (!strcmp(sd->type, "SETTOPIC") && gc)
                                         imcb_chat_topic(gc,
@@ -716 +714 @@
                 case SKYPE_CALL_RINGING:
                         if (sd->call_out)
-                                imcb_log(ic, "You are currently ringing "
-                                        "the user %s.", info);
+                                imcb_log(ic, "You are currently ringing the user %s.", info);
                         else {
                                 g_snprintf(buf, IRC_LINE_SIZE,
@@ -1231 +1228 @@
         skype_printf(ic, "SET USERSTATUS OFFLINE\n");
 
-        while( ic->groupchats )
+        while (ic->groupchats)
                 imcb_chat_free(ic->groupchats->data);
 
@@ -1319 +1316 @@
 
         skype_printf(ic, "SET PROFILE FULLNAME %s", value);
+        return value;
+}
+
+static char *skype_set_mood_text(set_t *set, char *value)
+{
+        account_t *acc = set->data;
+        struct im_connection *ic = acc->ic;
+
+        skype_printf(ic, "SET PROFILE MOOD_TEXT %s", value);
         return value;
 }
@@ -1514 +1520 @@
         s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
+        s = set_add(&acc->set, "mood_text", NULL, skype_set_mood_text, acc);
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+
         s = set_add(&acc->set, "call", NULL, skype_set_call, acc);
         s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;

protocols/skype/skyped.txt

@@ -12 +12 @@
 
 Skype supports remote control of the GUI client only via X11 or DBus
-messages. This is hard in care you want remote control. This daemon
+messages. This is hard in case you want remote control. This daemon
 listens on a TCP port and runs on the same machine where the GUI client
 runs. It passes all the input it gets to Skype directly, except for a