Hello community, here is the log from the commit of package desktop-data-model for openSUSE:Factory checked in at Fri Feb 6 22:06:35 CET 2009. -------- --- GNOME/desktop-data-model/desktop-data-model.changes 2008-08-29 21:44:04.000000000 +0200 +++ desktop-data-model/desktop-data-model.changes 2009-01-25 11:04:32.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Jan 25 11:04:22 CET 2009 - vuntz@novell.com + +- Update BuildRequires to fix build. + +------------------------------------------------------------------- +Sat Dec 20 09:17:17 EST 2008 - mboman@suse.de + +- Update to version 1.2.5: + + No Changelog/NEWS files provided. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- desktop-data-model-1.2.4.tar.bz2 New: ---- desktop-data-model-1.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-data-model.spec ++++++ --- /var/tmp/diff_new_pack.wp9077/_old 2009-02-06 22:06:17.000000000 +0100 +++ /var/tmp/diff_new_pack.wp9077/_new 2009-02-06 22:06:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package desktop-data-model (Version 1.2.4) +# spec file for package desktop-data-model (Version 1.2.5) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,15 +20,17 @@ Name: desktop-data-model BuildRequires: dbus-1-glib-devel +BuildRequires: empathy-devel BuildRequires: gnome-desktop-devel +BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel BuildRequires: loudmouth-devel BuildRequires: pcre-devel BuildRequires: pkg-config BuildRequires: sqlite3-devel BuildRequires: update-desktop-files -Version: 1.2.4 -Release: 2 +Version: 1.2.5 +Release: 1 Source0: desktop-data-model-%{version}.tar.bz2 # PATCHLIST_START # PATCHLIST_END @@ -97,5 +99,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun Jan 25 2009 vuntz@novell.com +- Update BuildRequires to fix build. +* Sat Dec 20 2008 mboman@suse.de +- Update to version 1.2.5: + + No Changelog/NEWS files provided. * Fri Aug 29 2008 maw@suse.de - Initial packaged version, 1.2.4. ++++++ desktop-data-model-1.2.4.tar.bz2 -> desktop-data-model-1.2.5.tar.bz2 ++++++ ++++ 12857 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-data-model-1.2.4/config/config.h.in new/desktop-data-model-1.2.5/config/config.h.in --- old/desktop-data-model-1.2.4/config/config.h.in 2008-04-24 20:31:06.000000000 +0200 +++ new/desktop-data-model-1.2.5/config/config.h.in 2008-10-28 18:45:13.000000000 +0100 @@ -12,6 +12,9 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H +/* Define if you have the empathy library */ +#undef HAVE_EMPATHY + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-data-model-1.2.4/configure.ac new/desktop-data-model-1.2.5/configure.ac --- old/desktop-data-model-1.2.4/configure.ac 2008-04-24 20:29:52.000000000 +0200 +++ new/desktop-data-model-1.2.5/configure.ac 2008-10-28 18:44:28.000000000 +0100 @@ -6,7 +6,7 @@ AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(desktop-data-model, 1.2.4) +AM_INIT_AUTOMAKE(desktop-data-model, 1.2.5) AM_CONFIG_HEADER(config/config.h) @@ -345,6 +345,32 @@ AC_DEFINE(HIPPO_LOUDMOUTH_IS_10, 0, [Define if Loudmouth is version 1.0 or below]) fi +# Check for libempathy +AC_ARG_WITH(empathy, + AC_HELP_STRING([--without-empathy], + [Disable Empathy support]), + , + with_empathy=yes) + +AC_MSG_CHECKING([for empathy]) +if test x"$with_empathy" = xno ; then + found_empathy=no + AC_MSG_RESULT(disabled) +else + HIPPO_PKG_CHECK_EXISTS(libempathy, found_empathy=yes, found_empathy=no) + AC_MSG_RESULT([$found_empathy]) + extra_engine_packages="$extra_engine_packages libempathy" + + if test $found_empathy = yes ; then + EMPATHY_MODULES=empathy + AC_DEFINE(HAVE_EMPATHY, 1, [Define if you have the empathy library]) + else + if test x"$with_empathy" = xyes ; then + AC_MSG_ERROR([Empathy not found]) + fi + fi +fi + PKG_CHECK_MODULES(LIBDDM, gobject-2.0 >= $GLIB2_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) PKG_CHECK_MODULES(LIBHIPPO, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0) PKG_CHECK_MODULES(LIBENGINE, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED $PCRE_MODULES $SQLITE_MODULES) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-data-model-1.2.4/engine/hippo-connection.c new/desktop-data-model-1.2.5/engine/hippo-connection.c --- old/desktop-data-model-1.2.4/engine/hippo-connection.c 2008-04-03 02:27:21.000000000 +0200 +++ new/desktop-data-model-1.2.5/engine/hippo-connection.c 2008-06-16 16:41:18.000000000 +0200 @@ -2736,6 +2736,8 @@ tip = NULL; switch (state) { case HIPPO_STATE_SIGNED_OUT: + tip = _("%s (signed out)"); + break; case HIPPO_STATE_RETRYING: if (connection->last_auth_failed) { /* This is because it's possible to transition from AUTH_WAIT or SIGN_IN_WAIT to diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-data-model-1.2.4/engine/hippo-data-model-backend.c new/desktop-data-model-1.2.5/engine/hippo-data-model-backend.c --- old/desktop-data-model-1.2.4/engine/hippo-data-model-backend.c 2008-03-25 15:42:04.000000000 +0100 +++ new/desktop-data-model-1.2.5/engine/hippo-data-model-backend.c 2008-06-16 16:41:18.000000000 +0200 @@ -9,7 +9,6 @@ DDMDataModel *ddm_model; HippoDataCache *data_cache; HippoDiskCache *disk_cache; - DDMDataQuery *self_query; } HippoModel; static HippoModel* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-data-model-1.2.4/engine-dbus/hippo-dbus-empathy.c new/desktop-data-model-1.2.5/engine-dbus/hippo-dbus-empathy.c --- old/desktop-data-model-1.2.4/engine-dbus/hippo-dbus-empathy.c 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop-data-model-1.2.5/engine-dbus/hippo-dbus-empathy.c 2008-10-28 16:39:44.000000000 +0100 @@ -0,0 +1,130 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +#include <config.h> + +/* Only compile with Empathy support if it is enabled */ +#ifdef HAVE_LIBEMPATHY + +#include <string.h> +#include <libempathy/empathy-contact-manager.h> +#include <libempathy/empathy-contact-list.h> +#include "hippo-im.h" +#include "hippo-dbus-empathy.h" + +static char * +make_buddy_resource_id(EmpathyContact *contact) +{ + McAccount *account = empathy_contact_get_account(contact); + McProfile *profile = mc_account_get_profile(account); + + const char *protocol = mc_profile_get_protocol_name(profile); + const char *id = empathy_contact_get_id(contact); + + if (protocol == NULL || id == NULL) + return NULL; + + return g_strdup_printf("online-desktop:/o/empathy-buddy/%s.%s", protocol, id); +} + +static void +update_buddy(EmpathyContact *contact) +{ + EmpathyAvatar *avatar; + McAccount *account; + McProfile *profile; + const char *protocol; + + char *resource_id = make_buddy_resource_id(contact); + if (resource_id == NULL) + return; + + account = empathy_contact_get_account(contact); + profile = mc_account_get_profile(account); + protocol = mc_profile_get_protocol_name(profile); + + if (strcmp(protocol, "jabber") == 0) + protocol = "xmpp"; + + hippo_im_update_buddy(resource_id, + protocol, + empathy_contact_get_id(contact), + empathy_contact_get_name(contact), + empathy_contact_is_online(contact), + empathy_contact_get_status(contact), + empathy_contact_get_presence_message(contact), + NULL /* webdav_url */); + + avatar = empathy_contact_get_avatar(contact); + if (avatar != NULL) { + hippo_im_update_buddy_icon(empathy_contact_get_id(contact), avatar->format, + avatar->token, (gchar *)avatar->data, avatar->len); + } + + g_free(resource_id); + g_object_unref (profile); +} + +static void +contact_updated_cb (EmpathyContact *contact, + GParamSpec *param, + gpointer data) +{ + update_buddy(contact); +} + +static void +contact_list_members_changed_cb (EmpathyContactList *list_iface, + EmpathyContact *contact, + EmpathyContact *actor, + guint reason, + gchar *message, + gboolean is_member, + gpointer data) +{ + McAccount *account; + McProfile *profile; + McPresence presence; + + account = empathy_contact_get_account(contact); + profile = mc_account_get_profile(account); + presence = empathy_contact_get_presence(contact); + + if (is_member) { + update_buddy(contact); + + g_signal_connect(contact, "notify::presence", + G_CALLBACK (contact_updated_cb), NULL); + g_signal_connect(contact, "notify::presence-message", + G_CALLBACK (contact_updated_cb), NULL); + g_signal_connect(contact, "notify::name", + G_CALLBACK (contact_updated_cb), NULL); + g_signal_connect(contact, "notify::avatar", + G_CALLBACK (contact_updated_cb), NULL); + } else { + char *resource_id; + g_signal_handlers_disconnect_by_func(contact, + G_CALLBACK (contact_updated_cb), NULL); + + + resource_id = make_buddy_resource_id(contact); + if (resource_id != NULL) { + hippo_im_remove_buddy(resource_id); + g_free(resource_id); + } + } +} +#endif /* HAVE_LIBEMPATHY */ + +void +hippo_dbus_init_empathy(void) +{ +#ifdef HAVE_LIBEMPATHY + EmpathyContactManager *manager; + + manager = empathy_contact_manager_new (); + + g_signal_connect (manager, + "members-changed", + G_CALLBACK (contact_list_members_changed_cb), + NULL); +#endif +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-data-model-1.2.4/engine-dbus/hippo-dbus-empathy.h new/desktop-data-model-1.2.5/engine-dbus/hippo-dbus-empathy.h --- old/desktop-data-model-1.2.4/engine-dbus/hippo-dbus-empathy.h 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop-data-model-1.2.5/engine-dbus/hippo-dbus-empathy.h 2008-06-23 19:28:51.000000000 +0200 @@ -0,0 +1,13 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +#ifndef __HIPPO_DBUS_EMPATHY_H__ +#define __HIPPO_DBUS_EMPATHY_H__ + +#include <glib.h> + +G_BEGIN_DECLS + +void hippo_dbus_init_empathy(void); + +G_END_DECLS + +#endif /* __HIPPO_DBUS_PIDGIN_H__ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-data-model-1.2.4/engine-dbus/hippo-dbus-server.c new/desktop-data-model-1.2.5/engine-dbus/hippo-dbus-server.c --- old/desktop-data-model-1.2.4/engine-dbus/hippo-dbus-server.c 2008-03-25 15:42:03.000000000 +0100 +++ new/desktop-data-model-1.2.5/engine-dbus/hippo-dbus-server.c 2008-06-16 16:41:18.000000000 +0200 @@ -346,7 +346,8 @@ hippo_dbus_try_acquire_online_prefs_manager(connection, FALSE); hippo_dbus_init_local(connection); - hippo_dbus_init_pidgin(connection); + hippo_dbus_init_pidgin(connection); + hippo_dbus_init_empathy(); hippo_dbus_init_model(connection); /* Add Rhythmbox signal match */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-data-model-1.2.4/Makefile-engine-dbus.am new/desktop-data-model-1.2.5/Makefile-engine-dbus.am --- old/desktop-data-model-1.2.4/Makefile-engine-dbus.am 2008-03-25 15:42:04.000000000 +0100 +++ new/desktop-data-model-1.2.5/Makefile-engine-dbus.am 2008-06-16 16:41:18.000000000 +0200 @@ -20,6 +20,8 @@ engine-dbus/hippo-dbus-cookies.c \ engine-dbus/hippo-dbus-cookies.h \ engine-dbus/hippo-dbus-helper.c \ + engine-dbus/hippo-dbus-empathy.c \ + engine-dbus/hippo-dbus-empathy.h \ engine-dbus/hippo-dbus-helper.h \ engine-dbus/hippo-dbus-helper-rename.h \ engine-dbus/hippo-dbus-im-client.c \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org