[meego-commits] 6034: Changes to Trunk:Testing/telepathy-idle
Huaxu Wan
huaxu.wan at intel.com
Wed Jul 28 03:28:21 UTC 2010
Hi,
I have made the following changes to telepathy-idle in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Huaxu Wan
[This message was auto-generated]
---
Request #6034:
submit: home:huaxu:branches:Trunk:Testing/telepathy-idle(r2)(cleanup) -> Trunk:Testing/telepathy-idle
Message:
Update to 0.1.6
State: new 2010-07-27T15:21:32 huaxu
Comment: None
changes files:
--------------
--- telepathy-idle.changes
+++ telepathy-idle.changes
@@ -0,0 +1,3 @@
+* Tue Jul 27 2010 Huaxu Wan <huaxu.wan at linux.intel.com> - 0.1.6
+- Update to 0.1.6
+
old:
----
telepathy-idle-0.1.5.tar.gz
new:
----
telepathy-idle-0.1.6.tar.gz
telepathy-idle.yaml
spec files:
-----------
--- telepathy-idle.spec
+++ telepathy-idle.spec
@@ -1,56 +1,76 @@
+#
+# Do not Edit! Generated by:
+# spectacle version 0.18
+#
+# >> macros
+# << macros
+
Name: telepathy-idle
-Version: 0.1.5
-Release: 2
Summary: IRC connection manager for Telepathy
-
+Version: 0.1.6
+Release: 1
Group: Applications/Communications
License: LGPLv2+
URL: http://telepathy.freedesktop.org/wiki/FrontPage
Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: dbus-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: openssl-devel >= 0.9.7
-BuildRequires: telepathy-glib-devel >= 0.7.15
+Source100: telepathy-idle.yaml
+Requires: telepathy-filesystem
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(telepathy-glib)
BuildRequires: libxslt
BuildRequires: python
-Requires: telepathy-filesystem
-
%description
A full-featured IRC connection manager for the Telepathy project.
-%prep
-%setup -q
-
-%check
-# make check
+%prep
+%setup -q -n %{name}-%{version}
+# >> setup
+# << setup
%build
-%configure
-make %{?_smp_mflags}
+# >> build pre
+# << build pre
+%configure --disable-static
+make %{?jobs:-j%jobs}
+# >> build post
+# << build post
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%make_install
+
+# >> install post
+
+
+# << install post
+%check
+# >> check
+# make check
+# << check
+
+
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+# >> files
%doc AUTHORS COPYING NEWS
%{_libexecdir}/%{name}
%{_datadir}/dbus-1/services/*.service
%{_datadir}/telepathy/managers/*.manager
%{_mandir}/man8/%{name}.8.gz
+# << files
other changes:
--------------
++++++ telepathy-idle-0.1.5.tar.gz -> telepathy-idle-0.1.6.tar.gz
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,139 @@
+commit e4adae82d0f6cd8752768e71b1e47861ed3e883d
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Fri Feb 19 12:58:40 2010 +0000
+
+ prepare 0.1.6 release
+
+ NEWS | 21 ++++++++++++++++++++-
+ configure.ac | 4 ++--
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+
+commit ce17922d0ed5bbc337c79cc6051fcdc7d78fc362
+Author: Simon McVittie <http://smcv.pseudorandom.co.uk/>
+Date: Thu Oct 15 20:28:25 2009 +0100
+
+ Fix bug report URL for current bugzilla components
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 38cf99fc56425823b11e486effe3f98c1168a905
+Author: Simon McVittie <http://smcv.pseudorandom.co.uk/>
+Date: Thu Oct 15 20:24:58 2009 +0100
+
+ fd.o#24559: flag password parameter as secret
+
+ data/idle.manager | 2 +-
+ src/idle-connection-manager.c | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 7e720131e95683bf96f4b4db0e262ea19b5d8479
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Fri Feb 19 12:11:12 2010 +0000
+
+ Implement Debug interface (fdo #26646)
+
+ src/idle-connection-manager.c | 12 +++++++++
+ src/idle-debug.c | 53 +++++++++++++++++++++++++++++++++++++++++
+ src/idle-debug.h | 2 +
+ src/idle.c | 13 ++++++++-
+ 4 files changed, 78 insertions(+), 2 deletions(-)
+
+commit c52eeda0d4c7a5a99d35fbbf5db49478f6630ad2
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Fri Feb 19 11:46:55 2010 +0000
+
+ idle_debug: refactor to use g_strdup_vprintf
+
+ src/idle-debug.c | 17 ++++++++++-------
+ 1 files changed, 10 insertions(+), 7 deletions(-)
+
+commit a5b64fe0e33eb6e03eaa05eff4946a12445f76eb
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Thu Feb 18 17:40:06 2010 +0000
+
+ Add ourself to remote-pending while joining the channel (fd.o #25039)
+
+ src/idle-muc-channel.c | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit b0b127e4c84cc2c0824d971f6bfca030fd8454ea
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Thu Feb 18 18:06:23 2010 +0000
+
+ Bump tp-glib dep to 0.8.0
+
+ We are going to use tp_intset_new_containing which has been added to 0.7.26
+ but there is no harm to dump to 0.8.
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d2d1f1db61c823124a9eff60ba9746414ac47683
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Thu Feb 18 14:59:28 2010 +0000
+
+ document IDLE_LOGFILE in man page
+
+ src/telepathy-idle.8.in | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 7e923479272d7ae3d7b66994a5958333fc03b4b0
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Thu Feb 18 14:52:15 2010 +0000
+
+ Add IDLE_LOGFILE support (fd.o #26627)
+
+ src/idle.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 20d7ecf47f5a731b6b5e76c17c896c2415945f73
+Author: Jonathon Jongsma <jonathon.jongsma at collabora.co.uk>
+Date: Tue Oct 6 22:46:23 2009 -0500
+
+ Fix two valgrind-reported leaks
+
+ For some reason, we were strduping the channel name needlessly in
+ _channel_normalize_func()
+ Also, we forgot to free the bodies returned from idle_text_encode_and_split()
+
+ src/idle-handles.c | 8 ++------
+ src/idle-text.c | 1 +
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+commit 441f063e26ef604926be1e05a073439d758b35fd
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Tue Oct 6 20:45:43 2009 +0100
+
+ idle-connection-manager: remove unused PARAM enum
+
+ src/idle-connection-manager.c | 12 ------------
+ 1 files changed, 0 insertions(+), 12 deletions(-)
+
+commit e746d0b0ff520dfb3f41519da7c38bbecc14ff32
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Tue Oct 6 20:44:27 2009 +0100
+
+ idle.manager: add username param
+
+ Param was implemented but has been forget in the manager file for some
+ reason.
+
+ data/idle.manager | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0da5af160fe1aee19eaa9f33f5b196bc521b4652
+Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
+Date: Mon Sep 14 12:56:58 2009 +0100
+
+ Bump to 0.1.5.1.
+
+ Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
+
+ NEWS | 7 +++++++
+ configure.ac | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
commit ee9c0c816f8bdaa8d4927a365116351b6aad2e48
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date: Mon Sep 14 12:20:01 2009 +0100
--- NEWS
+++ NEWS
@@ -1,3 +1,29 @@
+telepathy-idle 0.1.6 (2010-02-19)
+=================================
+
+The “No. Some of it's Cointreau.” release.
+
+Dependencies:
+
+* telepathy-glib 0.8.0
+
+Enhancements:
+
+* Implement IDLE_LOGFILE to divert output to a file. (cassidy)
+
+* Implement Debug interface. (cassidy)
+
+Fixes:
+
+* Add username parameter to the manager file. (cassidy)
+
+* Fix some memory leaks. (jonner)
+
+* Add ourself to remote-pending when creating a room channel.
+ (fd.o #25039, cassidy)
+
+* Flag password parameter as secret (fd.o #24559, smcv)
+
telepathy-idle 0.1.5 (2009-09-14)
=================================
--- config.guess
+++ config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-06-10'
+timestamp='2009-04-27'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -170,7 +170,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ELF__
+ | grep __ELF__ >/dev/null
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -656,7 +656,7 @@
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep -q __LP64__
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -822,9 +822,6 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -885,17 +882,40 @@
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
+ mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
+ #undef mips
+ #undef mipsel
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=${UNAME_MACHINE}el
+ CPU=mipsel
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=${UNAME_MACHINE}
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
#else
CPU=
#endif
@@ -927,7 +947,7 @@
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
@@ -981,6 +1001,14 @@
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -1046,7 +1074,7 @@
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1154,7 +1182,7 @@
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
--- config.sub
+++ config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-06-11'
+timestamp='2009-04-17'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -153,9 +153,6 @@
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
- ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -470,10 +467,6 @@
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
- bluegene*)
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -1267,7 +1260,7 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1620,7 +1613,7 @@
-sunos*)
vendor=sun
;;
- -cnk*|-aix*)
+ -aix*)
vendor=ibm
;;
-beos*)
--- configure
+++ configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for telepathy-idle 0.1.5.
+# Generated by GNU Autoconf 2.64 for telepathy-idle 0.1.6.
#
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle>.
+# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
@@ -229,7 +229,7 @@
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf at gnu.org and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle
+$0: https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -699,9 +699,9 @@
# Identity of this package.
PACKAGE_NAME='telepathy-idle'
PACKAGE_TARNAME='telepathy-idle'
-PACKAGE_VERSION='0.1.5'
-PACKAGE_STRING='telepathy-idle 0.1.5'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle'
+PACKAGE_VERSION='0.1.6'
+PACKAGE_STRING='telepathy-idle 0.1.6'
+PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle'
PACKAGE_URL=''
# Factoring default headers for most tests.
@@ -1447,7 +1447,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures telepathy-idle 0.1.5 to adapt to many kinds of systems.
+\`configure' configures telepathy-idle 0.1.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1517,7 +1517,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of telepathy-idle 0.1.5:";;
+ short | recursive ) echo "Configuration of telepathy-idle 0.1.6:";;
esac
cat <<\_ACEOF
@@ -1570,7 +1570,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle>.
+Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle>.
_ACEOF
ac_status=$?
fi
@@ -1633,7 +1633,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-telepathy-idle configure 0.1.5
+telepathy-idle configure 0.1.6
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1911,7 +1911,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by telepathy-idle $as_me 0.1.5, which was
+It was created by telepathy-idle $as_me 0.1.6, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -2738,7 +2738,7 @@
# Define the identity of the package.
PACKAGE='telepathy-idle'
- VERSION='0.1.5'
+ VERSION='0.1.6'
cat >>confdefs.h <<_ACEOF
@@ -12121,12 +12121,12 @@
pkg_cv_TELEPATHY_CFLAGS="$TELEPATHY_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.7.15\""; } >&5
- ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.7.15") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.8.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.8.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib >= 0.7.15" 2>/dev/null`
+ pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib >= 0.8.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12139,12 +12139,12 @@
pkg_cv_TELEPATHY_LIBS="$TELEPATHY_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.7.15\""; } >&5
- ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.7.15") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.8.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.8.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib >= 0.7.15" 2>/dev/null`
+ pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib >= 0.8.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12163,14 +12163,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "telepathy-glib >= 0.7.15"`
+ TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "telepathy-glib >= 0.8.0"`
else
- TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "telepathy-glib >= 0.7.15"`
+ TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "telepathy-glib >= 0.8.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$TELEPATHY_PKG_ERRORS" >&5
- as_fn_error "Package requirements (telepathy-glib >= 0.7.15) were not met:
+ as_fn_error "Package requirements (telepathy-glib >= 0.8.0) were not met:
$TELEPATHY_PKG_ERRORS
@@ -13000,7 +13000,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by telepathy-idle $as_me 0.1.5, which was
+This file was extended by telepathy-idle $as_me 0.1.6, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13059,12 +13059,12 @@
Configuration commands:
$config_commands
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle>."
+Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-telepathy-idle config.status 0.1.5
+telepathy-idle config.status 0.1.6
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
--- configure.ac
+++ configure.ac
@@ -11,7 +11,7 @@
m4_define([idle_major_version], [0])
m4_define([idle_minor_version], [1])
-m4_define([idle_micro_version], [5])
+m4_define([idle_micro_version], [6])
m4_define([idle_nano_version], [0])
m4_define([idle_base_version],
@@ -22,7 +22,7 @@
[idle_base_version].[idle_nano_version])])
AC_INIT([telepathy-idle], [idle_version],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-idle])
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=idle])
AC_CONFIG_MACRO_DIR([m4])
@@ -85,7 +85,7 @@
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-PKG_CHECK_MODULES(TELEPATHY, [telepathy-glib >= 0.7.15])
+PKG_CHECK_MODULES(TELEPATHY, [telepathy-glib >= 0.8.0])
AC_SUBST(TELEPATHY_CFLAGS)
AC_SUBST(TELEPATHY_LIBS)
--- data/idle.manager
+++ data/idle.manager
@@ -7,8 +7,9 @@
param-account = s required
param-server = s required
param-fullname = s
+param-username = s
param-port = q
-param-password = s
+param-password = s secret
param-charset = s
param-quit-message = s
param-use-ssl = b
--- install-sh
+++ install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,6 +515,5 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
# End:
--- src/idle-connection-manager.c
+++ src/idle-connection-manager.c
@@ -26,6 +26,7 @@
#include "idle-connection.h"
#include "idle-handles.h" /* to check for valid nick */
+#include "idle-debug.h"
G_DEFINE_TYPE(IdleConnectionManager, idle_connection_manager, TP_TYPE_BASE_CONNECTION_MANAGER)
@@ -62,18 +63,6 @@
g_slice_free(Params, params);
}
-enum {
- PARAM_ACCOUNT,
- PARAM_SERVER,
- PARAM_PORT,
- PARAM_PASSWORD,
- PARAM_FULLNAME,
- PARAM_CHARSET,
- PARAM_QUIT_MESSAGE,
- PARAM_USE_SSL,
- LAST_PARAM
-};
-
gboolean
filter_nick(const TpCMParamSpec *paramspec, GValue *value, GError **error)
{
@@ -93,7 +82,9 @@
{"account", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TP_CONN_MGR_PARAM_FLAG_REQUIRED, NULL, G_STRUCT_OFFSET(Params, account), filter_nick},
{"server", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TP_CONN_MGR_PARAM_FLAG_REQUIRED, NULL, G_STRUCT_OFFSET(Params, server)},
{"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)},
- {"password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, 0, NULL, G_STRUCT_OFFSET(Params, password)},
+ {"password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING,
+ TP_CONN_MGR_PARAM_FLAG_SECRET,
+ NULL, G_STRUCT_OFFSET(Params, password)},
{"fullname", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, 0, NULL, G_STRUCT_OFFSET(Params, fullname)},
{"username", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, 0, NULL, G_STRUCT_OFFSET(Params, username)},
{"charset", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT, "UTF-8", G_STRUCT_OFFSET(Params, charset)},
@@ -112,12 +103,23 @@
static void idle_connection_manager_init(IdleConnectionManager *obj) {
}
+static void
+idle_connection_manager_finalize (GObject *object)
+{
+ idle_debug_free ();
+
+ G_OBJECT_CLASS (idle_connection_manager_parent_class)->finalize (object);
+}
+
static void idle_connection_manager_class_init(IdleConnectionManagerClass *klass) {
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
TpBaseConnectionManagerClass *parent_class = TP_BASE_CONNECTION_MANAGER_CLASS(klass);
parent_class->new_connection = _iface_new_connection;
parent_class->cm_dbus_name = "idle";
parent_class->protocol_params = _protocols;
+
+ object_class->finalize = idle_connection_manager_finalize;
}
static TpBaseConnection *_iface_new_connection(TpBaseConnectionManager *self, const gchar *proto, TpIntSet *params_present, void *parsed_params, GError **error) {
--- src/idle-debug.c
+++ src/idle-debug.c
@@ -21,6 +21,7 @@
#include <stdarg.h>
#include <telepathy-glib/debug.h>
+#include <telepathy-glib/debug-sender.h>
static IdleDebugFlags _flags = 0;
@@ -49,13 +50,68 @@
tp_debug_set_persistent(TRUE);
}
-void idle_debug(IdleDebugFlags flag, const gchar *format, ...) {
- if (!(_flags & flag))
+GHashTable *flag_to_domains = NULL;
+
+static const gchar *
+debug_flag_to_domain (IdleDebugFlags flag)
+{
+ if (G_UNLIKELY (flag_to_domains == NULL)) {
+ guint i;
+
+ flag_to_domains = g_hash_table_new_full (NULL, NULL, NULL, g_free);
+
+ for (i = 0; _keys[i].value; i++) {
+ GDebugKey key = _keys[i];
+ gchar *val;
+
+ val = g_strdup_printf ("%s/%s", "idle", key.key);
+ g_hash_table_insert (flag_to_domains,
+ GUINT_TO_POINTER (key.value), val);
+ }
+ }
+
+ return g_hash_table_lookup (flag_to_domains, GUINT_TO_POINTER (flag));
+}
+
+void
+idle_debug_free (void)
+{
+ if (flag_to_domains == NULL)
return;
- va_list args;
- va_start(args, format);
- g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
- va_end(args);
+ g_hash_table_destroy (flag_to_domains);
+ flag_to_domains = NULL;
+}
+
+static void
+log_to_debug_sender (IdleDebugFlags flag,
+ const gchar *message)
+{
+ TpDebugSender *dbg;
+ GTimeVal now;
+
+ dbg = tp_debug_sender_dup ();
+
+ g_get_current_time (&now);
+
+ tp_debug_sender_add_message (dbg, &now, debug_flag_to_domain (flag),
+ G_LOG_LEVEL_DEBUG, message);
+
+ g_object_unref (dbg);
}
+void idle_debug(IdleDebugFlags flag, const gchar *format, ...) {
+ gchar *message;
+ va_list args;
+
+ va_start (args, format);
+ message = g_strdup_vprintf (format, args);
+ va_end (args);
+
+ log_to_debug_sender (flag, message);
+
+ if (_flags & flag)
+ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s", message);
+
+ g_free (message);
+}
--- src/idle-debug.h
+++ src/idle-debug.h
@@ -35,6 +35,8 @@
void idle_debug_init();
void idle_debug(IdleDebugFlags flag, const gchar *format, ...) G_GNUC_PRINTF(2, 3);
+void idle_debug_free (void);
+
#endif
#ifdef IDLE_DEBUG_FLAG
--- src/idle-handles.c
+++ src/idle-handles.c
@@ -139,16 +139,12 @@
}
static gchar *_channel_normalize_func(TpHandleRepoIface *repo, const gchar *id, gpointer ctx, GError **error) {
- gchar *channel = g_strdup(id);
-
- if (!_channelname_is_valid(channel)) {
+ if (!_channelname_is_valid(id)) {
g_set_error(error, TP_ERRORS, TP_ERROR_INVALID_HANDLE, "invalid channel ID");
return NULL;
}
- gchar *normalized = g_utf8_strdown(channel, -1);
-
- g_free(channel);
+ gchar *normalized = g_utf8_strdown(id, -1);
return normalized;
}
--- src/idle-muc-channel.c
+++ src/idle-muc-channel.c
@@ -306,6 +306,18 @@
TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE,
G_MAXUINT);
+ if (priv->requested) {
+ /* Add ourself to 'remote-pending' while we are joining the channel */
+ TpIntSet *remote;
+
+ g_assert (priv->initiator == priv->connection->parent.self_handle);
+
+ remote = tp_intset_new_containing (priv->initiator);
+ tp_group_mixin_change_members (obj, "", NULL, NULL, NULL, remote,
+ priv->initiator, TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
+ tp_intset_destroy (remote);
+ }
+
return obj;
}
--- src/idle-text.c
+++ src/idle-text.c
@@ -182,6 +182,7 @@
}
g_strfreev(messages);
+ g_strfreev(bodies);
tp_svc_channel_type_text_return_from_send(context);
}
--- src/idle.c
+++ src/idle.c
@@ -22,6 +22,7 @@
#include <telepathy-glib/run.h>
#include <telepathy-glib/debug.h>
+#include <telepathy-glib/debug-sender.h>
#include "idle-connection-manager.h"
#include "idle-debug.h"
@@ -33,8 +34,18 @@
}
int main(int argc, char **argv) {
+ TpDebugSender *debug_sender;
+ int result;
+
+ g_type_init ();
+ tp_debug_divert_messages (g_getenv ("IDLE_LOGFILE"));
+
idle_debug_init();
- return tp_run_connection_manager("telepathy-idle", VERSION, _construct_cm, argc, argv);
-}
+ debug_sender = tp_debug_sender_dup ();
+ result = tp_run_connection_manager("telepathy-idle", VERSION, _construct_cm, argc, argv);
+
+ g_object_unref (debug_sender);
+ return result;
+}
--- src/telepathy-idle.8.in
+++ src/telepathy-idle.8.in
@@ -20,6 +20,13 @@
There are no command-line options.
.SH ENVIRONMENT
.TP
+\fBIDLE_LOGFILE\fR=\fIfilename\fR
+If set, debug output will go to the given file rather than to stderr.
+If \fB+\fR is prepended to the \fIfilename\fR (e.g.
+\fBIDLE_LOGFILE=+idle.log\fR), debug output will be appended
+to the file; otherwise, any existing file will be replaced.
+.TP
+.TP
\fBIDLE_DEBUG\fR=\fItype\fR
May be set to "all" for full debug output, or various undocumented options
(which may change from release to release) to filter the output.
++++++ telepathy-idle.yaml (new)
--- telepathy-idle.yaml
+++ telepathy-idle.yaml
+Name: telepathy-idle
+Summary: IRC connection manager for Telepathy
+Version: 0.1.6
+Release: 1
+Group: Applications/Communications
+License: LGPLv2+
+URL: http://telepathy.freedesktop.org/wiki/FrontPage
+Sources:
+ - http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Description: A full-featured IRC connection manager for the Telepathy project.
+
+Requires:
+ - telepathy-filesystem
+PkgConfigBR:
+ - dbus-1
+ - openssl
+ - dbus-glib-1
+ - telepathy-glib
+PkgBR:
+ - libxslt
+ - python
+Configure: configure
+Builder: make
+Check: yes
More information about the MeeGo-commits
mailing list