diff -Nru empathy-2.32.2/ChangeLog empathy-2.32.1/ChangeLog --- empathy-2.32.2/ChangeLog 2010-11-18 15:37:04.000000000 +0000 +++ empathy-2.32.1/ChangeLog 2010-11-15 13:34:45.000000000 +0000 @@ -1,70 +1,3 @@ -commit 6b79a837fd7fccbedfcd9541d3c71b1d37bd8cf5 -Author: Guillaume Desmottes -Date: Thu Nov 18 16:09:36 2010 +0100 - - configure: blindy trust user if he provided a cert file - - configure.ac | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 26bcf722b57527c68dfec64afbe0671b2f8dda7e -Author: Guillaume Desmottes -Date: Thu Nov 18 15:56:13 2010 +0100 - - prepare 2.32.2 - - NEWS | 16 ++++++++++++++++ - configure.ac | 4 ++-- - 2 files changed, 18 insertions(+), 2 deletions(-) - -commit 48289f99b2d22956f87157250d4f40c719412a27 -Author: Brian Pepple -Date: Sat Nov 6 18:31:32 2010 -0400 - - Make ca-certs location configurable (#634197) - - configure.ac | 33 - +++++++++++++++++++++++++++++++++ - libempathy/empathy-tls-verifier.c | 2 +- - 2 files changed, 34 insertions(+), 1 deletions(-) - -commit 4034e5e3ddd88ec577387766548ca0454cdf6e1a -Author: Guillaume Desmottes -Date: Thu Nov 18 14:51:58 2010 +0100 - - individual_avatar_pixbuf_received_cb: don't leak the iters - - libempathy-gtk/empathy-individual-store.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 381af9c51c0bf36989edfefb5ac1a02dbdde1d6f -Author: Guillaume Desmottes -Date: Thu Nov 18 14:50:30 2010 +0100 - - factor out free_iters - - libempathy-gtk/empathy-individual-store.c | 17 ++++++++++------- - 1 files changed, 10 insertions(+), 7 deletions(-) - -commit b0bf4030adcc7b73eab4fffea81978213ebb7799 -Author: Guillaume Desmottes -Date: Thu Nov 18 14:18:05 2010 +0100 - - individual_store_name_sort_func: don't leak names - - libempathy-gtk/empathy-individual-store.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 03b6c0ae75f7d60be6e29451353fea87da6069f6 -Author: Guillaume Desmottes -Date: Mon Nov 15 14:44:05 2010 +0100 - - remove released flag - - configure.ac | 2 +- - release.py | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - commit 6cd889790503f0ca1adfdeda78e49bcd360a5a35 Author: Guillaume Desmottes Date: Mon Nov 15 14:30:01 2010 +0100 diff -Nru empathy-2.32.2/config.h.in empathy-2.32.1/config.h.in --- empathy-2.32.2/config.h.in 2010-11-18 15:34:58.000000000 +0000 +++ empathy-2.32.1/config.h.in 2010-11-15 13:34:16.000000000 +0000 @@ -12,9 +12,6 @@ /* Seal public structs to force usage of accessors */ #undef GSEAL_ENABLE -/* path to system Certificate Authority list */ -#undef GTLS_SYSTEM_CA_FILE - /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET diff -Nru empathy-2.32.2/configure empathy-2.32.1/configure --- empathy-2.32.2/configure 2010-11-18 15:34:58.000000000 +0000 +++ empathy-2.32.1/configure 2010-11-15 13:34:05.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Empathy 2.32.2. +# Generated by GNU Autoconf 2.67 for Empathy 2.32.1. # # Report bugs to . # @@ -707,8 +707,8 @@ # Identity of this package. PACKAGE_NAME='Empathy' PACKAGE_TARNAME='empathy' -PACKAGE_VERSION='2.32.2' -PACKAGE_STRING='Empathy 2.32.2' +PACKAGE_VERSION='2.32.1' +PACKAGE_STRING='Empathy 2.32.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=empathy' PACKAGE_URL='' @@ -1020,7 +1020,6 @@ enable_Werror with_eds enable_debug -with_ca_file with_connectivity enable_webkit enable_spell @@ -1620,7 +1619,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 Empathy 2.32.2 to adapt to many kinds of systems. +\`configure' configures Empathy 2.32.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1694,7 +1693,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Empathy 2.32.2:";; + short | recursive ) echo "Configuration of Empathy 2.32.1:";; esac cat <<\_ACEOF @@ -1749,7 +1748,6 @@ --with-help-formats=FORMATS list of formats --with-eds build with evolution-data-server support - --with-ca-file=[path] path to system Certificate Authority list --with-connectivity=[nm/connman/auto/no] build with connectivity support @@ -1893,7 +1891,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Empathy configure 2.32.2 +Empathy configure 2.32.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2267,7 +2265,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Empathy $as_me 2.32.2, which was +It was created by Empathy $as_me 2.32.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3131,7 +3129,7 @@ # Define the identity of the package. PACKAGE='empathy' - VERSION='2.32.2' + VERSION='2.32.1' # Some tools Automake needs. @@ -5812,13 +5810,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5815: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5813: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5818: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5816: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5821: output\"" >&5) + (eval echo "\"\$as_me:5819: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7023,7 +7021,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7026 "configure"' > conftest.$ac_ext + echo '#line 7024 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8302,11 +8300,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8305: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8303: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8309: \$? = $ac_status" >&5 + echo "$as_me:8307: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8641,11 +8639,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8644: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8642: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8648: \$? = $ac_status" >&5 + echo "$as_me:8646: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8746,11 +8744,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8749: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8747: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8753: \$? = $ac_status" >&5 + echo "$as_me:8751: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8801,11 +8799,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8804: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8802: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8808: \$? = $ac_status" >&5 + echo "$as_me:8806: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11185,7 +11183,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11188 "configure" +#line 11186 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11281,7 +11279,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11284 "configure" +#line 11282 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15791,45 +15789,6 @@ # ----------------------------------------------------------- -# Make CA certificates path configurable -# Stolen from GIO's TLS -# ----------------------------------------------------------- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking location of system Certificate Authority list" >&5 -$as_echo_n "checking location of system Certificate Authority list... " >&6; } - -# Check whether --with-ca-file was given. -if test "${with_ca_file+set}" = set; then : - withval=$with_ca_file; -fi - -if test "$with_ca_file" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } -else - if test -z "$with_ca_file"; then - for f in /etc/pki/tls/certs/ca-bundle.crt \ - /etc/ssl/certs/ca-certificates.crt; do - if test -f "$f"; then - with_ca_file="$f" - fi - done - if test -z "$with_ca_file"; then - as_fn_error $? "could not find. Use --with-ca-file=path to set, or --without-ca-file to disable" "$LINENO" 5 - fi - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ca_file" >&5 -$as_echo "$with_ca_file" >&6; } - GTLS_SYSTEM_CA_FILE="$with_ca_file" - - -cat >>confdefs.h <<_ACEOF -#define GTLS_SYSTEM_CA_FILE "$GTLS_SYSTEM_CA_FILE" -_ACEOF - -fi - -# ----------------------------------------------------------- # Connectivity integration # ----------------------------------------------------------- @@ -17525,7 +17484,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Empathy $as_me 2.32.2, which was +This file was extended by Empathy $as_me 2.32.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17591,7 +17550,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Empathy config.status 2.32.2 +Empathy config.status 2.32.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" @@ -19388,7 +19347,6 @@ Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS} Prefix......................: ${prefix} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} - CA Cert Path................: ${GTLS_SYSTEM_CA_FILE} Features: Spell checking (enchant)....: ${have_enchant} diff -Nru empathy-2.32.2/configure.ac empathy-2.32.1/configure.ac --- empathy-2.32.2/configure.ac 2010-11-18 15:18:14.000000000 +0000 +++ empathy-2.32.1/configure.ac 2010-11-15 13:33:45.000000000 +0000 @@ -3,7 +3,7 @@ m4_define([empathy_major_version], [2]) m4_define([empathy_minor_version], [32]) -m4_define([empathy_micro_version], [2]) +m4_define([empathy_micro_version], [1]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' @@ -214,35 +214,6 @@ AM_GLIB_GNU_GETTEXT # ----------------------------------------------------------- -# Make CA certificates path configurable -# Stolen from GIO's TLS -# ----------------------------------------------------------- -AC_MSG_CHECKING([location of system Certificate Authority list]) -AC_ARG_WITH(ca-file, - [AC_HELP_STRING([--with-ca-file=@<:@path@:>@], - [path to system Certificate Authority list])]) -if test "$with_ca_file" = "no"; then - AC_MSG_RESULT([disabled]) -else - if test -z "$with_ca_file"; then - for f in /etc/pki/tls/certs/ca-bundle.crt \ - /etc/ssl/certs/ca-certificates.crt; do - if test -f "$f"; then - with_ca_file="$f" - fi - done - if test -z "$with_ca_file"; then - AC_MSG_ERROR([could not find. Use --with-ca-file=path to set, or --without-ca-file to disable]) - fi - fi - - AC_MSG_RESULT($with_ca_file) - GTLS_SYSTEM_CA_FILE="$with_ca_file" - - AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list]) -fi - -# ----------------------------------------------------------- # Connectivity integration # ----------------------------------------------------------- AC_ARG_WITH(connectivity, @@ -540,7 +511,6 @@ Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS} Prefix......................: ${prefix} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} - CA Cert Path................: ${GTLS_SYSTEM_CA_FILE} Features: Spell checking (enchant)....: ${have_enchant} diff -Nru empathy-2.32.2/data/empathy-accounts.desktop empathy-2.32.1/data/empathy-accounts.desktop --- empathy-2.32.2/data/empathy-accounts.desktop 2010-11-18 15:35:14.000000000 +0000 +++ empathy-2.32.1/data/empathy-accounts.desktop 2010-11-15 13:34:46.000000000 +0000 @@ -104,4 +104,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=2.32.2 +X-GNOME-Bugzilla-Version=2.32.1 diff -Nru empathy-2.32.2/data/empathy-accounts.desktop.in empathy-2.32.1/data/empathy-accounts.desktop.in --- empathy-2.32.2/data/empathy-accounts.desktop.in 2010-11-18 15:35:09.000000000 +0000 +++ empathy-2.32.1/data/empathy-accounts.desktop.in 2010-11-15 13:34:15.000000000 +0000 @@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=2.32.2 +X-GNOME-Bugzilla-Version=2.32.1 diff -Nru empathy-2.32.2/data/empathy.desktop empathy-2.32.1/data/empathy.desktop --- empathy-2.32.2/data/empathy.desktop 2010-11-18 15:35:14.000000000 +0000 +++ empathy-2.32.1/data/empathy.desktop 2010-11-15 13:34:46.000000000 +0000 @@ -216,4 +216,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=2.32.2 +X-GNOME-Bugzilla-Version=2.32.1 diff -Nru empathy-2.32.2/data/empathy.desktop.in empathy-2.32.1/data/empathy.desktop.in --- empathy-2.32.2/data/empathy.desktop.in 2010-11-18 15:35:09.000000000 +0000 +++ empathy-2.32.1/data/empathy.desktop.in 2010-11-15 13:34:15.000000000 +0000 @@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=2.32.2 +X-GNOME-Bugzilla-Version=2.32.1 diff -Nru empathy-2.32.2/debian/changelog empathy-2.32.1/debian/changelog --- empathy-2.32.2/debian/changelog 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/changelog 2011-01-29 02:03:50.000000000 +0000 @@ -1,68 +1,19 @@ -empathy (2.32.2-0ubuntu7~maverick4) maverick; urgency=low +empathy (2.32.1-0ubuntu1.2~maverick1) maverick; urgency=low * debian/patches/23_idomessagedialog_for_voip.patch - Raise a IdoMessageDialog for incoming voip calls * debian/control - Added a new build depends on libido-0.1-dev, needed for IdoMessageDialog - -- Ken VanDine Fri, 28 Jan 2011 18:15:23 -0500 + -- Ken VanDine Fri, 28 Jan 2011 20:55:39 -0500 -empathy (2.32.2-0ubuntu6) natty; urgency=low +empathy (2.32.1-0ubuntu1.1) maverick-proposed; urgency=low * debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch: * debian/patches/22_dont_display_notifications_for_pending_messages.patch: - Don't display duplicate notifications. (LP: #666288) - -- Omer Akram Mon, 17 Jan 2011 20:11:44 +0500 - -empathy (2.32.2-0ubuntu5) natty; urgency=low - - * debian/control - - Bumped build depends for libindicate and libindicate-gtk to >= 0.4.91 - * debian/patches/20_libindicate.patch - - Updated to check for indicate-0.5 - - -- Ken VanDine Fri, 14 Jan 2011 12:52:27 -0600 - -empathy (2.32.2-0ubuntu4) natty; urgency=low - - * debian/control: - - Change build-depends from libwebkit-dev to libwebkitgtk-dev - - -- Robert Ancell Mon, 10 Jan 2011 15:07:47 -0600 - -empathy (2.32.2-0ubuntu3) natty; urgency=low - - * debian/patches/00git_folks_api.patch: - - Update to latest folks API - - [ Omer Akram ] - * debian/patches/enable_pidgin_imported_contacts.patch: - - Enable pidgin imported accounts by default. (LP: #622215) - * debian/patches/reword_subscription_dailog_to_be_less_technical.patch: - - Reword subscription request dialog to be less technical. (LP: #670197) - - -- Robert Ancell Thu, 06 Jan 2011 14:32:31 +1100 - -empathy (2.32.2-0ubuntu2) natty; urgency=low - - * debian/patches/00git_folks_aliasable_groupable.patch: - * debian/patches/00git_individual_methods.patch: - - Use latest libfolks API - - -- Robert Ancell Mon, 06 Dec 2010 16:14:51 +1100 - -empathy (2.32.2-0ubuntu1) natty; urgency=low - - * New upstream release - - -- Robert Ancell Wed, 24 Nov 2010 17:18:51 +1100 - -empathy (2.32.1-0ubuntu2) natty; urgency=low - - * Version bump for natty upload - - -- Ken VanDine Wed, 17 Nov 2010 10:05:40 -0500 + -- Omer Akram Tue, 11 Jan 2011 00:30:48 +0500 empathy (2.32.1-0ubuntu1) maverick-proposed; urgency=low diff -Nru empathy-2.32.2/debian/control empathy-2.32.1/debian/control --- empathy-2.32.2/debian/control 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/control 2011-01-29 01:55:12.000000000 +0000 @@ -37,15 +37,15 @@ libgstreamer-plugins-base0.10-dev, libnm-glib-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libwebkit-dev, + libwebkit-dev (>= 1.1.15), libgnome-keyring-dev (>= 2.26.0), libgcr-dev (>= 2.26.0), libunique-dev (>= 1.1.2), nautilus-sendto (>= 2.31.7), libfolks-dev (>= 0.1.15), libfolks-telepathy-dev (>= 0.1.15), - libindicate-dev, - libindicate-gtk-dev, + libindicate-dev (>= 0.3.0), + libindicate-gtk-dev (>= 0.3.0), libido-0.1-dev, liblaunchpad-integration-dev (>= 0.1.17) Standards-Version: 3.9.1 diff -Nru empathy-2.32.2/debian/patches/00git_folks_aliasable_groupable.patch empathy-2.32.1/debian/patches/00git_folks_aliasable_groupable.patch --- empathy-2.32.2/debian/patches/00git_folks_aliasable_groupable.patch 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/00git_folks_aliasable_groupable.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,474 +0,0 @@ -From 53aa7c1e6546214568969fe727926f7740a26127 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 15 Sep 2010 14:23:14 +0000 -Subject: Port Empathy to use FolksAliasable and FolksGroupable - -FolksAliasable is the new name for FolksAlias, and FolksGroupable -is the new name for FolksGroups. ---- -Index: empathy-2.32.2/configure.ac -=================================================================== ---- empathy-2.32.2.orig/configure.ac 2010-11-19 02:18:14.000000000 +1100 -+++ empathy-2.32.2/configure.ac 2010-12-06 16:01:06.208902002 +1100 -@@ -31,7 +31,7 @@ - # Minimal version required - - # Hardp deps --FOLKS_REQUIRED=0.1.15 -+FOLKS_REQUIRED=0.3.0 - GCONF_REQUIRED=1.2.0 - GLIB_REQUIRED=2.25.9 - GNUTLS_REQUIRED=2.8.5 -Index: empathy-2.32.2/libempathy-gtk/empathy-contact-widget.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-contact-widget.c 2010-11-19 01:25:29.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-contact-widget.c 2010-12-06 16:01:06.208902002 +1100 -@@ -586,11 +586,11 @@ - FolksPersona *persona = - empathy_contact_get_persona (information->contact); - -- if (FOLKS_IS_GROUPS (persona)) -+ if (FOLKS_IS_GROUPABLE (persona)) - { - empathy_groups_widget_set_groupable ( - EMPATHY_GROUPS_WIDGET (information->groups_widget), -- FOLKS_GROUPS (persona)); -+ FOLKS_GROUPABLE (persona)); - gtk_widget_show (information->groups_widget); - - return; -Index: empathy-2.32.2/libempathy-gtk/empathy-groups-widget.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-groups-widget.c 2010-11-19 01:25:29.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-groups-widget.c 2010-12-06 16:01:06.208902002 +1100 -@@ -40,10 +40,10 @@ - /** - * SECTION:empathy-groups-widget - * @title:EmpathyGroupsWidget -- * @short_description: A widget used to edit the groups of a #FolksGroups -+ * @short_description: A widget used to edit the groups of a #FolksGroupable - * @include: libempathy-gtk/empathy-groups-widget.h - * -- * #EmpathyGroupsWidget is a widget which lists the groups of a #FolksGroups -+ * #EmpathyGroupsWidget is a widget which lists the groups of a #FolksGroupable - * (i.e. a #FolksPersona or a #FolksIndividual) and allows them to be added and - * removed. - */ -@@ -52,7 +52,7 @@ - * EmpathyGroupsWidget: - * @parent: parent object - * -- * Widget which displays and allows editing of the groups of a #FolksGroups -+ * Widget which displays and allows editing of the groups of a #FolksGroupable - * (i.e. a #FolksPersona or #FolksIndividual). - */ - -@@ -64,7 +64,7 @@ - typedef struct - { - /* The object we're actually changing the groups of */ -- FolksGroups *groupable; /* owned */ -+ FolksGroupable *groupable; /* owned */ - GtkListStore *group_store; /* owned */ - - GtkWidget *add_group_entry; /* child widget */ -@@ -165,8 +165,8 @@ - EMPATHY_CONTACT_LIST (manager)); - g_object_unref (manager); - -- /* Get the list of groups that this #FolksGroups is currently in */ -- my_groups = folks_groups_get_groups (priv->groupable); -+ /* Get the list of groups that this #FolksGroupable is currently in */ -+ my_groups = folks_groupable_get_groups (priv->groupable); - - for (l = all_groups; l != NULL; l = l->next) - { -@@ -217,13 +217,13 @@ - } - - static void --change_group_cb (FolksGroups *groupable, -+change_group_cb (FolksGroupable *groupable, - GAsyncResult *async_result, - EmpathyGroupsWidget *self) - { - GError *error = NULL; - -- folks_groups_change_group_finish (groupable, async_result, &error); -+ folks_groupable_change_group_finish (groupable, async_result, &error); - - if (error != NULL) - { -@@ -248,7 +248,7 @@ - COL_ENABLED, TRUE, - -1); - -- folks_groups_change_group (priv->groupable, group, TRUE, -+ folks_groupable_change_group (priv->groupable, group, TRUE, - (GAsyncReadyCallback) change_group_cb, self); - } - -@@ -280,7 +280,7 @@ - - if (group != NULL) - { -- folks_groups_change_group (priv->groupable, group, !was_enabled, -+ folks_groupable_change_group (priv->groupable, group, !was_enabled, - (GAsyncReadyCallback) change_group_cb, self); - g_free (group); - } -@@ -288,7 +288,7 @@ - - - static void --groupable_group_changed_cb (FolksGroups *groups, -+groupable_group_changed_cb (FolksGroupable *groups, - const gchar *group, - gboolean is_member, - EmpathyGroupsWidget *self) -@@ -506,14 +506,14 @@ - /** - * EmpathyGroupsWidget:groupable: - * -- * The #FolksGroups whose group membership is to be edited by the -+ * The #FolksGroupable whose group membership is to be edited by the - * #EmpathyGroupsWidget. - */ - g_object_class_install_property (object_class, PROP_GROUPABLE, - g_param_spec_object ("groupable", - "Groupable", -- "The #FolksGroups whose groups are being edited.", -- FOLKS_TYPE_GROUPS, -+ "The #FolksGroupable whose groups are being edited.", -+ FOLKS_TYPE_GROUPABLE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private (object_class, sizeof (EmpathyGroupsWidgetPriv)); -@@ -521,7 +521,7 @@ - - /** - * empathy_groups_widget_new: -- * @groupable: a #FolksGroups, or %NULL -+ * @groupable: a #FolksGroupable, or %NULL - * - * Creates a new #EmpathyGroupsWidget to edit the groups of the given - * @groupable. -@@ -529,9 +529,9 @@ - * Return value: a new #EmpathyGroupsWidget - */ - GtkWidget * --empathy_groups_widget_new (FolksGroups *groupable) -+empathy_groups_widget_new (FolksGroupable *groupable) - { -- g_return_val_if_fail (groupable == NULL || FOLKS_IS_GROUPS (groupable), -+ g_return_val_if_fail (groupable == NULL || FOLKS_IS_GROUPABLE (groupable), - NULL); - - return GTK_WIDGET (g_object_new (EMPATHY_TYPE_GROUPS_WIDGET, -@@ -543,12 +543,12 @@ - * empathy_groups_widget_get_groupable: - * @self: an #EmpathyGroupsWidget - * -- * Get the #FolksGroups whose group membership is being edited by the -+ * Get the #FolksGroupable whose group membership is being edited by the - * #EmpathyGroupsWidget. - * -- * Returns: the #FolksGroups associated with @widget, or %NULL -+ * Returns: the #FolksGroupable associated with @widget, or %NULL - */ --FolksGroups * -+FolksGroupable * - empathy_groups_widget_get_groupable (EmpathyGroupsWidget *self) - { - g_return_val_if_fail (EMPATHY_IS_GROUPS_WIDGET (self), NULL); -@@ -559,19 +559,19 @@ - /** - * empathy_groups_widget_set_groupable: - * @self: an #EmpathyGroupsWidget -- * @groupable: the #FolksGroups whose membership is to be edited, or %NULL -+ * @groupable: the #FolksGroupable whose membership is to be edited, or %NULL - * -- * Change the #FolksGroups whose group membership is to be edited by the -+ * Change the #FolksGroupable whose group membership is to be edited by the - * #EmpathyGroupsWidget. - */ - void - empathy_groups_widget_set_groupable (EmpathyGroupsWidget *self, -- FolksGroups *groupable) -+ FolksGroupable *groupable) - { - EmpathyGroupsWidgetPriv *priv; - - g_return_if_fail (EMPATHY_IS_GROUPS_WIDGET (self)); -- g_return_if_fail (groupable == NULL || FOLKS_IS_GROUPS (groupable)); -+ g_return_if_fail (groupable == NULL || FOLKS_IS_GROUPABLE (groupable)); - - priv = GET_PRIV (self); - -Index: empathy-2.32.2/libempathy-gtk/empathy-groups-widget.h -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-groups-widget.h 2010-11-19 01:25:29.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-groups-widget.h 2010-12-06 16:01:06.208902002 +1100 -@@ -54,12 +54,12 @@ - - GType empathy_groups_widget_get_type (void) G_GNUC_CONST; - --GtkWidget * empathy_groups_widget_new (FolksGroups *groupable); -+GtkWidget * empathy_groups_widget_new (FolksGroupable *groupable); - --FolksGroups * empathy_groups_widget_get_groupable ( -+FolksGroupable * empathy_groups_widget_get_groupable ( - EmpathyGroupsWidget *self); - void empathy_groups_widget_set_groupable (EmpathyGroupsWidget *self, -- FolksGroups *groupable); -+ FolksGroupable *groupable); - - G_END_DECLS - -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-view.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-view.c 2010-11-19 01:25:30.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-view.c 2010-12-06 16:01:06.218902002 +1100 -@@ -236,10 +236,10 @@ - GAsyncResult *result, - gpointer user_data) - { -- FolksGroups *groups = FOLKS_GROUPS (source); -+ FolksGroupable *groupable = FOLKS_GROUPABLE (source); - GError *error = NULL; - -- folks_groups_change_group_finish (groups, result, &error); -+ folks_groupable_change_group_finish (groupable, result, &error); - if (error != NULL) - { - g_warning ("failed to change group: %s", error->message); -@@ -385,13 +385,13 @@ - - if (new_group != NULL) - { -- folks_groups_change_group (FOLKS_GROUPS (individual), new_group, TRUE, -+ folks_groupable_change_group (FOLKS_GROUPABLE (individual), new_group, TRUE, - groups_change_group_cb, NULL); - } - - if (old_group != NULL && action == GDK_ACTION_MOVE) - { -- folks_groups_change_group (FOLKS_GROUPS (individual), old_group, -+ folks_groupable_change_group (FOLKS_GROUPABLE (individual), old_group, - FALSE, groups_change_group_cb, NULL); - } - } -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-widget.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-widget.c 2010-11-19 01:25:30.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-widget.c 2010-12-06 16:01:06.218902002 +1100 -@@ -437,7 +437,7 @@ - { - empathy_groups_widget_set_groupable ( - EMPATHY_GROUPS_WIDGET (priv->groups_widget), -- FOLKS_GROUPS (priv->individual)); -+ FOLKS_GROUPABLE (priv->individual)); - gtk_widget_show (priv->groups_widget); - } - else -@@ -761,8 +761,8 @@ - - /* Add a marker to the map */ - marker = champlain_marker_new_with_text ( -- folks_alias_get_alias (FOLKS_ALIAS (persona)), NULL, NULL, -- NULL); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (persona)), NULL, -+ NULL, NULL); - champlain_base_marker_set_position ( - CHAMPLAIN_BASE_MARKER (marker), lat, lon); - clutter_container_add (CLUTTER_CONTAINER (layer), marker, NULL); -@@ -1058,7 +1058,7 @@ - } - else - { -- folks_alias_set_alias (FOLKS_ALIAS (priv->individual), alias); -+ folks_aliasable_set_alias (FOLKS_ALIASABLE (priv->individual), alias); - } - } - -@@ -1133,12 +1133,12 @@ - if (GTK_IS_ENTRY (alias_widget)) - { - gtk_entry_set_text (GTK_ENTRY (alias_widget), -- folks_alias_get_alias (FOLKS_ALIAS (folks_object))); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (folks_object))); - } - else - { - gtk_label_set_label (GTK_LABEL (alias_widget), -- folks_alias_get_alias (FOLKS_ALIAS (folks_object))); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (folks_object))); - } - } - -Index: empathy-2.32.2/libempathy-gtk/empathy-persona-store.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-persona-store.c 2010-11-19 01:25:30.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-persona-store.c 2010-12-06 16:01:06.218902002 +1100 -@@ -142,7 +142,7 @@ - ShowActiveData *data; - - DEBUG ("Contact:'%s' now active, and %s be removed", -- folks_alias_get_alias (FOLKS_ALIAS (persona)), -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (persona)), - remove_ ? "WILL" : "WILL NOT"); - - data = g_slice_new0 (ShowActiveData); -@@ -212,7 +212,8 @@ - static gboolean - persona_active_cb (ShowActiveData *data) - { -- const gchar *alias = folks_alias_get_alias (FOLKS_ALIAS (data->persona)); -+ const gchar *alias = -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (data->persona)); - - if (data->remove) - { -@@ -234,7 +235,7 @@ - EmpathyPersonaStore *self) - { - DEBUG ("Contact:'%s' updated, checking roster is in sync...", -- folks_alias_get_alias (FOLKS_ALIAS (persona))); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (persona))); - - update_persona (self, persona); - } -@@ -288,7 +289,7 @@ - - priv = GET_PRIV (self); - -- alias = folks_alias_get_alias (FOLKS_ALIAS (persona)); -+ alias = folks_aliasable_get_alias (FOLKS_ALIASABLE (persona)); - if (EMP_STR_EMPTY (alias)) - return; - -@@ -407,7 +408,7 @@ - const gchar *alias; - - path = find_persona (self, persona); -- alias = folks_alias_get_alias (FOLKS_ALIAS (persona)); -+ alias = folks_aliasable_get_alias (FOLKS_ALIASABLE (persona)); - - if (path == NULL) - { -@@ -551,8 +552,9 @@ - g_return_val_if_fail (persona_a != NULL || persona_b != NULL, 0); - - /* alias */ -- ret_val = g_utf8_collate (folks_alias_get_alias (FOLKS_ALIAS (persona_a)), -- folks_alias_get_alias (FOLKS_ALIAS (persona_b))); -+ ret_val = g_utf8_collate ( -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (persona_a)), -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (persona_b))); - - if (ret_val != 0) - goto out; -Index: empathy-2.32.2/libempathy/empathy-contact.c -=================================================================== ---- empathy-2.32.2.orig/libempathy/empathy-contact.c 2010-11-19 01:25:30.000000000 +1100 -+++ empathy-2.32.2/libempathy/empathy-contact.c 2010-12-06 16:01:06.218902002 +1100 -@@ -703,12 +703,12 @@ - - /* Set the alias on the persona if possible */ - persona = empathy_contact_get_persona (contact); -- if (persona != NULL && FOLKS_IS_ALIAS (persona)) -+ if (persona != NULL && FOLKS_IS_ALIASABLE (persona)) - { - DEBUG ("Setting alias for contact %s to %s", - empathy_contact_get_id (contact), alias); - -- folks_alias_set_alias (FOLKS_ALIAS (persona), alias); -+ folks_aliasable_set_alias (FOLKS_ALIASABLE (persona), alias); - } - - if (tp_strdiff (alias, priv->alias)) -@@ -726,10 +726,10 @@ - GAsyncResult *result, - gpointer user_data) - { -- FolksGroups *groups = FOLKS_GROUPS (source); -+ FolksGroupable *groupable = FOLKS_GROUPABLE (source); - GError *error = NULL; - -- folks_groups_change_group_finish (groups, result, &error); -+ folks_groupable_change_group_finish (groupable, result, &error); - if (error != NULL) - { - g_warning ("failed to change group: %s", error->message); -@@ -753,8 +753,8 @@ - persona = empathy_contact_get_persona (contact); - if (persona != NULL) - { -- if (FOLKS_IS_GROUPS (persona)) -- folks_groups_change_group (FOLKS_GROUPS (persona), group, is_member, -+ if (FOLKS_IS_GROUPABLE (persona)) -+ folks_groupable_change_group (FOLKS_GROUPABLE (persona), group, is_member, - groups_change_group_cb, contact); - return; - } -@@ -918,7 +918,7 @@ - /* Set the persona's groups */ - if (priv->groups != NULL) - { -- folks_groups_set_groups (FOLKS_GROUPS (persona), priv->groups); -+ folks_groupable_set_groups (FOLKS_GROUPABLE (persona), priv->groups); - g_hash_table_destroy (priv->groups); - priv->groups = NULL; - } -Index: empathy-2.32.2/libempathy/empathy-individual-manager.c -=================================================================== ---- empathy-2.32.2.orig/libempathy/empathy-individual-manager.c 2010-11-19 01:25:31.000000000 +1100 -+++ empathy-2.32.2/libempathy/empathy-individual-manager.c 2010-12-06 16:01:06.218902002 +1100 -@@ -464,10 +464,10 @@ - GAsyncResult *result, - gpointer user_data) - { -- FolksGroups *groups = FOLKS_GROUPS (source); -+ FolksGroupable *groupable = FOLKS_GROUPABLE (source); - GError *error = NULL; - -- folks_groups_change_group_finish (groups, result, &error); -+ folks_groupable_change_group_finish (groupable, result, &error); - if (error != NULL) - { - g_warning ("failed to change group: %s", error->message); -@@ -480,7 +480,7 @@ - FolksIndividual *individual, - const gchar *group) - { -- folks_groups_change_group (FOLKS_GROUPS (individual), group, FALSE, -+ folks_groupable_change_group (FOLKS_GROUPABLE (individual), group, FALSE, - groups_change_group_cb, NULL); - } - -Index: empathy-2.32.2/libempathy/empathy-utils.c -=================================================================== ---- empathy-2.32.2.orig/libempathy/empathy-utils.c 2010-12-06 15:57:26.018902001 +1100 -+++ empathy-2.32.2/libempathy/empathy-utils.c 2010-12-06 16:01:06.218902002 +1100 -@@ -739,7 +739,7 @@ - - TpChannelGroupChangeReason - tp_channel_group_change_reason_from_folks_groups_change_reason ( -- FolksGroupsChangeReason reason) -+ FolksGroupableChangeReason reason) - { - return (TpChannelGroupChangeReason) reason; - } -Index: empathy-2.32.2/libempathy/empathy-utils.h -=================================================================== ---- empathy-2.32.2.orig/libempathy/empathy-utils.h 2010-12-06 15:57:26.038902001 +1100 -+++ empathy-2.32.2/libempathy/empathy-utils.h 2010-12-06 16:01:06.218902002 +1100 -@@ -97,7 +97,7 @@ - TpConnectionPresenceType empathy_folks_presence_type_to_tp (FolksPresenceType type); - gboolean empathy_folks_individual_contains_contact (FolksIndividual *individual); - EmpathyContact * empathy_contact_dup_from_folks_individual (FolksIndividual *individual); --TpChannelGroupChangeReason tp_channel_group_change_reason_from_folks_groups_change_reason (FolksGroupsChangeReason reason); -+TpChannelGroupChangeReason tp_channel_group_change_reason_from_folks_groups_change_reason (FolksGroupableChangeReason reason); - - gchar * empathy_get_x509_certificate_hostname (gnutls_x509_crt_t cert); - diff -Nru empathy-2.32.2/debian/patches/00git_folks_api.patch empathy-2.32.1/debian/patches/00git_folks_api.patch --- empathy-2.32.2/debian/patches/00git_folks_api.patch 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/00git_folks_api.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,337 +0,0 @@ -From c6371ec63c928c848cbb5474cb005af5cc414230 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Sun, 12 Dec 2010 18:51:07 +0000 -Subject: Bug 637097 — Port to latest folks API changes -Note: This patch has been updated to apply to empathy 2.32 - -Catch up with three interface renamings which have happened in folks master. -This bumps Empathy's folks dependency to 0.3.3. Closes: bgo#637097 ---- -Index: empathy-2.32.2/configure.ac -=================================================================== ---- empathy-2.32.2.orig/configure.ac 2011-01-06 14:06:24.000000000 +1100 -+++ empathy-2.32.2/configure.ac 2011-01-06 14:06:30.886667000 +1100 -@@ -31,7 +31,7 @@ - # Minimal version required - - # Hardp deps --FOLKS_REQUIRED=0.3.0 -+FOLKS_REQUIRED=0.3.3 - GCONF_REQUIRED=1.2.0 - GLIB_REQUIRED=2.25.9 - GNUTLS_REQUIRED=2.8.5 -Index: empathy-2.32.2/libempathy-gtk/empathy-contact-widget.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-contact-widget.c 2011-01-06 14:06:24.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-contact-widget.c 2011-01-06 14:06:30.886667000 +1100 -@@ -1284,10 +1284,10 @@ - FolksPersona *persona = empathy_contact_get_persona ( - information->contact); - -- if (persona != NULL && FOLKS_IS_FAVOURITE (persona)) -+ if (persona != NULL && FOLKS_IS_FAVOURITABLE (persona)) - { -- gboolean is_favourite = folks_favourite_get_is_favourite ( -- FOLKS_FAVOURITE (persona)); -+ gboolean is_favourite = folks_favouritable_get_is_favourite ( -+ FOLKS_FAVOURITABLE (persona)); - contact_widget_favourites_changed_cb (information->manager, - information->contact, is_favourite, information); - } -@@ -1418,10 +1418,10 @@ - { - FolksPersona *persona = empathy_contact_get_persona (information->contact); - -- if (persona != NULL && FOLKS_IS_FAVOURITE (persona)) -+ if (persona != NULL && FOLKS_IS_FAVOURITABLE (persona)) - { - gboolean active = gtk_toggle_button_get_active (button); -- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (persona), active); -+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (persona), active); - } - } - -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-menu.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-menu.c 2010-11-19 01:25:30.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-menu.c 2011-01-06 14:06:30.886667000 +1100 -@@ -749,7 +749,7 @@ - favourite_menu_item_toggled_cb (GtkCheckMenuItem *item, - FolksIndividual *individual) - { -- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual), -+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), - gtk_check_menu_item_get_active (item)); - } - -@@ -761,7 +761,7 @@ - item = gtk_check_menu_item_new_with_label (_("Favorite")); - - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), -- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (individual))); -+ folks_favouritable_get_is_favourite (FOLKS_FAVOURITABLE (individual))); - - g_signal_connect (item, "toggled", - G_CALLBACK (favourite_menu_item_toggled_cb), individual); -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-store.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-store.c 2011-01-06 14:06:27.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-store.c 2011-01-06 14:08:52.356667001 +1100 -@@ -445,7 +445,7 @@ - g_list_free (groups); - - if (priv->show_groups && -- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (individual))) -+ folks_favouritable_get_is_favourite (FOLKS_FAVOURITABLE (individual))) - { - /* Add contact to the fake 'Favorites' group */ - GtkTreeIter iter_group; -@@ -672,7 +672,7 @@ - } - - /* Get online state now. */ -- now_online = folks_presence_is_online (FOLKS_PRESENCE (individual)); -+ now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (individual)); - - if (!in_list) - { -@@ -759,9 +759,9 @@ - EMPATHY_INDIVIDUAL_STORE_COL_NAME, - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), - EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE, -- folks_presence_get_presence_type (FOLKS_PRESENCE (individual)), -+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual)), - EMPATHY_INDIVIDUAL_STORE_COL_STATUS, -- folks_presence_get_presence_message (FOLKS_PRESENCE (individual)), -+ folks_has_presence_get_presence_message (FOLKS_HAS_PRESENCE (individual)), - EMPATHY_INDIVIDUAL_STORE_COL_COMPACT, priv->is_compact, - EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE, - EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, now_online, -@@ -1422,9 +1422,9 @@ - * the presences. - */ - folks_presence_type_a = -- folks_presence_get_presence_type (FOLKS_PRESENCE (individual_a)); -+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual_a)); - folks_presence_type_b = -- folks_presence_get_presence_type (FOLKS_PRESENCE (individual_b)); -+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual_b)); - tp_presence_a = empathy_folks_presence_type_to_tp (folks_presence_type_a); - tp_presence_b = empathy_folks_presence_type_to_tp (folks_presence_type_b); - -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-view.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-view.c 2011-01-06 14:06:27.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-view.c 2011-01-06 14:07:57.406667001 +1100 -@@ -370,14 +370,14 @@ - if (!tp_strdiff (new_group, EMPATHY_INDIVIDUAL_STORE_FAVORITE)) - { - /* Mark contact as favourite */ -- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual), TRUE); -+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), TRUE); - return; - } - - if (!tp_strdiff (old_group, EMPATHY_INDIVIDUAL_STORE_FAVORITE)) - { - /* Remove contact as favourite */ -- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual), FALSE); -+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), FALSE); - - /* Don't try to remove it */ - old_group = NULL; -@@ -624,7 +624,7 @@ - } - - if (individual != NULL && -- folks_presence_is_online (FOLKS_PRESENCE (individual)) && -+ folks_has_presence_is_online (FOLKS_HAS_PRESENCE (individual)) && - (caps & EMPATHY_CAPABILITIES_FT)) - { - gdk_drag_status (context, GDK_ACTION_COPY, time_); -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-widget.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-widget.c 2011-01-06 14:06:24.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-widget.c 2011-01-06 14:06:30.886667000 +1100 -@@ -816,7 +816,7 @@ - - /* FIXME: We just choose the first Persona which has an avatar, and save that. - * The avatar handling in EmpathyContact needs to be moved into libfolks as -- * much as possible, and this code rewritten to use FolksAvatar. -+ * much as possible, and this code rewritten to use FolksHasAvatar. - * (bgo#627401) */ - personas = folks_individual_get_personas (individual); - for (l = personas; l != NULL; l = l->next) -@@ -1070,8 +1070,8 @@ - EmpathyIndividualWidget *self) - { - gboolean active = gtk_toggle_button_get_active (button); -- folks_favourite_set_is_favourite ( -- FOLKS_FAVOURITE (GET_PRIV (self)->individual), active); -+ folks_favouritable_set_is_favourite ( -+ FOLKS_FAVOURITABLE (GET_PRIV (self)->individual), active); - } - - static void -@@ -1167,11 +1167,13 @@ - state_image = g_object_get_data (table, "state-image"); - - /* FIXME: Default messages should be moved into libfolks (bgo#627403) */ -- message = folks_presence_get_presence_message (FOLKS_PRESENCE (folks_object)); -+ message = folks_has_presence_get_presence_message ( -+ FOLKS_HAS_PRESENCE (folks_object)); - if (EMP_STR_EMPTY (message)) - { - message = empathy_presence_get_default_message ( -- folks_presence_get_presence_type (FOLKS_PRESENCE (folks_object))); -+ folks_has_presence_get_presence_type ( -+ FOLKS_HAS_PRESENCE (folks_object))); - } - - if (message != NULL) -@@ -1181,7 +1183,8 @@ - - gtk_image_set_from_icon_name (GTK_IMAGE (state_image), - empathy_icon_name_for_presence ( -- folks_presence_get_presence_type (FOLKS_PRESENCE (folks_object))), -+ folks_has_presence_get_presence_type ( -+ FOLKS_HAS_PRESENCE (folks_object))), - GTK_ICON_SIZE_BUTTON); - gtk_widget_show (state_image); - } -@@ -1210,7 +1213,8 @@ - if (GTK_IS_TOGGLE_BUTTON (favourite_widget)) - { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (favourite_widget), -- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (folks_object))); -+ folks_favouritable_get_is_favourite ( -+ FOLKS_FAVOURITABLE (folks_object))); - } - } - -Index: empathy-2.32.2/libempathy-gtk/empathy-persona-store.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-persona-store.c 2011-01-06 14:06:24.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-persona-store.c 2011-01-06 14:06:30.886667000 +1100 -@@ -438,7 +438,7 @@ - gtk_tree_path_free (path); - - /* Get online state now. */ -- now_online = folks_presence_is_online (FOLKS_PRESENCE (persona)); -+ now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (persona)); - - /* Get online state before. */ - gtk_tree_model_get (GTK_TREE_MODEL (self), &iter, -@@ -484,9 +484,11 @@ - EMPATHY_PERSONA_STORE_COL_DISPLAY_ID, - folks_persona_get_display_id (persona), - EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE, -- folks_presence_get_presence_type (FOLKS_PRESENCE (persona)), -+ folks_has_presence_get_presence_type ( -+ FOLKS_HAS_PRESENCE (persona)), - EMPATHY_PERSONA_STORE_COL_STATUS, -- folks_presence_get_presence_message (FOLKS_PRESENCE (persona)), -+ folks_has_presence_get_presence_message ( -+ FOLKS_HAS_PRESENCE (persona)), - EMPATHY_PERSONA_STORE_COL_IS_ONLINE, now_online, - EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL, - empathy_contact_get_capabilities (contact) & -@@ -619,8 +621,8 @@ - * the presences. - */ - ret_val = -tp_connection_presence_type_cmp_availability ( -- folks_presence_get_presence_type (FOLKS_PRESENCE (persona_a)), -- folks_presence_get_presence_type (FOLKS_PRESENCE (persona_b))); -+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_a)), -+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_b))); - - if (ret_val == 0) { - /* Fallback: compare by name et al. */ -Index: empathy-2.32.2/libempathy-gtk/empathy-ui-utils.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-ui-utils.c 2011-01-06 14:06:27.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-ui-utils.c 2011-01-06 14:07:25.716667000 +1100 -@@ -231,8 +231,7 @@ - FolksPresenceType folks_presence; - TpConnectionPresenceType presence; - -- folks_presence = -- folks_presence_get_presence_type (FOLKS_PRESENCE (individual)); -+ folks_presence = folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual)); - presence = empathy_folks_presence_type_to_tp (folks_presence); - - return empathy_icon_name_for_presence (presence); -@@ -632,7 +631,8 @@ - callback, user_data, - empathy_pixbuf_avatar_from_individual_scaled_async); - -- avatar_file = folks_avatar_get_avatar (FOLKS_AVATAR (individual)); -+ avatar_file = -+ folks_has_avatar_get_avatar (FOLKS_HAS_AVATAR (individual)); - if (avatar_file == NULL) - goto out; - -Index: empathy-2.32.2/libempathy/empathy-contact.c -=================================================================== ---- empathy-2.32.2.orig/libempathy/empathy-contact.c 2011-01-06 14:06:24.000000000 +1100 -+++ empathy-2.32.2/libempathy/empathy-contact.c 2011-01-06 14:06:30.896667000 +1100 -@@ -484,8 +484,8 @@ - - if (priv->persona != NULL) - { -- folks_presence_set_presence_message (FOLKS_PRESENCE (priv->persona), -- message); -+ folks_has_presence_set_presence_message ( -+ FOLKS_HAS_PRESENCE (priv->persona), message); - } - } - -@@ -965,7 +965,10 @@ - priv = GET_PRIV (contact); - - if (priv->persona != NULL) -- return folks_presence_get_presence_message (FOLKS_PRESENCE (priv->persona)); -+ { -+ return folks_has_presence_get_presence_message ( -+ FOLKS_HAS_PRESENCE (priv->persona)); -+ } - - return NULL; - } -@@ -1740,15 +1743,16 @@ - presence_cmp_func (EmpathyContact *a, - EmpathyContact *b) - { -- FolksPresence *presence_a, *presence_b; -+ FolksHasPresence *presence_a, *presence_b; - -- presence_a = FOLKS_PRESENCE (empathy_contact_get_persona (a)); -- presence_b = FOLKS_PRESENCE (empathy_contact_get_persona (b)); -+ presence_a = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (a)); -+ presence_b = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (b)); - - /* We negate the result because we're sorting in reverse order (i.e. such that - * the Personas with the highest presence are at the beginning of the list. */ -- return -folks_presence_typecmp (folks_presence_get_presence_type (presence_a), -- folks_presence_get_presence_type (presence_b)); -+ return -folks_has_presence_typecmp ( -+ folks_has_presence_get_presence_type (presence_a), -+ folks_has_presence_get_presence_type (presence_b)); - } - - static gint -Index: empathy-2.32.2/libempathy/empathy-individual-manager.c -=================================================================== ---- empathy-2.32.2.orig/libempathy/empathy-individual-manager.c 2011-01-06 14:06:27.000000000 +1100 -+++ empathy-2.32.2/libempathy/empathy-individual-manager.c 2011-01-06 14:06:30.896667000 +1100 -@@ -85,8 +85,8 @@ - GParamSpec *pspec, - EmpathyIndividualManager *self) - { -- gboolean is_favourite = folks_favourite_get_is_favourite ( -- FOLKS_FAVOURITE (individual)); -+ gboolean is_favourite = folks_favouritable_get_is_favourite ( -+ FOLKS_FAVOURITABLE (individual)); - g_signal_emit (self, signals[FAVOURITES_CHANGED], 0, individual, - is_favourite); - } diff -Nru empathy-2.32.2/debian/patches/00git_individual_methods.patch empathy-2.32.1/debian/patches/00git_individual_methods.patch --- empathy-2.32.2/debian/patches/00git_individual_methods.patch 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/00git_individual_methods.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -From ff49ee828e63dd35b5c4faf3a0ccd962c7cd63a8 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Sat, 13 Nov 2010 14:07:46 +0000 -Subject: Stop using removed Individual convenience methods from folks - -They were removed from folks with commit -def47dffa31a95ec6bd333f43c69822416098283. This doesn't require a dependency -bump, since they're being replaced with calls to methods which exist in folks -0.3.1. See: bgo#629078. Closes: bgo#634754 ---- -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-information-dialog.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-information-dialog.c 2010-11-19 01:25:30.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-information-dialog.c 2010-12-06 16:07:26.218902001 +1100 -@@ -180,7 +180,7 @@ - - /* Update the UI */ - gtk_window_set_title (GTK_WINDOW (dialog), -- folks_individual_get_alias (individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); - empathy_individual_widget_set_individual ( - EMPATHY_INDIVIDUAL_WIDGET (priv->individual_widget), individual); - set_label_visibility (dialog); -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-store.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-store.c 2010-11-19 01:35:44.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-store.c 2010-12-06 16:07:26.218902001 +1100 -@@ -168,7 +168,7 @@ - - gtk_tree_store_insert_with_values (self, iter, parent, 0, - EMPATHY_INDIVIDUAL_STORE_COL_NAME, -- folks_individual_get_alias (individual), -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), - EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, individual, - EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE, - EMPATHY_INDIVIDUAL_STORE_COL_IS_SEPARATOR, FALSE, -@@ -387,12 +387,12 @@ - - priv = GET_PRIV (self); - -- if (EMP_STR_EMPTY (folks_individual_get_alias (individual))) -+ if (EMP_STR_EMPTY (folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)))) - return; - - if (priv->show_groups) - { -- group_set = folks_individual_get_groups (individual); -+ group_set = folks_groupable_get_groups (FOLKS_GROUPABLE (individual)); - groups = g_hash_table_get_keys (group_set); - } - -@@ -443,8 +443,6 @@ - individual, flags); - } - g_list_free (groups); -- if (group_set != NULL) -- g_hash_table_unref (group_set); - - if (priv->show_groups && - folks_favourite_get_is_favourite (FOLKS_FAVOURITE (individual))) -@@ -527,7 +525,8 @@ - ShowActiveData *data; - - DEBUG ("Individual'%s' now active, and %s be removed", -- folks_individual_get_alias (individual), remove_ ? "WILL" : "WILL NOT"); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), -+ remove_ ? "WILL" : "WILL NOT"); - - data = g_slice_new0 (ShowActiveData); - -@@ -571,12 +570,12 @@ - if (data->remove) - { - DEBUG ("Individual'%s' active timeout, removing item", -- folks_individual_get_alias (data->individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (data->individual))); - individual_store_remove_individual (data->self, data->individual); - } - - DEBUG ("Individual'%s' no longer active", -- folks_individual_get_alias (data->individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (data->individual))); - - individual_store_contact_set_active (data->self, - data->individual, FALSE, TRUE); -@@ -605,7 +604,7 @@ - if (error != NULL) - { - DEBUG ("failed to retrieve pixbuf for individual %s: %s", -- folks_individual_get_alias (individual), -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), - error->message); - g_clear_error (&error); - } -@@ -673,12 +672,12 @@ - } - - /* Get online state now. */ -- now_online = folks_individual_is_online (individual); -+ now_online = folks_presence_is_online (FOLKS_PRESENCE (individual)); - - if (!in_list) - { - DEBUG ("Individual'%s' in list:NO, should be:YES", -- folks_individual_get_alias (individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); - - individual_store_add_individual (self, individual); - -@@ -692,7 +691,7 @@ - else - { - DEBUG ("Individual'%s' in list:YES, should be:YES", -- folks_individual_get_alias (individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); - - /* Get online state before. */ - if (iters && g_list_length (iters) > 0) -@@ -758,11 +757,11 @@ - EMPATHY_INDIVIDUAL_STORE_COL_ICON_STATUS, pixbuf_status, - EMPATHY_INDIVIDUAL_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar, - EMPATHY_INDIVIDUAL_STORE_COL_NAME, -- folks_individual_get_alias (individual), -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), - EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE, -- folks_individual_get_presence_type (individual), -+ folks_presence_get_presence_type (FOLKS_PRESENCE (individual)), - EMPATHY_INDIVIDUAL_STORE_COL_STATUS, -- folks_individual_get_presence_message (individual), -+ folks_presence_get_presence_message (FOLKS_PRESENCE (individual)), - EMPATHY_INDIVIDUAL_STORE_COL_COMPACT, priv->is_compact, - EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE, - EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, now_online, -@@ -801,7 +800,7 @@ - EmpathyIndividualStore *self) - { - DEBUG ("Individual'%s' updated, checking roster is in sync...", -- folks_individual_get_alias (individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); - - individual_store_contact_update (self, individual); - } -@@ -1349,8 +1348,9 @@ - g_return_val_if_fail (individual_a != NULL || individual_b != NULL, 0); - - /* alias */ -- ret_val = g_utf8_collate (folks_individual_get_alias (individual_a), -- folks_individual_get_alias (individual_b)); -+ ret_val = g_utf8_collate ( -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual_a)), -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual_b))); - - if (ret_val != 0) - goto out; -@@ -1421,8 +1421,10 @@ - /* If we managed to get this far, we can start looking at - * the presences. - */ -- folks_presence_type_a = folks_individual_get_presence_type (individual_a); -- folks_presence_type_b = folks_individual_get_presence_type (individual_b); -+ folks_presence_type_a = -+ folks_presence_get_presence_type (FOLKS_PRESENCE (individual_a)); -+ folks_presence_type_b = -+ folks_presence_get_presence_type (FOLKS_PRESENCE (individual_b)); - tp_presence_a = empathy_folks_presence_type_to_tp (folks_presence_type_a); - tp_presence_b = empathy_folks_presence_type_to_tp (folks_presence_type_b); - -Index: empathy-2.32.2/libempathy-gtk/empathy-individual-view.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-view.c 2010-12-06 16:07:25.678902002 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-individual-view.c 2010-12-06 16:07:26.218902001 +1100 -@@ -624,7 +624,7 @@ - } - - if (individual != NULL && -- folks_individual_is_online (individual) && -+ folks_presence_is_online (FOLKS_PRESENCE (individual)) && - (caps & EMPATHY_CAPABILITIES_FT)) - { - gdk_drag_status (context, GDK_ACTION_COPY, time_); -@@ -1612,7 +1612,7 @@ - return (priv->show_offline || is_online); - - /* check alias name */ -- str = folks_individual_get_alias (individual); -+ str = folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)); - - if (empathy_live_search_match (live, str)) - return TRUE; -@@ -2318,7 +2318,7 @@ - text = - g_strdup_printf (_ - ("Do you really want to remove the contact '%s'?"), -- folks_individual_get_alias (individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); - if (individual_view_remove_dialog_show (parent, _("Removing contact"), - text)) - { -Index: empathy-2.32.2/libempathy-gtk/empathy-linking-dialog.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-linking-dialog.c 2010-11-19 01:25:30.000000000 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-linking-dialog.c 2010-12-06 16:07:26.218902001 +1100 -@@ -180,7 +180,7 @@ - /* Show a confirmation dialogue first */ - dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Unlink meta-contact '%s'?"), -- folks_individual_get_alias (individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Are you sure you want to unlink this meta-contact? This will " - "completely split the meta-contact into the contacts it " -Index: empathy-2.32.2/libempathy-gtk/empathy-ui-utils.c -=================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-ui-utils.c 2010-12-06 16:01:18.648902002 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-ui-utils.c 2010-12-06 16:07:26.218902001 +1100 -@@ -231,7 +231,8 @@ - FolksPresenceType folks_presence; - TpConnectionPresenceType presence; - -- folks_presence = folks_individual_get_presence_type (individual); -+ folks_presence = -+ folks_presence_get_presence_type (FOLKS_PRESENCE (individual)); - presence = empathy_folks_presence_type_to_tp (folks_presence); - - return empathy_icon_name_for_presence (presence); -Index: empathy-2.32.2/libempathy/empathy-individual-manager.c -=================================================================== ---- empathy-2.32.2.orig/libempathy/empathy-individual-manager.c 2010-12-06 16:07:25.678902002 +1100 -+++ empathy-2.32.2/libempathy/empathy-individual-manager.c 2010-12-06 16:07:26.218902001 +1100 -@@ -453,7 +453,7 @@ - - DEBUG ("removing individual %s (%s)", - folks_individual_get_id (individual), -- folks_individual_get_alias (individual)); -+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); - - folks_individual_aggregator_remove_individual (priv->aggregator, individual, - aggregator_remove_individual_cb, self); diff -Nru empathy-2.32.2/debian/patches/01_lpi.patch empathy-2.32.1/debian/patches/01_lpi.patch --- empathy-2.32.2/debian/patches/01_lpi.patch 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/01_lpi.patch 2011-01-29 01:51:16.000000000 +0000 @@ -1,10 +1,10 @@ Description: Add Launchpad integration Author: ? -Index: empathy-2.32.2/src/empathy-chat-window.c +Index: empathy-2.31.91/src/empathy-chat-window.c =================================================================== ---- empathy-2.32.2.orig/src/empathy-chat-window.c 2010-11-19 01:25:31.000000000 +1100 -+++ empathy-2.32.2/src/empathy-chat-window.c 2010-11-24 17:22:04.735693001 +1100 +--- empathy-2.31.91.orig/src/empathy-chat-window.c 2010-08-30 21:37:45.000000000 +1000 ++++ empathy-2.31.91/src/empathy-chat-window.c 2010-08-31 15:12:03.160664001 +1000 @@ -36,6 +36,9 @@ #include #include @@ -15,7 +15,7 @@ #include #include -@@ -2060,6 +2063,9 @@ +@@ -2059,6 +2062,9 @@ chat_window_chat_manager_chats_changed_cb (priv->chat_manager, empathy_chat_manager_get_num_chats (priv->chat_manager), window); @@ -25,10 +25,10 @@ } EmpathyChatWindow * -Index: empathy-2.32.2/src/empathy-chat-window.ui +Index: empathy-2.31.91/src/empathy-chat-window.ui =================================================================== ---- empathy-2.32.2.orig/src/empathy-chat-window.ui 2010-10-04 20:19:27.000000000 +1100 -+++ empathy-2.32.2/src/empathy-chat-window.ui 2010-11-24 17:22:04.735693001 +1100 +--- empathy-2.31.91.orig/src/empathy-chat-window.ui 2010-08-30 21:29:37.000000000 +1000 ++++ empathy-2.31.91/src/empathy-chat-window.ui 2010-08-31 15:12:03.160664001 +1000 @@ -197,6 +197,7 @@ @@ -37,10 +37,10 @@ -Index: empathy-2.32.2/src/empathy-main-window.c +Index: empathy-2.31.91/src/empathy-main-window.c =================================================================== ---- empathy-2.32.2.orig/src/empathy-main-window.c 2010-11-19 01:25:31.000000000 +1100 -+++ empathy-2.32.2/src/empathy-main-window.c 2010-11-24 17:22:04.735693001 +1100 +--- empathy-2.31.91.orig/src/empathy-main-window.c 2010-08-30 21:29:37.000000000 +1000 ++++ empathy-2.31.91/src/empathy-main-window.c 2010-08-31 15:12:03.160664001 +1000 @@ -33,6 +33,9 @@ #include #include @@ -51,7 +51,7 @@ #include #include #include -@@ -1797,6 +1800,8 @@ +@@ -1794,6 +1797,8 @@ main_window_notify_contact_list_size_cb (priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_AVATARS, window); @@ -60,10 +60,10 @@ } GtkWidget * -Index: empathy-2.32.2/src/empathy-main-window.ui +Index: empathy-2.31.91/src/empathy-main-window.ui =================================================================== ---- empathy-2.32.2.orig/src/empathy-main-window.ui 2010-11-19 01:25:31.000000000 +1100 -+++ empathy-2.32.2/src/empathy-main-window.ui 2010-11-24 17:22:04.735693001 +1100 +--- empathy-2.31.91.orig/src/empathy-main-window.ui 2010-08-30 21:29:37.000000000 +1000 ++++ empathy-2.31.91/src/empathy-main-window.ui 2010-08-31 15:12:03.160664001 +1000 @@ -262,6 +262,7 @@ @@ -72,11 +72,11 @@ -Index: empathy-2.32.2/configure.ac +Index: empathy-2.31.91/configure.ac =================================================================== ---- empathy-2.32.2.orig/configure.ac 2010-11-19 02:18:14.000000000 +1100 -+++ empathy-2.32.2/configure.ac 2010-11-24 17:22:04.735693001 +1100 -@@ -156,6 +156,7 @@ +--- empathy-2.31.91.orig/configure.ac 2010-08-31 01:43:51.000000000 +1000 ++++ empathy-2.31.91/configure.ac 2010-08-31 15:12:03.160664001 +1000 +@@ -164,6 +164,7 @@ telepathy-glib >= $TELEPATHY_GLIB_REQUIRED telepathy-logger-0.1 >= $TELEPATHY_LOGGER x11 diff -Nru empathy-2.32.2/debian/patches/11_empathy_accounts_category.patch empathy-2.32.1/debian/patches/11_empathy_accounts_category.patch --- empathy-2.32.2/debian/patches/11_empathy_accounts_category.patch 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/11_empathy_accounts_category.patch 2011-01-29 01:51:16.000000000 +0000 @@ -1,11 +1,11 @@ Description: Put empathy-accounts in correct category Bug: https://bugzilla.gnome.org/show_bug.cgi?id=611913 -Index: empathy-2.32.2/data/empathy-accounts.desktop +Index: empathy-2.31.6/data/empathy-accounts.desktop =================================================================== ---- empathy-2.32.2.orig/data/empathy-accounts.desktop 2010-11-24 17:22:17.395693001 +1100 -+++ empathy-2.32.2/data/empathy-accounts.desktop 2010-11-24 17:22:20.075693001 +1100 -@@ -99,7 +99,7 @@ +--- empathy-2.31.6.orig/data/empathy-accounts.desktop 2010-08-03 02:04:43.000000000 +1000 ++++ empathy-2.31.6/data/empathy-accounts.desktop 2010-08-05 17:31:25.863098584 +1000 +@@ -95,7 +95,7 @@ StartupNotify=true Terminal=false Type=Application @@ -14,10 +14,10 @@ X-GNOME-Settings-Panel=empathy-accounts X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy -Index: empathy-2.32.2/data/empathy-accounts.desktop.in +Index: empathy-2.31.6/data/empathy-accounts.desktop.in =================================================================== ---- empathy-2.32.2.orig/data/empathy-accounts.desktop.in 2010-11-24 17:22:17.405693001 +1100 -+++ empathy-2.32.2/data/empathy-accounts.desktop.in 2010-11-24 17:22:20.075693001 +1100 +--- empathy-2.31.6.orig/data/empathy-accounts.desktop.in 2010-08-03 02:04:36.000000000 +1000 ++++ empathy-2.31.6/data/empathy-accounts.desktop.in 2010-08-05 17:31:25.863098584 +1000 @@ -7,7 +7,7 @@ StartupNotify=true Terminal=false @@ -27,10 +27,10 @@ X-GNOME-Settings-Panel=empathy-accounts X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy -Index: empathy-2.32.2/data/empathy-accounts.desktop.in.in +Index: empathy-2.31.6/data/empathy-accounts.desktop.in.in =================================================================== ---- empathy-2.32.2.orig/data/empathy-accounts.desktop.in.in 2010-11-24 17:22:17.415693001 +1100 -+++ empathy-2.32.2/data/empathy-accounts.desktop.in.in 2010-11-24 17:22:20.075693001 +1100 +--- empathy-2.31.6.orig/data/empathy-accounts.desktop.in.in 2010-08-02 17:11:02.000000000 +1000 ++++ empathy-2.31.6/data/empathy-accounts.desktop.in.in 2010-08-05 17:31:27.203107117 +1000 @@ -7,7 +7,7 @@ StartupNotify=true Terminal=false diff -Nru empathy-2.32.2/debian/patches/20_libindicate.patch empathy-2.32.1/debian/patches/20_libindicate.patch --- empathy-2.32.2/debian/patches/20_libindicate.patch 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/20_libindicate.patch 2011-01-29 01:51:16.000000000 +0000 @@ -2,20 +2,20 @@ Bug: https://bugs.launchpad.net/bugs/340180 === modified file 'configure.ac' -Index: empathy-2.32.2/configure.ac +Index: empathy-2.32.1/configure.ac =================================================================== ---- empathy-2.32.2.orig/configure.ac 2010-11-24 17:24:40.705693001 +1100 -+++ empathy-2.32.2/configure.ac 2010-11-24 17:24:42.485693001 +1100 +--- empathy-2.32.1.orig/configure.ac 2010-11-16 21:30:31.964391999 -0500 ++++ empathy-2.32.1/configure.ac 2010-11-16 21:30:40.874392000 -0500 @@ -55,6 +55,8 @@ NETWORK_MANAGER_REQUIRED=0.7.0 WEBKIT_REQUIRED=1.1.15 GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4 -+INDICATE_REQUIRED=0.4.91 -+INDICATE_GTK_REQUIRED=0.4.91 ++INDICATE_REQUIRED=0.3.1 ++INDICATE_GTK_REQUIRED=0.3.1 AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -@@ -443,6 +445,34 @@ +@@ -414,6 +416,34 @@ AC_SUBST(MEEGO_LIBS) # ----------------------------------------------------------- @@ -30,7 +30,7 @@ + PKG_CHECK_MODULES(INDICATE, + [ + indicate >= $INDICATE_REQUIRED, -+ indicate >= $INDICATE_GTK_REQUIRED ++ indicate-gtk >= $INDICATE_GTK_REQUIRED + ], have_libindicate="yes", have_libindicate="no") + + if test "x$have_libindicate" = "xyes"; then @@ -50,18 +50,18 @@ # nautilus-sendto # ----------------------------------------------------------- AC_ARG_ENABLE(nautilus-sendto, -@@ -544,6 +574,7 @@ - CA Cert Path................: ${GTLS_SYSTEM_CA_FILE} +@@ -514,6 +544,7 @@ + Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} Features: + Message indicator support (libindicate): ${have_libindicate} Spell checking (enchant)....: ${have_enchant} Display maps (libchamplain).: ${have_libchamplain} Location awareness (Geoclue): ${have_geoclue} -Index: empathy-2.32.2/libempathy-gtk/empathy-ui-utils.c +Index: empathy-2.32.1/libempathy-gtk/empathy-ui-utils.c =================================================================== ---- empathy-2.32.2.orig/libempathy-gtk/empathy-ui-utils.c 2010-11-24 17:24:40.665693001 +1100 -+++ empathy-2.32.2/libempathy-gtk/empathy-ui-utils.c 2010-11-24 17:24:42.495693001 +1100 +--- empathy-2.32.1.orig/libempathy-gtk/empathy-ui-utils.c 2010-11-15 08:20:19.000000000 -0500 ++++ empathy-2.32.1/libempathy-gtk/empathy-ui-utils.c 2010-11-16 21:30:40.874392000 -0500 @@ -1558,25 +1558,36 @@ Display *dpy; GdkWindow *gdk_window; @@ -114,10 +114,10 @@ } /* Takes care of moving the window to the current workspace. */ -Index: empathy-2.32.2/po/POTFILES.in +Index: empathy-2.32.1/po/POTFILES.in =================================================================== ---- empathy-2.32.2.orig/po/POTFILES.in 2010-11-24 17:24:40.675693001 +1100 -+++ empathy-2.32.2/po/POTFILES.in 2010-11-24 17:24:42.495693001 +1100 +--- empathy-2.32.1.orig/po/POTFILES.in 2010-11-15 08:20:19.000000000 -0500 ++++ empathy-2.32.1/po/POTFILES.in 2010-11-16 21:30:40.874392000 -0500 @@ -89,6 +89,8 @@ [type: gettext/glade]src/empathy-ft-manager.ui src/empathy-import-dialog.c @@ -127,10 +127,10 @@ [type: gettext/glade]src/empathy-import-dialog.ui src/empathy-import-widget.c src/empathy-main-window.c -Index: empathy-2.32.2/src/Makefile.am +Index: empathy-2.32.1/src/Makefile.am =================================================================== ---- empathy-2.32.2.orig/src/Makefile.am 2010-11-24 17:24:40.725693001 +1100 -+++ empathy-2.32.2/src/Makefile.am 2010-11-24 17:24:42.495693001 +1100 +--- empathy-2.32.1.orig/src/Makefile.am 2010-11-15 08:20:20.000000000 -0500 ++++ empathy-2.32.1/src/Makefile.am 2010-11-16 21:30:40.874392000 -0500 @@ -7,6 +7,7 @@ $(ERROR_CFLAGS) \ -I$(top_srcdir) \ @@ -182,10 +182,10 @@ if HAVE_LIBCHAMPLAIN empathy_handwritten_source += \ empathy-map-view.c \ -Index: empathy-2.32.2/src/empathy-chat-window.c +Index: empathy-2.32.1/src/empathy-chat-window.c =================================================================== ---- empathy-2.32.2.orig/src/empathy-chat-window.c 2010-11-24 17:24:40.765693001 +1100 -+++ empathy-2.32.2/src/empathy-chat-window.c 2010-11-24 17:24:42.495693001 +1100 +--- empathy-2.32.1.orig/src/empathy-chat-window.c 2010-11-16 21:30:31.964391999 -0500 ++++ empathy-2.32.1/src/empathy-chat-window.c 2010-11-16 21:30:40.874392000 -0500 @@ -63,6 +63,11 @@ #include "empathy-about-dialog.h" #include "empathy-invite-participant-dialog.h" @@ -329,10 +329,10 @@ priv->notebook = gtk_notebook_new (); gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow"); -Index: empathy-2.32.2/src/empathy-indicator-manager.c +Index: empathy-2.32.1/src/empathy-indicator-manager.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ empathy-2.32.2/src/empathy-indicator-manager.c 2010-11-24 17:24:42.495693001 +1100 ++++ empathy-2.32.1/src/empathy-indicator-manager.c 2010-11-16 21:30:40.874392000 -0500 @@ -0,0 +1,467 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* @@ -801,10 +801,10 @@ + G_CALLBACK (indicate_login_cb), manager); + empathy_indicator_show (e_indicator); +} -Index: empathy-2.32.2/src/empathy-indicator-manager.h +Index: empathy-2.32.1/src/empathy-indicator-manager.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ empathy-2.32.2/src/empathy-indicator-manager.h 2010-11-24 17:24:42.495693001 +1100 ++++ empathy-2.32.1/src/empathy-indicator-manager.h 2010-11-16 21:30:40.874392000 -0500 @@ -0,0 +1,77 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* @@ -883,10 +883,10 @@ +G_END_DECLS + +#endif /* __EMPATHY_INDICATOR_MANAGER_H__ */ -Index: empathy-2.32.2/src/empathy-indicator.c +Index: empathy-2.32.1/src/empathy-indicator.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ empathy-2.32.2/src/empathy-indicator.c 2010-11-24 17:24:42.495693001 +1100 ++++ empathy-2.32.1/src/empathy-indicator.c 2010-11-16 21:30:40.874392000 -0500 @@ -0,0 +1,325 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* @@ -1213,10 +1213,10 @@ + g_object_get (e_indicator, "contact", &contact, NULL); + return contact; +} -Index: empathy-2.32.2/src/empathy-indicator.h +Index: empathy-2.32.1/src/empathy-indicator.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ empathy-2.32.2/src/empathy-indicator.h 2010-11-24 17:24:42.495693001 +1100 ++++ empathy-2.32.1/src/empathy-indicator.h 2010-11-16 21:30:40.874392000 -0500 @@ -0,0 +1,65 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* @@ -1283,10 +1283,10 @@ + + +#endif /* __EMPATHY-INDICATOR_H__ */ -Index: empathy-2.32.2/src/empathy-main-window.c +Index: empathy-2.32.1/src/empathy-main-window.c =================================================================== ---- empathy-2.32.2.orig/src/empathy-main-window.c 2010-11-24 17:24:40.795693001 +1100 -+++ empathy-2.32.2/src/empathy-main-window.c 2010-11-24 17:24:42.495693001 +1100 +--- empathy-2.32.1.orig/src/empathy-main-window.c 2010-11-16 21:30:31.964391999 -0500 ++++ empathy-2.32.1/src/empathy-main-window.c 2010-11-16 21:30:40.874392000 -0500 @@ -79,6 +79,10 @@ #include "empathy-ft-manager.h" #include "empathy-migrate-butterfly-logs.h" @@ -1352,10 +1352,10 @@ /* Show offline ? */ show_offline = g_settings_get_boolean (priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_OFFLINE); -Index: empathy-2.32.2/src/empathy-preferences.c +Index: empathy-2.32.1/src/empathy-preferences.c =================================================================== ---- empathy-2.32.2.orig/src/empathy-preferences.c 2010-11-24 17:24:40.785693001 +1100 -+++ empathy-2.32.2/src/empathy-preferences.c 2010-11-24 17:24:42.495693001 +1100 +--- empathy-2.32.1.orig/src/empathy-preferences.c 2010-11-15 08:20:20.000000000 -0500 ++++ empathy-2.32.1/src/empathy-preferences.c 2010-11-16 21:30:40.874392000 -0500 @@ -56,6 +56,7 @@ GtkWidget *checkbutton_show_smileys; @@ -1389,10 +1389,10 @@ "combobox_chat_theme", &priv->combobox_chat_theme, "checkbutton_separate_chat_windows", &priv->checkbutton_separate_chat_windows, "checkbutton_events_notif_area", &priv->checkbutton_events_notif_area, -Index: empathy-2.32.2/src/empathy-preferences.ui +Index: empathy-2.32.1/src/empathy-preferences.ui =================================================================== ---- empathy-2.32.2.orig/src/empathy-preferences.ui 2010-11-24 17:24:40.745693001 +1100 -+++ empathy-2.32.2/src/empathy-preferences.ui 2010-11-24 17:24:42.495693001 +1100 +--- empathy-2.32.1.orig/src/empathy-preferences.ui 2010-10-04 05:19:28.000000000 -0400 ++++ empathy-2.32.1/src/empathy-preferences.ui 2010-11-16 21:30:40.874392000 -0500 @@ -266,6 +266,20 @@ 1 @@ -1414,10 +1414,10 @@ 1 -Index: empathy-2.32.2/src/empathy-status-icon.c +Index: empathy-2.32.1/src/empathy-status-icon.c =================================================================== ---- empathy-2.32.2.orig/src/empathy-status-icon.c 2010-11-24 17:24:40.775693001 +1100 -+++ empathy-2.32.2/src/empathy-status-icon.c 2010-11-24 17:24:42.505693001 +1100 +--- empathy-2.32.1.orig/src/empathy-status-icon.c 2010-11-15 08:20:20.000000000 -0500 ++++ empathy-2.32.1/src/empathy-status-icon.c 2010-11-16 21:30:40.874392000 -0500 @@ -29,6 +29,7 @@ #include #include @@ -1667,10 +1667,10 @@ status_icon_set_visibility (icon, !should_hide, FALSE); return icon; -Index: empathy-2.32.2/libempathy/empathy-gsettings.h +Index: empathy-2.32.1/libempathy/empathy-gsettings.h =================================================================== ---- empathy-2.32.2.orig/libempathy/empathy-gsettings.h 2010-11-24 17:24:40.715693001 +1100 -+++ empathy-2.32.2/libempathy/empathy-gsettings.h 2010-11-24 17:24:42.505693001 +1100 +--- empathy-2.32.1.orig/libempathy/empathy-gsettings.h 2010-11-15 08:20:19.000000000 -0500 ++++ empathy-2.32.1/libempathy/empathy-gsettings.h 2010-11-16 21:30:40.874392000 -0500 @@ -71,6 +71,7 @@ #define EMPATHY_PREFS_UI_SHOW_AVATARS "show-avatars" #define EMPATHY_PREFS_UI_SHOW_PROTOCOLS "show-protocols" @@ -1679,10 +1679,10 @@ #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS "chat-window-paned-pos" #define EMPATHY_PREFS_UI_SHOW_OFFLINE "show-offline" -Index: empathy-2.32.2/data/org.gnome.Empathy.gschema.xml.in +Index: empathy-2.32.1/data/org.gnome.Empathy.gschema.xml.in =================================================================== ---- empathy-2.32.2.orig/data/org.gnome.Empathy.gschema.xml.in 2010-11-24 17:24:40.695693001 +1100 -+++ empathy-2.32.2/data/org.gnome.Empathy.gschema.xml.in 2010-11-24 17:24:42.505693001 +1100 +--- empathy-2.32.1.orig/data/org.gnome.Empathy.gschema.xml.in 2010-11-16 21:30:36.214392000 -0500 ++++ empathy-2.32.1/data/org.gnome.Empathy.gschema.xml.in 2010-11-16 21:30:40.874392000 -0500 @@ -86,6 +86,11 @@ <_summary>The position for the chat window side pane <_description>The stored position (in pixels) of the chat window side pane. diff -Nru empathy-2.32.2/debian/patches/debian-changes-2.32.1-0ubuntu1.2~maverick1 empathy-2.32.1/debian/patches/debian-changes-2.32.1-0ubuntu1.2~maverick1 --- empathy-2.32.2/debian/patches/debian-changes-2.32.1-0ubuntu1.2~maverick1 1970-01-01 00:00:00.000000000 +0000 +++ empathy-2.32.1/debian/patches/debian-changes-2.32.1-0ubuntu1.2~maverick1 2011-01-29 02:03:58.000000000 +0000 @@ -0,0 +1,136 @@ +Description: Upstream changes introduced in version 2.32.1-0ubuntu1.2~maverick1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + empathy (2.32.1-0ubuntu1.2~maverick1) maverick; urgency=low + . + * debian/patches/23_idomessagedialog_for_voip.patch + - Raise a IdoMessageDialog for incoming voip calls + * debian/control + - Added a new build depends on libido-0.1-dev, needed for IdoMessageDialog + . + The person named in the Author field signed this changelog entry. +Author: Ken VanDine + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- empathy-2.32.1.orig/configure.ac ++++ empathy-2.32.1/configure.ac +@@ -43,7 +43,6 @@ TELEPATHY_FARSIGHT_REQUIRED=0.0.14 + TELEPATHY_GLIB_REQUIRED=0.11.15 + TELEPATHY_LOGGER=0.1.5 + UNIQUE_REQUIRED=1.1.2 +-IDO_REQUIRED=0.1.14 + + # Optionnal deps + CLUTTER_GTK_REQUIRED=0.10 +@@ -158,7 +157,6 @@ PKG_CHECK_MODULES(EMPATHY, + telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + telepathy-logger-0.1 >= $TELEPATHY_LOGGER +- libido-0.1 >= $IDO_REQUIRED + x11 + launchpad-integration + ]) +--- empathy-2.32.1.orig/src/empathy-event-manager.c ++++ empathy-2.32.1/src/empathy-event-manager.c +@@ -46,8 +46,6 @@ + #include + #include + +-#include +- + #include "empathy-event-manager.h" + #include "empathy-main-window.h" + +@@ -454,7 +452,7 @@ event_channel_process_voip_func (EventPr + GtkWidget *image; + EmpathyTpCall *call; + gboolean video; +- gint width, height; ++ gchar *title; + + if (event->approval->dialog != NULL) + { +@@ -466,17 +464,21 @@ event_channel_process_voip_func (EventPr + + video = empathy_tp_call_has_initial_video (call); + +- dialog = ido_message_dialog_new (NULL, +- GTK_DIALOG_MODAL, +- GTK_MESSAGE_QUESTION, +- GTK_BUTTONS_NONE, +- video ? _("Incoming video call"): _("Incoming call")); +- gtk_message_dialog_format_secondary_markup (GTK_WINDOW (dialog), video ? +- _("%s is video calling you. Do you want to answer?"): +- _("%s is calling you. Do you want to answer?"), +- empathy_contact_get_alias (event->approval->contact)); ++ dialog = gtk_message_dialog_new (NULL, 0, ++ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, ++ video ? _("Incoming video call"): _("Incoming call")); ++ ++ gtk_message_dialog_format_secondary_text ( ++ GTK_MESSAGE_DIALOG (dialog), video ? ++ _("%s is video calling you. Do you want to answer?"): ++ _("%s is calling you. Do you want to answer?"), ++ empathy_contact_get_alias (event->approval->contact)); ++ ++ title = g_strdup_printf (_("Incoming call from %s"), ++ empathy_contact_get_alias (event->approval->contact)); + +- gtk_window_set_decorated (GTK_WINDOW (dialog), FALSE); ++ gtk_window_set_title (GTK_WINDOW (dialog), title); ++ g_free (title); + + /* Set image of the dialog */ + if (video) +@@ -514,11 +516,6 @@ event_channel_process_voip_func (EventPr + + gtk_widget_show (dialog); + +- gtk_window_get_size (GTK_WINDOW (dialog), &width, &height); +- +- gtk_window_set_gravity (GTK_WINDOW (dialog), GDK_GRAVITY_NORTH_WEST); +- gtk_window_move (GTK_WINDOW (dialog), gdk_screen_width() - width + 2, 24); +- + event->approval->dialog = dialog; + } + +--- empathy-2.32.1.orig/src/empathy-status-icon.c ++++ empathy-2.32.1/src/empathy-status-icon.c +@@ -192,10 +192,6 @@ status_icon_update_notification (Empathy + } + + if (priv->event) { +- if (priv->event->type == EMPATHY_EVENT_TYPE_VOIP) { +- empathy_event_activate (priv->event); +- return; +- } + gchar *message_esc = NULL; + gboolean has_x_canonical_append; + NotifyNotification *notification = priv->notification; +--- empathy-2.32.1.orig/src/empathy-indicator-manager.c ++++ empathy-2.32.1/src/empathy-indicator-manager.c +@@ -144,10 +144,6 @@ indicator_manager_event_added_cb (Empath + EmpathyEvent *event, + EmpathyIndicatorManager *manager) + { +- if (event->type == EMPATHY_EVENT_TYPE_VOIP) { +- return; +- } +- + EmpathyIndicator *indicator = NULL; + EmpathyIndicatorManagerPriv *priv; + IndicatorEvent *indicator_event; diff -Nru empathy-2.32.2/debian/patches/enable_pidgin_imported_contacts.patch empathy-2.32.1/debian/patches/enable_pidgin_imported_contacts.patch --- empathy-2.32.2/debian/patches/enable_pidgin_imported_contacts.patch 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/enable_pidgin_imported_contacts.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,158 +0,0 @@ -From: Vitaly Minko -Subject: Enable imported Pidgin accounts if needed. -Origin: http://git.gnome.org/browse/empathy/commit/?id=888df7fc53595e18c5de077860881bd10f327cc5 -Bug: https://bugs.gnome.org/594145 -Bug-Ubuntu: https://launchpad.net/bugs/622215 - ---- -diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c -index ab69d41..4de9bce 100644 ---- a/src/empathy-import-pidgin.c -+++ b/src/empathy-import-pidgin.c -@@ -93,6 +93,8 @@ static PidginCmMapItem pidgin_cm_map[] = - #define PIDGIN_ACCOUNT_TAG_PROTOCOL "protocol" - #define PIDGIN_ACCOUNT_TAG_PASSWORD "password" - #define PIDGIN_ACCOUNT_TAG_SETTINGS "settings" -+#define PIDGIN_SETTING_PROP_UI "ui" -+#define PIDGIN_SETTING_PROP_NAME "name" - #define PIDGIN_SETTING_PROP_TYPE "type" - #define PIDGIN_PROTOCOL_BONJOUR "bonjour" - #define PIDGIN_PROTOCOL_NOVELL "novell" -@@ -110,7 +112,7 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data, - - /* We can't do anything if the setting don't have a name */ - tag_name = (gchar *) xmlGetProp (setting, -- (xmlChar *) PIDGIN_ACCOUNT_TAG_NAME); -+ (xmlChar *) PIDGIN_SETTING_PROP_NAME); - if (!tag_name) - return; - -@@ -183,10 +185,54 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data, - g_free (content); - } - -+static void -+import_dialog_pidgin_handle_settings (EmpathyImportAccountData *data, -+ xmlNodePtr settings) -+{ -+ xmlNodePtr setting; -+ gchar *tag_ui, *name, *type, *content; -+ -+ tag_ui = (gchar *) xmlGetProp (settings, (xmlChar *) PIDGIN_SETTING_PROP_UI); -+ -+ /* UI settings - fetch the Enabled parameter. -+ * The expected value of the ui property is 'gtk-gaim', which looks obsolete, -+ * but still valid for 2.7.3. -+ */ -+ if (tag_ui && !tp_strdiff (tag_ui, "gtk-gaim")) -+ { -+ for (setting = settings->children; setting; setting = setting->next) -+ { -+ name = (gchar *) xmlGetProp (setting, -+ (xmlChar *) PIDGIN_SETTING_PROP_NAME); -+ type = (gchar *) xmlGetProp (setting, -+ (xmlChar *) PIDGIN_SETTING_PROP_TYPE); -+ /* The Enabled parameter is supposed to be boolean. -+ * Pidgin name of the setting is 'auto-login'. -+ */ -+ if (!tp_strdiff (name, "auto-login") && !tp_strdiff (type, "bool")) -+ { -+ content = (gchar *) xmlNodeGetContent (setting); -+ data->enabled = (0 != (gint) g_ascii_strtod (content, NULL)); -+ g_free (content); -+ } -+ g_free (type); -+ g_free (name); -+ } -+ } -+ /* General settings. */ -+ else -+ { -+ for (setting = settings->children; setting; setting = setting->next) -+ import_dialog_pidgin_parse_setting (data, setting); -+ } -+ -+ g_free (tag_ui); -+} -+ - GList * - empathy_import_pidgin_load (void) - { -- xmlNodePtr rootnode, node, child, setting; -+ xmlNodePtr rootnode, node, child; - xmlParserCtxtPtr ctxt; - xmlDocPtr doc; - gchar *filename; -@@ -310,8 +356,7 @@ empathy_import_pidgin_load (void) - /* Other settings */ - else if (!tp_strdiff ((gchar *) child->name, - PIDGIN_ACCOUNT_TAG_SETTINGS)) -- for (setting = child->children; setting; setting = setting->next) -- import_dialog_pidgin_parse_setting (data, setting); -+ import_dialog_pidgin_handle_settings (data, child); - } - - /* If we have the needed settings, add the account data to the list, -diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c -index 520f056..7e69d62 100644 ---- a/src/empathy-import-utils.c -+++ b/src/empathy-import-utils.c -@@ -40,6 +40,7 @@ empathy_import_account_data_new (const gchar *source) - data->source = g_strdup (source); - data->protocol = NULL; - data->connection_manager = NULL; -+ data->enabled = FALSE; - - return data; - } -diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h -index 20af25a..09b85e0 100644 ---- a/src/empathy-import-utils.h -+++ b/src/empathy-import-utils.h -@@ -37,6 +37,8 @@ typedef struct - gchar *connection_manager; - /* The name of the account import source */ - gchar *source; -+ /* Indicates whether the account is enabled by default */ -+ gboolean enabled; - } EmpathyImportAccountData; - - typedef enum { -diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c -index 0989818..fc1e2f5 100644 ---- a/src/empathy-import-widget.c -+++ b/src/empathy-import-widget.c -@@ -167,6 +167,7 @@ import_widget_create_account_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) - { -+ TpAccountManager *account_manager; - TpAccount *account; - GError *error = NULL; - EmpathyImportWidget *self = user_data; -@@ -184,6 +185,13 @@ import_widget_create_account_cb (GObject *source, - - DEBUG ("account created\n"); - -+ if (tp_account_is_enabled (account)) -+ { -+ account_manager = tp_account_manager_dup (); -+ empathy_connect_new_account (account, account_manager); -+ g_object_unref (account_manager); -+ } -+ - g_object_unref (self); - } - -@@ -208,7 +216,8 @@ import_widget_add_account (EmpathyImportWidget *self, - - DEBUG ("display name: %s\n", display_name); - -- properties = g_hash_table_new (NULL, NULL); -+ properties = tp_asv_new (NULL, NULL); -+ tp_asv_set_boolean (properties, TP_IFACE_ACCOUNT ".Enabled", data->enabled); - - tp_account_manager_create_account_async (account_manager, - (const gchar*) data->connection_manager, data->protocol, display_name, --- -cgit v0.8.3.1 diff -Nru empathy-2.32.2/debian/patches/reword_subscription_dailog_to_be_less_technical.patch empathy-2.32.1/debian/patches/reword_subscription_dailog_to_be_less_technical.patch --- empathy-2.32.2/debian/patches/reword_subscription_dailog_to_be_less_technical.patch 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/reword_subscription_dailog_to_be_less_technical.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Alex Launi -Subject: Reword subscription request dialog to be less technical. -Origin: http://git.gnome.org/browse/empathy/commit/?id=20bf62e79da14568fcd8c65fd561d601acf4b882 -Bug: https://bugs.gnome.org/633870 -Bug-Ubuntu: https://launchpad.net/bugs/670197 - ---- -diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c -index 0216eea..439bb3a 100644 ---- a/src/empathy-event-manager.c -+++ b/src/empathy-event-manager.c -@@ -1002,8 +1002,8 @@ event_manager_pendings_changed_cb (EmpathyContactList *list, - return; - } - -- header = g_strdup_printf (_("Subscription requested by %s"), -- empathy_contact_get_alias (contact)); -+ header = g_strdup_printf (_("%s would like permission to see when you are available"), -+ empathy_contact_get_alias (contact)); - - if (!EMP_STR_EMPTY (message)) - event_msg = g_strdup_printf (_("\nMessage: %s"), message); --- -cgit v0.8.3.1 diff -Nru empathy-2.32.2/debian/patches/series empathy-2.32.1/debian/patches/series --- empathy-2.32.2/debian/patches/series 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/patches/series 2011-01-29 02:03:58.000000000 +0000 @@ -1,8 +1,3 @@ -enable_pidgin_imported_contacts.patch -reword_subscription_dailog_to_be_less_technical.patch -00git_folks_aliasable_groupable.patch -00git_individual_methods.patch -00git_folks_api.patch 01_lpi.patch 02_notifications_focus.patch 10_use_notify_osd_icons.patch @@ -17,3 +12,4 @@ 36_chat_window_default_size.patch 37_facebook_default.patch 38_lp_569289.patch +debian-changes-2.32.1-0ubuntu1.2~maverick1 diff -Nru empathy-2.32.2/debian/rules empathy-2.32.1/debian/rules --- empathy-2.32.2/debian/rules 2011-01-29 00:28:50.000000000 +0000 +++ empathy-2.32.1/debian/rules 2011-01-29 01:51:16.000000000 +0000 @@ -17,7 +17,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \ --enable-libindicate \ --disable-tests \ - --disable-schemas-compile \ + --disable-schemas-compile \ --enable-webkit \ --enable-map=no \ --enable-favourite-contacts=no \ diff -Nru empathy-2.32.2/libempathy/empathy-tls-verifier.c empathy-2.32.1/libempathy/empathy-tls-verifier.c --- empathy-2.32.2/libempathy/empathy-tls-verifier.c 2010-11-18 14:46:43.000000000 +0000 +++ empathy-2.32.1/libempathy/empathy-tls-verifier.c 2010-11-15 13:05:32.000000000 +0000 @@ -44,7 +44,7 @@ }; static const gchar* system_ca_paths[] = { - GTLS_SYSTEM_CA_FILE, + "/etc/ssl/certs/ca-certificates.crt", NULL, }; diff -Nru empathy-2.32.2/libempathy-gtk/empathy-individual-store.c empathy-2.32.1/libempathy-gtk/empathy-individual-store.c --- empathy-2.32.2/libempathy-gtk/empathy-individual-store.c 2010-11-18 14:35:44.000000000 +0000 +++ empathy-2.32.1/libempathy-gtk/empathy-individual-store.c 2010-11-15 13:20:19.000000000 +0000 @@ -327,13 +327,6 @@ } static void -free_iters (GList *iters) -{ - g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL); - g_list_free (iters); -} - -static void individual_store_remove_individual (EmpathyIndividualStore *self, FolksIndividual *individual) { @@ -369,7 +362,8 @@ } } - free_iters (iters); + g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL); + g_list_free (iters); } static void @@ -496,7 +490,9 @@ } } - free_iters (iters); + g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL); + g_list_free (iters); + } static void individual_store_contact_active_free (ShowActiveData *data); @@ -620,8 +616,6 @@ EMPATHY_INDIVIDUAL_STORE_COL_PIXBUF_AVATAR, pixbuf, -1); } - - free_iters (iters); } /* Free things */ @@ -792,7 +786,8 @@ * timeout removes the user from the contact list, really we * should remove the first timeout. */ - free_iters (iters); + g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL); + g_list_free (iters); } static void @@ -1475,8 +1470,6 @@ tp_clear_object (&individual_a); tp_clear_object (&individual_b); - g_free (name_a); - g_free (name_b); return ret_val; } diff -Nru empathy-2.32.2/NEWS empathy-2.32.1/NEWS --- empathy-2.32.2/NEWS 2010-11-18 15:18:14.000000000 +0000 +++ empathy-2.32.1/NEWS 2010-11-15 13:33:45.000000000 +0000 @@ -1,19 +1,3 @@ -NEW in 2.32.2 (18/11/2010) -============= - -This release adds a '--with-ca-file' option to configure. -The default is to use the normal location for either Red Hat -or Debian, or fail if neither exists. Use --with-ca-file to force a -particular location (e.g. if your build system doesn't guarantee to have -the CA certificate bundle installed), or use --without-ca-file if your system -doesn't have a standard CA certificate store. - -Two memory leaks have also been fixed which should drastically reduce empathy's -memory consumption on longer runs. - -Bugs fixed: - - Fixed #634197, [Patch] Make CA cert paths configurable (Brian Pepple) - NEW in 2.32.1 (15/11/2010) =============