Changeset 62a2bf9
- Timestamp:
- 2013-01-05T13:47:56Z (12 years ago)
- 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. - Files:
-
- 8 edited
-
Makefile (modified) (1 diff)
-
lib/json.c (modified) (1 diff)
-
protocols/skype/HACKING (modified) (1 diff)
-
protocols/skype/Makefile (modified) (3 diffs)
-
protocols/skype/README (modified) (3 diffs)
-
protocols/skype/asciidoc.conf (modified) (1 diff)
-
protocols/skype/skype.c (modified) (9 diffs)
-
protocols/skype/skyped.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
Makefile
re6298e5 r62a2bf9 55 55 rm -f *.o $(OUTFILE) core utils/bitlbeed init/bitlbee*.service 56 56 $(MAKE) -C tests clean 57 ifdef SKYPE_PI 58 $(MAKE) -C protocols/skype clean 59 endif 57 60 58 61 distclean: clean $(subdirs) -
lib/json.c
re6298e5 r62a2bf9 213 213 json_uchar uchar; 214 214 unsigned char uc_b1, uc_b2, uc_b3, uc_b4; 215 json_char * string ;216 unsigned int string_length ;215 json_char * string = 0; 216 unsigned int string_length = 0; 217 217 218 218 top = root = 0; -
protocols/skype/HACKING
re6298e5 r62a2bf9 17 17 18 18 4) irssi 19 20 == Get the code from git21 22 To get the code directly from git, you need:23 24 git clone git://vmiklos.hu/bitlbee-skype25 cd bitlbee-skype26 make autogen -
protocols/skype/Makefile
re6298e5 r62a2bf9 4 4 endif 5 5 6 VERSION = 0.9.07 6 DATE := $(shell date +%Y-%m-%d) 8 # latest stable9 BITLBEE_VERSION = 3.0.110 7 INSTALL = install 11 8 ASCIIDOC = yes … … 17 14 endif 18 15 19 ifeq ($(BITLBEE),yes) 20 LIBS = skype.$(SHARED_EXT) 21 else 22 LIBS = 23 endif 24 25 all: $(LIBS) $(MANPAGES) 26 27 skype.$(SHARED_EXT): $(_SRCDIR_)skype.c config.mak 28 ifeq ($(BITLBEE),yes) 29 $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(_SRCDIR_)skype.c $(LDFLAGS) 30 endif 31 32 install: all install-doc 33 ifeq ($(BITLBEE),yes) 34 $(INSTALL) -d $(DESTDIR)$(plugindir) 35 $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir) 36 endif 37 ifeq ($(SKYPE4PY),yes) 38 $(INSTALL) -d $(DESTDIR)$(bindir) 39 $(INSTALL) -d $(DESTDIR)$(sysconfdir) 40 $(INSTALL) skyped.py $(DESTDIR)$(bindir)/skyped 41 perl -p -i -e 's|/usr/local/etc/skyped|$(sysconfdir)|' $(DESTDIR)$(bindir)/skyped 42 $(INSTALL) -m644 skyped.conf.dist $(DESTDIR)$(sysconfdir)/skyped.conf 43 perl -p -i -e 's|\$${prefix}|$(prefix)|' $(DESTDIR)$(sysconfdir)/skyped.conf 44 $(INSTALL) -m644 skyped.cnf $(DESTDIR)$(sysconfdir) 45 endif 46 47 client: $(_SRCDIR_)client.c 48 49 autogen: configure.ac 50 cp $(shell ls /usr/share/automake-*/install-sh | tail -n1) ./ 51 autoconf 16 all: $(MANPAGES) 52 17 53 18 clean: 54 rm -f $(LIBS) $(MANPAGES) 55 56 distclean: clean 57 rm -f config.log config.mak config.status $(MANPAGES) 58 59 autoclean: distclean 60 rm -rf aclocal.m4 autom4te.cache configure install-sh 19 rm -f $(MANPAGES) 61 20 62 21 # take this from the kernel 63 22 check: 64 perl checkpatch.pl -- no-tree --file skype.c23 perl checkpatch.pl --show-types --ignore LONG_LINE,CAMELCASE --no-tree --file skype.c 65 24 66 25 test: all 67 26 $(MAKE) -C t/ all 68 69 dist:70 git archive --format=tar --prefix=bitlbee-skype-$(VERSION)/ HEAD | tar xf -71 mkdir -p bitlbee-skype-$(VERSION)72 git log --no-merges |git name-rev --tags --stdin > bitlbee-skype-$(VERSION)/Changelog73 make -C bitlbee-skype-$(VERSION) autogen74 tar czf bitlbee-skype-$(VERSION).tar.gz bitlbee-skype-$(VERSION)75 rm -rf bitlbee-skype-$(VERSION)76 77 release:78 git tag $(VERSION)79 $(MAKE) dist80 gpg --comment "See http://vmiklos.hu/gpg/ for info" \81 -ba bitlbee-skype-$(VERSION).tar.gz82 27 83 28 doc: $(MANPAGES) … … 92 37 rm -f $(DESTDIR)$(MANDIR)/man1/skyped.1* 93 38 94 HEADER.html: README Makefile95 asciidoc -a toc -a numbered -a sectids -o HEADER.html -a icons -a data-uri --attribute iconsdir=./images/icons README96 sed -i 's|@VERSION@|$(VERSION)|g' HEADER.html97 sed -i 's|@BITLBEE_VERSION@|$(BITLBEE_VERSION)|g' HEADER.html98 99 Changelog: .git/refs/heads/master100 git log --no-merges |git name-rev --tags --stdin >Changelog101 102 AUTHORS: .git/refs/heads/master103 git shortlog -s -n |sed 's/.*\t//'> AUTHORS104 105 39 %.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf 106 a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" \ 107 -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage -D . $< 40 a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage -D . $< -
protocols/skype/README
re6298e5 r62a2bf9 347 347 * `account skype set test_join true` 348 348 349 - Mood texts are not shown by default. If you want to see it: 350 351 * `account skype set show_moods true` 349 - Mood texts are not shown by default. 350 351 * If you want to see them: `account skype set show_moods true` 352 * If you want to change your mood text: `account skype set mood_text 'foo bar'` 352 353 353 354 - Group support: … … 373 374 374 375 If something does not work and it's not in the TODO section, then please 375 contact me! Please also try the link:HACKING[git version]before reporting a bug, your376 contact me! Please also try the bzr version before reporting a bug, your 376 377 problem may be already fixed there. 377 378 … … 392 393 393 394 == Additional resources 394 395 You can reach the Changelog link:Changelog[here], and a gitweb interface396 http://vmiklos.hu/gitweb/?p=bitlbee-skype.git[here].397 395 398 396 The Skype API documentation is -
protocols/skype/asciidoc.conf
re6298e5 r62a2bf9 5 5 <refentry> 6 6 <refentryinfo> 7 <date>{b s_date}</date>7 <date>{bee_date}</date> 8 8 </refentryinfo> 9 9 <refmeta> 10 10 <refentrytitle>{mantitle}</refentrytitle> 11 11 <manvolnum>{manvolnum}</manvolnum> 12 <refmiscinfo class="source">bitlbee-skype</refmiscinfo> 13 <refmiscinfo class="version">{bs_version}</refmiscinfo> 14 <refmiscinfo class="manual">bitlbee-skype manual</refmiscinfo> 12 <refmiscinfo class="source">BitlBee</refmiscinfo> 13 <refmiscinfo class="manual">BitlBee manual</refmiscinfo> 15 14 </refmeta> 16 15 <refnamediv> -
protocols/skype/skype.c
re6298e5 r62a2bf9 2 2 * skype.c - Skype plugin for BitlBee 3 3 * 4 * Copyright (c) 2007 , 2008, 2009, 2010, 2011, 2012by Miklos Vajna <vmiklos@frugalware.org>4 * Copyright (c) 2007-2013 by Miklos Vajna <vmiklos@frugalware.org> 5 5 * 6 6 * This program is free software; you can redistribute it and/or modify … … 214 214 bla->handle = g_strdup(handle); 215 215 216 buf = g_strdup_printf("The user %s wants to add you to " 217 "his/her buddy list, saying: '%s'.", handle, message); 216 buf = g_strdup_printf("The user %s wants to add you to his/her buddy list, saying: '%s'.", handle, message); 218 217 imcb_ask(ic, buf, bla, skype_buddy_ask_yes, skype_buddy_ask_no); 219 218 g_free(buf); … … 409 408 g_string_free(st, TRUE); 410 409 } 411 } 412 else if (!strncmp(ptr, "BIRTHDAY ", 9)) { 410 } else if (!strncmp(ptr, "BIRTHDAY ", 9)) { 413 411 sd->info_birthday = g_strdup(ptr + 9); 414 412 … … 566 564 } 567 565 566 static void skype_parse_chatmessage_said_emoted(struct im_connection *ic, struct groupchat *gc, char *body) 567 { 568 struct skype_data *sd = ic->proto_data; 569 char buf[IRC_LINE_SIZE]; 570 if (!strcmp(sd->type, "SAID")) { 571 if (!sd->is_edit) 572 g_snprintf(buf, IRC_LINE_SIZE, "%s", body); 573 else { 574 g_snprintf(buf, IRC_LINE_SIZE, "%s %s", set_getstr(&ic->acc->set, "edit_prefix"), body); 575 sd->is_edit = 0; 576 } 577 } else 578 g_snprintf(buf, IRC_LINE_SIZE, "/me %s", body); 579 if (!gc) 580 /* Private message */ 581 imcb_buddy_msg(ic, sd->handle, buf, 0, 0); 582 else 583 /* Groupchat message */ 584 imcb_chat_msg(gc, sd->handle, buf, 0, 0); 585 } 586 568 587 static void skype_parse_chatmessage(struct im_connection *ic, char *line) 569 588 { 570 589 struct skype_data *sd = ic->proto_data; 571 char buf[IRC_LINE_SIZE];572 590 char *id = strchr(line, ' '); 573 591 … … 627 645 if (!strcmp(sd->type, "SAID") || 628 646 !strcmp(sd->type, "EMOTED")) { 629 if (!strcmp(sd->type, "SAID")) { 630 if (!sd->is_edit) 631 g_snprintf(buf, IRC_LINE_SIZE, "%s", 632 body); 633 else { 634 g_snprintf(buf, IRC_LINE_SIZE, "%s %s", 635 set_getstr(&ic->acc->set, "edit_prefix"), 636 body); 637 sd->is_edit = 0; 638 } 639 } else 640 g_snprintf(buf, IRC_LINE_SIZE, "/me %s", 641 body); 642 if (!gc) 643 /* Private message */ 644 imcb_buddy_msg(ic, 645 sd->handle, buf, 0, 0); 646 else 647 /* Groupchat message */ 648 imcb_chat_msg(gc, 649 sd->handle, buf, 0, 0); 647 skype_parse_chatmessage_said_emoted(ic, gc, body); 650 648 } else if (!strcmp(sd->type, "SETTOPIC") && gc) 651 649 imcb_chat_topic(gc, … … 716 714 case SKYPE_CALL_RINGING: 717 715 if (sd->call_out) 718 imcb_log(ic, "You are currently ringing " 719 "the user %s.", info); 716 imcb_log(ic, "You are currently ringing the user %s.", info); 720 717 else { 721 718 g_snprintf(buf, IRC_LINE_SIZE, … … 1231 1228 skype_printf(ic, "SET USERSTATUS OFFLINE\n"); 1232 1229 1233 while ( ic->groupchats)1230 while (ic->groupchats) 1234 1231 imcb_chat_free(ic->groupchats->data); 1235 1232 … … 1319 1316 1320 1317 skype_printf(ic, "SET PROFILE FULLNAME %s", value); 1318 return value; 1319 } 1320 1321 static char *skype_set_mood_text(set_t *set, char *value) 1322 { 1323 account_t *acc = set->data; 1324 struct im_connection *ic = acc->ic; 1325 1326 skype_printf(ic, "SET PROFILE MOOD_TEXT %s", value); 1321 1327 return value; 1322 1328 } … … 1514 1520 s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY; 1515 1521 1522 s = set_add(&acc->set, "mood_text", NULL, skype_set_mood_text, acc); 1523 s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY; 1524 1516 1525 s = set_add(&acc->set, "call", NULL, skype_set_call, acc); 1517 1526 s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY; -
protocols/skype/skyped.txt
re6298e5 r62a2bf9 12 12 13 13 Skype supports remote control of the GUI client only via X11 or DBus 14 messages. This is hard in ca re you want remote control. This daemon14 messages. This is hard in case you want remote control. This daemon 15 15 listens on a TCP port and runs on the same machine where the GUI client 16 16 runs. It passes all the input it gets to Skype directly, except for a
Note: See TracChangeset
for help on using the changeset viewer.
