Fix debug message.

2007-09-10  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy/empathy-contact-factory.c: Fix debug message.

	* libempathy/Makefile.am:
	* configure.ac: Remove useless code.

svn path=/trunk/; revision=295

diff --git a/ChangeLog b/ChangeLog
index 954aaeb13e801c971b84e677a2f3633434e01772..6bd9aebfa847c2772a1a318e9f12acb2e4342a5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-10  Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy/empathy-contact-factory.c: Fix debug message.
+
+       * libempathy/Makefile.am:
+       * configure.ac: Remove useless code.
+
 2007-09-08  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-contact-list-view.c:

diff --git a/configure.ac b/configure.ac
index e9e25d2bab0b9a7ecef1d83233b2b793b353a817..6c88627b9c19cdd82a3100defeaf54e507353ec8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,9 +57,6 @@ IDT_COMPILE_WARNINGS
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
 
-pluginlibdir=`$PKG_CONFIG mission-control --variable=pluginlibdir`
-AC_SUBST(pluginlibdir)
-
 dnl -----------------------------------------------------------
 dnl Language Support
 dnl -----------------------------------------------------------

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index c24a16f211d88188e51d2d9f124eefbc34854ddf..639d22ecbb81ca5808f0bc181fee8ae429c30366 100644 (file)
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -85,8 +85,6 @@ libempathy_include_HEADERS =                  \
        echo "#include \"empathy-marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
 
-%-marshal-main.c: %-marshal.c %-marshal.h
-
 empathy-chandler-glue.h: empathy-chandler.xml
        $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=empathy_chandler --mode=glib-server --output=$@ $<
 empathy-filter-glue.h: empathy-filter.xml

diff --git a/libempathy/empathy-contact-factory.c b/libempathy/empathy-contact-factory.c
index b4b3ba668e1617e5f35916f6095aaf2dcfe91c76..fe670e4e64735c9c2238f2da5ebd4be8dab59740 100644 (file)
--- a/libempathy/empathy-contact-factory.c
+++ b/libempathy/empathy-contact-factory.c
@@ -204,7 +204,7 @@ contact_factory_get_presence_cb (DBusGProxy *proxy,
        ContactFactoryAccountData *account_data = user_data;
 
        if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Error requesting aliases: %s",
+               empathy_debug (DEBUG_DOMAIN, "Error getting presence: %s",
                              error->message);
                goto OUT;
        }