aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac3
-rw-r--r--libempathy/Makefile.am2
-rw-r--r--libempathy/empathy-contact-factory.c2
4 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 954aaeb13..6bd9aebfa 100644
--- 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 e9e25d2ba..6c88627b9 100644
--- 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 c24a16f21..639d22ecb 100644
--- 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 b4b3ba668..fe670e4e6 100644
--- 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;
}