Merge commit 'upstream/0.1.6' into debian
Jonny Lamb
14 years ago
0 | commit e4adae82d0f6cd8752768e71b1e47861ed3e883d | |
1 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
2 | Date: Fri Feb 19 12:58:40 2010 +0000 | |
3 | ||
4 | prepare 0.1.6 release | |
5 | ||
6 | NEWS | 21 ++++++++++++++++++++- | |
7 | configure.ac | 4 ++-- | |
8 | 2 files changed, 22 insertions(+), 3 deletions(-) | |
9 | ||
10 | commit ce17922d0ed5bbc337c79cc6051fcdc7d78fc362 | |
11 | Author: Simon McVittie <http://smcv.pseudorandom.co.uk/> | |
12 | Date: Thu Oct 15 20:28:25 2009 +0100 | |
13 | ||
14 | Fix bug report URL for current bugzilla components | |
15 | ||
16 | configure.ac | 2 +- | |
17 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
18 | ||
19 | commit 38cf99fc56425823b11e486effe3f98c1168a905 | |
20 | Author: Simon McVittie <http://smcv.pseudorandom.co.uk/> | |
21 | Date: Thu Oct 15 20:24:58 2009 +0100 | |
22 | ||
23 | fd.o#24559: flag password parameter as secret | |
24 | ||
25 | data/idle.manager | 2 +- | |
26 | src/idle-connection-manager.c | 4 +++- | |
27 | 2 files changed, 4 insertions(+), 2 deletions(-) | |
28 | ||
29 | commit 7e720131e95683bf96f4b4db0e262ea19b5d8479 | |
30 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
31 | Date: Fri Feb 19 12:11:12 2010 +0000 | |
32 | ||
33 | Implement Debug interface (fdo #26646) | |
34 | ||
35 | src/idle-connection-manager.c | 12 +++++++++ | |
36 | src/idle-debug.c | 53 +++++++++++++++++++++++++++++++++++++++++ | |
37 | src/idle-debug.h | 2 + | |
38 | src/idle.c | 13 ++++++++- | |
39 | 4 files changed, 78 insertions(+), 2 deletions(-) | |
40 | ||
41 | commit c52eeda0d4c7a5a99d35fbbf5db49478f6630ad2 | |
42 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
43 | Date: Fri Feb 19 11:46:55 2010 +0000 | |
44 | ||
45 | idle_debug: refactor to use g_strdup_vprintf | |
46 | ||
47 | src/idle-debug.c | 17 ++++++++++------- | |
48 | 1 files changed, 10 insertions(+), 7 deletions(-) | |
49 | ||
50 | commit a5b64fe0e33eb6e03eaa05eff4946a12445f76eb | |
51 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
52 | Date: Thu Feb 18 17:40:06 2010 +0000 | |
53 | ||
54 | Add ourself to remote-pending while joining the channel (fd.o #25039) | |
55 | ||
56 | src/idle-muc-channel.c | 12 ++++++++++++ | |
57 | 1 files changed, 12 insertions(+), 0 deletions(-) | |
58 | ||
59 | commit b0b127e4c84cc2c0824d971f6bfca030fd8454ea | |
60 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
61 | Date: Thu Feb 18 18:06:23 2010 +0000 | |
62 | ||
63 | Bump tp-glib dep to 0.8.0 | |
64 | ||
65 | We are going to use tp_intset_new_containing which has been added to 0.7.26 | |
66 | but there is no harm to dump to 0.8. | |
67 | ||
68 | configure.ac | 2 +- | |
69 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
70 | ||
71 | commit d2d1f1db61c823124a9eff60ba9746414ac47683 | |
72 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
73 | Date: Thu Feb 18 14:59:28 2010 +0000 | |
74 | ||
75 | document IDLE_LOGFILE in man page | |
76 | ||
77 | src/telepathy-idle.8.in | 7 +++++++ | |
78 | 1 files changed, 7 insertions(+), 0 deletions(-) | |
79 | ||
80 | commit 7e923479272d7ae3d7b66994a5958333fc03b4b0 | |
81 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
82 | Date: Thu Feb 18 14:52:15 2010 +0000 | |
83 | ||
84 | Add IDLE_LOGFILE support (fd.o #26627) | |
85 | ||
86 | src/idle.c | 2 ++ | |
87 | 1 files changed, 2 insertions(+), 0 deletions(-) | |
88 | ||
89 | commit 20d7ecf47f5a731b6b5e76c17c896c2415945f73 | |
90 | Author: Jonathon Jongsma <jonathon.jongsma@collabora.co.uk> | |
91 | Date: Tue Oct 6 22:46:23 2009 -0500 | |
92 | ||
93 | Fix two valgrind-reported leaks | |
94 | ||
95 | For some reason, we were strduping the channel name needlessly in | |
96 | _channel_normalize_func() | |
97 | Also, we forgot to free the bodies returned from idle_text_encode_and_split() | |
98 | ||
99 | src/idle-handles.c | 8 ++------ | |
100 | src/idle-text.c | 1 + | |
101 | 2 files changed, 3 insertions(+), 6 deletions(-) | |
102 | ||
103 | commit 441f063e26ef604926be1e05a073439d758b35fd | |
104 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
105 | Date: Tue Oct 6 20:45:43 2009 +0100 | |
106 | ||
107 | idle-connection-manager: remove unused PARAM enum | |
108 | ||
109 | src/idle-connection-manager.c | 12 ------------ | |
110 | 1 files changed, 0 insertions(+), 12 deletions(-) | |
111 | ||
112 | commit e746d0b0ff520dfb3f41519da7c38bbecc14ff32 | |
113 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
114 | Date: Tue Oct 6 20:44:27 2009 +0100 | |
115 | ||
116 | idle.manager: add username param | |
117 | ||
118 | Param was implemented but has been forget in the manager file for some | |
119 | reason. | |
120 | ||
121 | data/idle.manager | 1 + | |
122 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
123 | ||
124 | commit 0da5af160fe1aee19eaa9f33f5b196bc521b4652 | |
125 | Author: Jonny Lamb <jonny.lamb@collabora.co.uk> | |
126 | Date: Mon Sep 14 12:56:58 2009 +0100 | |
127 | ||
128 | Bump to 0.1.5.1. | |
129 | ||
130 | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> | |
131 | ||
132 | NEWS | 7 +++++++ | |
133 | configure.ac | 2 +- | |
134 | 2 files changed, 8 insertions(+), 1 deletions(-) | |
135 | ||
0 | 136 | commit ee9c0c816f8bdaa8d4927a365116351b6aad2e48 |
1 | 137 | Author: Jonny Lamb <jonny.lamb@collabora.co.uk> |
2 | 138 | Date: Mon Sep 14 12:20:01 2009 +0100 |
0 | telepathy-idle 0.1.6 (2010-02-19) | |
1 | ================================= | |
2 | ||
3 | The “No. Some of it's Cointreau.” release. | |
4 | ||
5 | Dependencies: | |
6 | ||
7 | * telepathy-glib 0.8.0 | |
8 | ||
9 | Enhancements: | |
10 | ||
11 | * Implement IDLE_LOGFILE to divert output to a file. (cassidy) | |
12 | ||
13 | * Implement Debug interface. (cassidy) | |
14 | ||
15 | Fixes: | |
16 | ||
17 | * Add username parameter to the manager file. (cassidy) | |
18 | ||
19 | * Fix some memory leaks. (jonner) | |
20 | ||
21 | * Add ourself to remote-pending when creating a room channel. | |
22 | (fd.o #25039, cassidy) | |
23 | ||
24 | * Flag password parameter as secret (fd.o #24559, smcv) | |
25 | ||
0 | 26 | telepathy-idle 0.1.5 (2009-09-14) |
1 | 27 | ================================= |
2 | 28 |
0 | 0 | #! /bin/sh |
1 | 1 | # Attempt to guess a canonical system name. |
2 | 2 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | |
3 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 | |
4 | 4 | # Free Software Foundation, Inc. |
5 | 5 | |
6 | timestamp='2009-06-10' | |
6 | timestamp='2009-04-27' | |
7 | 7 | |
8 | 8 | # This file is free software; you can redistribute it and/or modify it |
9 | 9 | # under the terms of the GNU General Public License as published by |
169 | 169 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
170 | 170 | eval $set_cc_for_build |
171 | 171 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
172 | | grep -q __ELF__ | |
172 | | grep __ELF__ >/dev/null | |
173 | 173 | then |
174 | 174 | # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). |
175 | 175 | # Return netbsd for either. FIX? |
655 | 655 | # => hppa64-hp-hpux11.23 |
656 | 656 | |
657 | 657 | if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
658 | grep -q __LP64__ | |
658 | grep __LP64__ >/dev/null | |
659 | 659 | then |
660 | 660 | HP_ARCH="hppa2.0w" |
661 | 661 | else |
821 | 821 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
822 | 822 | echo i${UNAME_MACHINE}-pc-mks |
823 | 823 | exit ;; |
824 | 8664:Windows_NT:*) | |
825 | echo x86_64-pc-mks | |
826 | exit ;; | |
827 | 824 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
828 | 825 | # How do we know it's Interix rather than the generic POSIX subsystem? |
829 | 826 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
884 | 881 | m68*:Linux:*:*) |
885 | 882 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
886 | 883 | exit ;; |
887 | mips:Linux:*:* | mips64:Linux:*:*) | |
884 | mips:Linux:*:*) | |
888 | 885 | eval $set_cc_for_build |
889 | 886 | sed 's/^ //' << EOF >$dummy.c |
890 | 887 | #undef CPU |
891 | #undef ${UNAME_MACHINE} | |
892 | #undef ${UNAME_MACHINE}el | |
888 | #undef mips | |
889 | #undef mipsel | |
893 | 890 | #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
894 | CPU=${UNAME_MACHINE}el | |
891 | CPU=mipsel | |
895 | 892 | #else |
896 | 893 | #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
897 | CPU=${UNAME_MACHINE} | |
894 | CPU=mips | |
895 | #else | |
896 | CPU= | |
897 | #endif | |
898 | #endif | |
899 | EOF | |
900 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | |
901 | /^CPU/{ | |
902 | s: ::g | |
903 | p | |
904 | }'`" | |
905 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | |
906 | ;; | |
907 | mips64:Linux:*:*) | |
908 | eval $set_cc_for_build | |
909 | sed 's/^ //' << EOF >$dummy.c | |
910 | #undef CPU | |
911 | #undef mips64 | |
912 | #undef mips64el | |
913 | #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) | |
914 | CPU=mips64el | |
915 | #else | |
916 | #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) | |
917 | CPU=mips64 | |
898 | 918 | #else |
899 | 919 | CPU= |
900 | 920 | #endif |
926 | 946 | EV67) UNAME_MACHINE=alphaev67 ;; |
927 | 947 | EV68*) UNAME_MACHINE=alphaev68 ;; |
928 | 948 | esac |
929 | objdump --private-headers /bin/sh | grep -q ld.so.1 | |
949 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null | |
930 | 950 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
931 | 951 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
932 | 952 | exit ;; |
980 | 1000 | elf32-i386) |
981 | 1001 | TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
982 | 1002 | ;; |
1003 | a.out-i386-linux) | |
1004 | echo "${UNAME_MACHINE}-pc-linux-gnuaout" | |
1005 | exit ;; | |
1006 | "") | |
1007 | # Either a pre-BFD a.out linker (linux-gnuoldld) or | |
1008 | # one that does not give us useful --help. | |
1009 | echo "${UNAME_MACHINE}-pc-linux-gnuoldld" | |
1010 | exit ;; | |
983 | 1011 | esac |
984 | 1012 | # Determine whether the default compiler is a.out or elf |
985 | 1013 | eval $set_cc_for_build |
1045 | 1073 | i*86:syllable:*:*) |
1046 | 1074 | echo ${UNAME_MACHINE}-pc-syllable |
1047 | 1075 | exit ;; |
1048 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) | |
1076 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | |
1049 | 1077 | echo i386-unknown-lynxos${UNAME_RELEASE} |
1050 | 1078 | exit ;; |
1051 | 1079 | i*86:*DOS:*:*) |
1153 | 1181 | rs6000:LynxOS:2.*:*) |
1154 | 1182 | echo rs6000-unknown-lynxos${UNAME_RELEASE} |
1155 | 1183 | exit ;; |
1156 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) | |
1184 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) | |
1157 | 1185 | echo powerpc-unknown-lynxos${UNAME_RELEASE} |
1158 | 1186 | exit ;; |
1159 | 1187 | SM[BE]S:UNIX_SV:*:*) |
0 | 0 | #! /bin/sh |
1 | 1 | # Configuration validation subroutine script. |
2 | 2 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | |
3 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 | |
4 | 4 | # Free Software Foundation, Inc. |
5 | 5 | |
6 | timestamp='2009-06-11' | |
6 | timestamp='2009-04-17' | |
7 | 7 | |
8 | 8 | # This file is (in principle) common to ALL GNU software. |
9 | 9 | # The presence of a machine in this file suggests that SOME GNU software |
151 | 151 | -apple | -axis | -knuth | -cray) |
152 | 152 | os= |
153 | 153 | basic_machine=$1 |
154 | ;; | |
155 | -bluegene*) | |
156 | os=-cnk | |
157 | 154 | ;; |
158 | 155 | -sim | -cisco | -oki | -wec | -winbond) |
159 | 156 | os= |
469 | 466 | basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
470 | 467 | os=-linux |
471 | 468 | ;; |
472 | bluegene*) | |
473 | basic_machine=powerpc-ibm | |
474 | os=-cnk | |
475 | ;; | |
476 | 469 | c90) |
477 | 470 | basic_machine=c90-cray |
478 | 471 | os=-unicos |
1266 | 1259 | # Each alternative MUST END IN A *, to match a version number. |
1267 | 1260 | # -sysv* is not here because it comes later, after sysvr4. |
1268 | 1261 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
1269 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | |
1262 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | |
1270 | 1263 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
1271 | 1264 | | -kopensolaris* \ |
1272 | 1265 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
1619 | 1612 | -sunos*) |
1620 | 1613 | vendor=sun |
1621 | 1614 | ;; |
1622 | -cnk*|-aix*) | |
1615 | -aix*) | |
1623 | 1616 | vendor=ibm |
1624 | 1617 | ;; |
1625 | 1618 | -beos*) |
0 | 0 | #! /bin/sh |
1 | 1 | # Guess values for system-dependent variables and create Makefiles. |
2 | # Generated by GNU Autoconf 2.64 for telepathy-idle 0.1.5. | |
2 | # Generated by GNU Autoconf 2.64 for telepathy-idle 0.1.6. | |
3 | 3 | # |
4 | # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle>. | |
4 | # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle>. | |
5 | 5 | # |
6 | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
7 | 7 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software |
228 | 228 | $as_echo "$0: be upgraded to zsh 4.3.4 or later." |
229 | 229 | else |
230 | 230 | $as_echo "$0: Please tell bug-autoconf@gnu.org and |
231 | $0: https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle | |
231 | $0: https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle | |
232 | 232 | $0: about your system, including any error possibly output |
233 | 233 | $0: before this message. Then install a modern shell, or |
234 | 234 | $0: manually run the script under such a shell if you do |
698 | 698 | # Identity of this package. |
699 | 699 | PACKAGE_NAME='telepathy-idle' |
700 | 700 | PACKAGE_TARNAME='telepathy-idle' |
701 | PACKAGE_VERSION='0.1.5' | |
702 | PACKAGE_STRING='telepathy-idle 0.1.5' | |
703 | PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle' | |
701 | PACKAGE_VERSION='0.1.6' | |
702 | PACKAGE_STRING='telepathy-idle 0.1.6' | |
703 | PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle' | |
704 | 704 | PACKAGE_URL='' |
705 | 705 | |
706 | 706 | # Factoring default headers for most tests. |
1446 | 1446 | # Omit some internal or obsolete options to make the list less imposing. |
1447 | 1447 | # This message is too long to be a string in the A/UX 3.1 sh. |
1448 | 1448 | cat <<_ACEOF |
1449 | \`configure' configures telepathy-idle 0.1.5 to adapt to many kinds of systems. | |
1449 | \`configure' configures telepathy-idle 0.1.6 to adapt to many kinds of systems. | |
1450 | 1450 | |
1451 | 1451 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1452 | 1452 | |
1516 | 1516 | |
1517 | 1517 | if test -n "$ac_init_help"; then |
1518 | 1518 | case $ac_init_help in |
1519 | short | recursive ) echo "Configuration of telepathy-idle 0.1.5:";; | |
1519 | short | recursive ) echo "Configuration of telepathy-idle 0.1.6:";; | |
1520 | 1520 | esac |
1521 | 1521 | cat <<\_ACEOF |
1522 | 1522 | |
1569 | 1569 | Use these variables to override the choices made by `configure' or to help |
1570 | 1570 | it to find libraries and programs with nonstandard names/locations. |
1571 | 1571 | |
1572 | Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle>. | |
1572 | Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle>. | |
1573 | 1573 | _ACEOF |
1574 | 1574 | ac_status=$? |
1575 | 1575 | fi |
1632 | 1632 | test -n "$ac_init_help" && exit $ac_status |
1633 | 1633 | if $ac_init_version; then |
1634 | 1634 | cat <<\_ACEOF |
1635 | telepathy-idle configure 0.1.5 | |
1635 | telepathy-idle configure 0.1.6 | |
1636 | 1636 | generated by GNU Autoconf 2.64 |
1637 | 1637 | |
1638 | 1638 | Copyright (C) 2009 Free Software Foundation, Inc. |
1910 | 1910 | This file contains any messages produced by compilers while |
1911 | 1911 | running configure, to aid debugging if configure makes a mistake. |
1912 | 1912 | |
1913 | It was created by telepathy-idle $as_me 0.1.5, which was | |
1913 | It was created by telepathy-idle $as_me 0.1.6, which was | |
1914 | 1914 | generated by GNU Autoconf 2.64. Invocation command line was |
1915 | 1915 | |
1916 | 1916 | $ $0 $@ |
2737 | 2737 | |
2738 | 2738 | # Define the identity of the package. |
2739 | 2739 | PACKAGE='telepathy-idle' |
2740 | VERSION='0.1.5' | |
2740 | VERSION='0.1.6' | |
2741 | 2741 | |
2742 | 2742 | |
2743 | 2743 | cat >>confdefs.h <<_ACEOF |
12120 | 12120 | pkg_cv_TELEPATHY_CFLAGS="$TELEPATHY_CFLAGS" |
12121 | 12121 | else |
12122 | 12122 | if test -n "$PKG_CONFIG" && \ |
12123 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.7.15\""; } >&5 | |
12124 | ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.7.15") 2>&5 | |
12123 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.8.0\""; } >&5 | |
12124 | ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.8.0") 2>&5 | |
12125 | 12125 | ac_status=$? |
12126 | 12126 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
12127 | 12127 | test $ac_status = 0; }; then |
12128 | pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib >= 0.7.15" 2>/dev/null` | |
12128 | pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib >= 0.8.0" 2>/dev/null` | |
12129 | 12129 | else |
12130 | 12130 | pkg_failed=yes |
12131 | 12131 | fi |
12138 | 12138 | pkg_cv_TELEPATHY_LIBS="$TELEPATHY_LIBS" |
12139 | 12139 | else |
12140 | 12140 | if test -n "$PKG_CONFIG" && \ |
12141 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.7.15\""; } >&5 | |
12142 | ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.7.15") 2>&5 | |
12141 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.8.0\""; } >&5 | |
12142 | ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.8.0") 2>&5 | |
12143 | 12143 | ac_status=$? |
12144 | 12144 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
12145 | 12145 | test $ac_status = 0; }; then |
12146 | pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib >= 0.7.15" 2>/dev/null` | |
12146 | pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib >= 0.8.0" 2>/dev/null` | |
12147 | 12147 | else |
12148 | 12148 | pkg_failed=yes |
12149 | 12149 | fi |
12162 | 12162 | _pkg_short_errors_supported=no |
12163 | 12163 | fi |
12164 | 12164 | if test $_pkg_short_errors_supported = yes; then |
12165 | TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "telepathy-glib >= 0.7.15"` | |
12165 | TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "telepathy-glib >= 0.8.0"` | |
12166 | 12166 | else |
12167 | TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "telepathy-glib >= 0.7.15"` | |
12167 | TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "telepathy-glib >= 0.8.0"` | |
12168 | 12168 | fi |
12169 | 12169 | # Put the nasty error message in config.log where it belongs |
12170 | 12170 | echo "$TELEPATHY_PKG_ERRORS" >&5 |
12171 | 12171 | |
12172 | as_fn_error "Package requirements (telepathy-glib >= 0.7.15) were not met: | |
12172 | as_fn_error "Package requirements (telepathy-glib >= 0.8.0) were not met: | |
12173 | 12173 | |
12174 | 12174 | $TELEPATHY_PKG_ERRORS |
12175 | 12175 | |
12999 | 12999 | # report actual input values of CONFIG_FILES etc. instead of their |
13000 | 13000 | # values after options handling. |
13001 | 13001 | ac_log=" |
13002 | This file was extended by telepathy-idle $as_me 0.1.5, which was | |
13002 | This file was extended by telepathy-idle $as_me 0.1.6, which was | |
13003 | 13003 | generated by GNU Autoconf 2.64. Invocation command line was |
13004 | 13004 | |
13005 | 13005 | CONFIG_FILES = $CONFIG_FILES |
13058 | 13058 | Configuration commands: |
13059 | 13059 | $config_commands |
13060 | 13060 | |
13061 | Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle>." | |
13061 | Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle>." | |
13062 | 13062 | |
13063 | 13063 | _ACEOF |
13064 | 13064 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
13065 | 13065 | ac_cs_version="\\ |
13066 | telepathy-idle config.status 0.1.5 | |
13066 | telepathy-idle config.status 0.1.6 | |
13067 | 13067 | configured by $0, generated by GNU Autoconf 2.64, |
13068 | 13068 | with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |
13069 | 13069 |
10 | 10 | |
11 | 11 | m4_define([idle_major_version], [0]) |
12 | 12 | m4_define([idle_minor_version], [1]) |
13 | m4_define([idle_micro_version], [5]) | |
13 | m4_define([idle_micro_version], [6]) | |
14 | 14 | m4_define([idle_nano_version], [0]) |
15 | 15 | |
16 | 16 | m4_define([idle_base_version], |
21 | 21 | [idle_base_version].[idle_nano_version])]) |
22 | 22 | |
23 | 23 | AC_INIT([telepathy-idle], [idle_version], |
24 | [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle]) | |
24 | [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle]) | |
25 | 25 | |
26 | 26 | AC_CONFIG_MACRO_DIR([m4]) |
27 | 27 | |
84 | 84 | AC_SUBST(DBUS_CFLAGS) |
85 | 85 | AC_SUBST(DBUS_LIBS) |
86 | 86 | |
87 | PKG_CHECK_MODULES(TELEPATHY, [telepathy-glib >= 0.7.15]) | |
87 | PKG_CHECK_MODULES(TELEPATHY, [telepathy-glib >= 0.8.0]) | |
88 | 88 | |
89 | 89 | AC_SUBST(TELEPATHY_CFLAGS) |
90 | 90 | AC_SUBST(TELEPATHY_LIBS) |
6 | 6 | param-account = s required |
7 | 7 | param-server = s required |
8 | 8 | param-fullname = s |
9 | param-username = s | |
9 | 10 | param-port = q |
10 | param-password = s | |
11 | param-password = s secret | |
11 | 12 | param-charset = s |
12 | 13 | param-quit-message = s |
13 | 14 | param-use-ssl = b |
0 | 0 | #!/bin/sh |
1 | 1 | # install - install a program, script, or datafile |
2 | 2 | |
3 | scriptversion=2009-04-28.21; # UTC | |
3 | scriptversion=2006-12-25.00 | |
4 | 4 | |
5 | 5 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
6 | 6 | # later released in X11R6 (xc/config/util/install.sh) with the |
514 | 514 | # eval: (add-hook 'write-file-hooks 'time-stamp) |
515 | 515 | # time-stamp-start: "scriptversion=" |
516 | 516 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
517 | # time-stamp-time-zone: "UTC" | |
518 | # time-stamp-end: "; # UTC" | |
517 | # time-stamp-end: "$" | |
519 | 518 | # End: |
25 | 25 | |
26 | 26 | #include "idle-connection.h" |
27 | 27 | #include "idle-handles.h" /* to check for valid nick */ |
28 | #include "idle-debug.h" | |
28 | 29 | |
29 | 30 | G_DEFINE_TYPE(IdleConnectionManager, idle_connection_manager, TP_TYPE_BASE_CONNECTION_MANAGER) |
30 | 31 | |
61 | 62 | g_slice_free(Params, params); |
62 | 63 | } |
63 | 64 | |
64 | enum { | |
65 | PARAM_ACCOUNT, | |
66 | PARAM_SERVER, | |
67 | PARAM_PORT, | |
68 | PARAM_PASSWORD, | |
69 | PARAM_FULLNAME, | |
70 | PARAM_CHARSET, | |
71 | PARAM_QUIT_MESSAGE, | |
72 | PARAM_USE_SSL, | |
73 | LAST_PARAM | |
74 | }; | |
75 | ||
76 | 65 | gboolean |
77 | 66 | filter_nick(const TpCMParamSpec *paramspec, GValue *value, GError **error) |
78 | 67 | { |
92 | 81 | {"account", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TP_CONN_MGR_PARAM_FLAG_REQUIRED, NULL, G_STRUCT_OFFSET(Params, account), filter_nick}, |
93 | 82 | {"server", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TP_CONN_MGR_PARAM_FLAG_REQUIRED, NULL, G_STRUCT_OFFSET(Params, server)}, |
94 | 83 | {"port", DBUS_TYPE_UINT16_AS_STRING, G_TYPE_UINT, TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT, GINT_TO_POINTER(6667), G_STRUCT_OFFSET(Params, port)}, |
95 | {"password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, 0, NULL, G_STRUCT_OFFSET(Params, password)}, | |
84 | {"password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, | |
85 | TP_CONN_MGR_PARAM_FLAG_SECRET, | |
86 | NULL, G_STRUCT_OFFSET(Params, password)}, | |
96 | 87 | {"fullname", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, 0, NULL, G_STRUCT_OFFSET(Params, fullname)}, |
97 | 88 | {"username", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, 0, NULL, G_STRUCT_OFFSET(Params, username)}, |
98 | 89 | {"charset", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT, "UTF-8", G_STRUCT_OFFSET(Params, charset)}, |
111 | 102 | static void idle_connection_manager_init(IdleConnectionManager *obj) { |
112 | 103 | } |
113 | 104 | |
105 | static void | |
106 | idle_connection_manager_finalize (GObject *object) | |
107 | { | |
108 | idle_debug_free (); | |
109 | ||
110 | G_OBJECT_CLASS (idle_connection_manager_parent_class)->finalize (object); | |
111 | } | |
112 | ||
114 | 113 | static void idle_connection_manager_class_init(IdleConnectionManagerClass *klass) { |
114 | GObjectClass *object_class = G_OBJECT_CLASS (klass); | |
115 | 115 | TpBaseConnectionManagerClass *parent_class = TP_BASE_CONNECTION_MANAGER_CLASS(klass); |
116 | 116 | |
117 | 117 | parent_class->new_connection = _iface_new_connection; |
118 | 118 | parent_class->cm_dbus_name = "idle"; |
119 | 119 | parent_class->protocol_params = _protocols; |
120 | ||
121 | object_class->finalize = idle_connection_manager_finalize; | |
120 | 122 | } |
121 | 123 | |
122 | 124 | static TpBaseConnection *_iface_new_connection(TpBaseConnectionManager *self, const gchar *proto, TpIntSet *params_present, void *parsed_params, GError **error) { |
20 | 20 | |
21 | 21 | #include <stdarg.h> |
22 | 22 | #include <telepathy-glib/debug.h> |
23 | #include <telepathy-glib/debug-sender.h> | |
23 | 24 | |
24 | 25 | static IdleDebugFlags _flags = 0; |
25 | 26 | |
48 | 49 | tp_debug_set_persistent(TRUE); |
49 | 50 | } |
50 | 51 | |
51 | void idle_debug(IdleDebugFlags flag, const gchar *format, ...) { | |
52 | if (!(_flags & flag)) | |
52 | GHashTable *flag_to_domains = NULL; | |
53 | ||
54 | static const gchar * | |
55 | debug_flag_to_domain (IdleDebugFlags flag) | |
56 | { | |
57 | if (G_UNLIKELY (flag_to_domains == NULL)) { | |
58 | guint i; | |
59 | ||
60 | flag_to_domains = g_hash_table_new_full (NULL, NULL, NULL, g_free); | |
61 | ||
62 | for (i = 0; _keys[i].value; i++) { | |
63 | GDebugKey key = _keys[i]; | |
64 | gchar *val; | |
65 | ||
66 | val = g_strdup_printf ("%s/%s", "idle", key.key); | |
67 | g_hash_table_insert (flag_to_domains, | |
68 | GUINT_TO_POINTER (key.value), val); | |
69 | } | |
70 | } | |
71 | ||
72 | return g_hash_table_lookup (flag_to_domains, GUINT_TO_POINTER (flag)); | |
73 | } | |
74 | ||
75 | void | |
76 | idle_debug_free (void) | |
77 | { | |
78 | if (flag_to_domains == NULL) | |
53 | 79 | return; |
54 | 80 | |
55 | va_list args; | |
56 | va_start(args, format); | |
57 | g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args); | |
58 | va_end(args); | |
81 | g_hash_table_destroy (flag_to_domains); | |
82 | flag_to_domains = NULL; | |
59 | 83 | } |
60 | 84 | |
85 | static void | |
86 | log_to_debug_sender (IdleDebugFlags flag, | |
87 | const gchar *message) | |
88 | { | |
89 | TpDebugSender *dbg; | |
90 | GTimeVal now; | |
91 | ||
92 | dbg = tp_debug_sender_dup (); | |
93 | ||
94 | g_get_current_time (&now); | |
95 | ||
96 | tp_debug_sender_add_message (dbg, &now, debug_flag_to_domain (flag), | |
97 | G_LOG_LEVEL_DEBUG, message); | |
98 | ||
99 | g_object_unref (dbg); | |
100 | } | |
101 | ||
102 | void idle_debug(IdleDebugFlags flag, const gchar *format, ...) { | |
103 | gchar *message; | |
104 | va_list args; | |
105 | ||
106 | va_start (args, format); | |
107 | message = g_strdup_vprintf (format, args); | |
108 | va_end (args); | |
109 | ||
110 | log_to_debug_sender (flag, message); | |
111 | ||
112 | if (_flags & flag) | |
113 | g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s", message); | |
114 | ||
115 | g_free (message); | |
116 | } |
34 | 34 | void idle_debug_init(); |
35 | 35 | void idle_debug(IdleDebugFlags flag, const gchar *format, ...) G_GNUC_PRINTF(2, 3); |
36 | 36 | |
37 | void idle_debug_free (void); | |
38 | ||
37 | 39 | #endif |
38 | 40 | |
39 | 41 | #ifdef IDLE_DEBUG_FLAG |
138 | 138 | } |
139 | 139 | |
140 | 140 | static gchar *_channel_normalize_func(TpHandleRepoIface *repo, const gchar *id, gpointer ctx, GError **error) { |
141 | gchar *channel = g_strdup(id); | |
142 | ||
143 | if (!_channelname_is_valid(channel)) { | |
141 | if (!_channelname_is_valid(id)) { | |
144 | 142 | g_set_error(error, TP_ERRORS, TP_ERROR_INVALID_HANDLE, "invalid channel ID"); |
145 | 143 | return NULL; |
146 | 144 | } |
147 | 145 | |
148 | gchar *normalized = g_utf8_strdown(channel, -1); | |
149 | ||
150 | g_free(channel); | |
146 | gchar *normalized = g_utf8_strdown(id, -1); | |
151 | 147 | |
152 | 148 | return normalized; |
153 | 149 | } |
304 | 304 | TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION, |
305 | 305 | TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE, |
306 | 306 | G_MAXUINT); |
307 | ||
308 | if (priv->requested) { | |
309 | /* Add ourself to 'remote-pending' while we are joining the channel */ | |
310 | TpIntSet *remote; | |
311 | ||
312 | g_assert (priv->initiator == priv->connection->parent.self_handle); | |
313 | ||
314 | remote = tp_intset_new_containing (priv->initiator); | |
315 | tp_group_mixin_change_members (obj, "", NULL, NULL, NULL, remote, | |
316 | priv->initiator, TP_CHANNEL_GROUP_CHANGE_REASON_NONE); | |
317 | tp_intset_destroy (remote); | |
318 | } | |
307 | 319 | |
308 | 320 | return obj; |
309 | 321 | } |
181 | 181 | } |
182 | 182 | |
183 | 183 | g_strfreev(messages); |
184 | g_strfreev(bodies); | |
184 | 185 | |
185 | 186 | tp_svc_channel_type_text_return_from_send(context); |
186 | 187 | } |
21 | 21 | |
22 | 22 | #include <telepathy-glib/run.h> |
23 | 23 | #include <telepathy-glib/debug.h> |
24 | #include <telepathy-glib/debug-sender.h> | |
24 | 25 | |
25 | 26 | #include "idle-connection-manager.h" |
26 | 27 | #include "idle-debug.h" |
32 | 33 | } |
33 | 34 | |
34 | 35 | int main(int argc, char **argv) { |
36 | TpDebugSender *debug_sender; | |
37 | int result; | |
38 | ||
39 | g_type_init (); | |
40 | tp_debug_divert_messages (g_getenv ("IDLE_LOGFILE")); | |
41 | ||
35 | 42 | idle_debug_init(); |
36 | 43 | |
37 | return tp_run_connection_manager("telepathy-idle", VERSION, _construct_cm, argc, argv); | |
44 | debug_sender = tp_debug_sender_dup (); | |
45 | ||
46 | result = tp_run_connection_manager("telepathy-idle", VERSION, _construct_cm, argc, argv); | |
47 | ||
48 | g_object_unref (debug_sender); | |
49 | return result; | |
38 | 50 | } |
39 |
19 | 19 | There are no command-line options. |
20 | 20 | .SH ENVIRONMENT |
21 | 21 | .TP |
22 | \fBIDLE_LOGFILE\fR=\fIfilename\fR | |
23 | If set, debug output will go to the given file rather than to stderr. | |
24 | If \fB+\fR is prepended to the \fIfilename\fR (e.g. | |
25 | \fBIDLE_LOGFILE=+idle.log\fR), debug output will be appended | |
26 | to the file; otherwise, any existing file will be replaced. | |
27 | .TP | |
28 | .TP | |
22 | 29 | \fBIDLE_DEBUG\fR=\fItype\fR |
23 | 30 | May be set to "all" for full debug output, or various undocumented options |
24 | 31 | (which may change from release to release) to filter the output. |