aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2007-12-18 05:59:00 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-12-18 05:59:00 +0800
commitd853bea8e7e8a51aad15b479fcf39d7e95c4022a (patch)
tree4084daaa2be6ac655cb887445d391188dbc1abe3
parent50561b38dc05595c52a25529b1ff80ad876fabf6 (diff)
downloadgsoc2013-empathy-d853bea8e7e8a51aad15b479fcf39d7e95c4022a.tar
gsoc2013-empathy-d853bea8e7e8a51aad15b479fcf39d7e95c4022a.tar.gz
gsoc2013-empathy-d853bea8e7e8a51aad15b479fcf39d7e95c4022a.tar.bz2
gsoc2013-empathy-d853bea8e7e8a51aad15b479fcf39d7e95c4022a.tar.lz
gsoc2013-empathy-d853bea8e7e8a51aad15b479fcf39d7e95c4022a.tar.xz
gsoc2013-empathy-d853bea8e7e8a51aad15b479fcf39d7e95c4022a.tar.zst
gsoc2013-empathy-d853bea8e7e8a51aad15b479fcf39d7e95c4022a.zip
Prepare for release
svn path=/trunk/; revision=485
-rw-r--r--Makefile.am2
-rw-r--r--NEWS10
-rw-r--r--configure.ac8
3 files changed, 15 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 374608ff6..b8aa51d26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollke
# Build ChangeLog from SVN history (r470 was the first ChangeLog-less checkin).
# Only build this when in an svn checkout.
-ChangeLog:
+ChangeLog: ChangeLog.old
@if test -f $(top_srcdir)/.svn/entries; then \
svn log -v --xml -r HEAD:470 $(SVN_ROOT)/$(SVN_MODULE) | \
xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \
diff --git a/NEWS b/NEWS
index db393af80..c99cdd3eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+NEW in 0.21.4:
+=============
+ - Cache avatar pixbuf in EmpathyChatView to avoid having a new pixbuf in memory
+ for each message a contact sends
+ - Generate ChangeLog from svn commits. Copy generator from epiphany.
+ - Correctly store/restore presence when NM state changes.
+ - Split EmpathyContactFactory to have one EmpathyTpContactFactory per account.
+ - When NM is in sleeping (=disabled) state, do just like if it was connected.
+ Add a gconf key to disable NM support completely.
+
NEW in 0.21.3:
=============
- Request new Text Channel if the contact is online again and CM don't support
diff --git a/configure.ac b/configure.ac
index bd6df769d..a8fc1c4ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_HEADER_STDC
# (Interfaces removed: CURRENT++, AGE=0, REVISION=0)
# (Interfaces added: CURRENT++, AGE++, REVISION=0)
# (No interfaces changed: REVISION++)
-LIBEMPATHY_CURRENT=7
-LIBEMPATHY_AGE=0
+LIBEMPATHY_CURRENT=8
+LIBEMPATHY_AGE=1
LIBEMPATHY_REVISION=0
-LIBEMPATHY_GTK_CURRENT=7
-LIBEMPATHY_GTK_AGE=0
+LIBEMPATHY_GTK_CURRENT=8
+LIBEMPATHY_GTK_AGE=1
LIBEMPATHY_GTK_REVISION=0
AC_SUBST(LIBEMPATHY_CURRENT)