Updated for release

svn path=/trunk/; revision=406

diff --git a/NEWS b/NEWS
index f296eca39f3b53d29a0d6c34309d242069387988..9c0ac559bebd884486f594b8f51b0511055e48d0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+NEW in 0.21.1:
+=============
+ - Cleanup licences and copyrights, Modules with 100% collabora code are now
+   relicenced to LGPL.
+ - Hide main window with ALT-F4.
+ - Set chat state to ACTIVE when receiving a message from a contact, avoid
+   staying in COMPOSING state forever for protocols like MSN that do not notify
+   when contact stoped writing.
+ - Don't use deprecated Gtk/GLib API. Mainly replace GtkTooltips by new
+   tooltip API from GTK 2.12.
+ - Use g_timeout_add_seconds when appropriated to avoid weaking the process too
+   much.
+ - Implement EmpathyAvatarChooser and EmpathyAvatarImage and make use of them in
+   contact information windows. That means we can now enlarge avatars when
+   clicking on it and we can set our own avatar if we edit our own contact.
+ - Implement edit personal information window, no vcard supported yet, but it's
+   not possible to set our own alias/avatar.
+ - Bump version to 0.21.1 for GNOME 2.21.1 release.
+
 NEW in 0.14:
 ===========
  - Megaphone applet now uses avatar cache.

diff --git a/configure.ac b/configure.ac
index 4e6f32ee6d79c22ad8f4c67ccf67fc0ff238af74..95c79ffba52dd5480e1a9c12c5e1b0233789fd70 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.15, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.21.1, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -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=4
-LIBEMPATHY_AGE=1
+LIBEMPATHY_CURRENT=5
+LIBEMPATHY_AGE=0
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=5
-LIBEMPATHY_GTK_AGE=1
+LIBEMPATHY_GTK_CURRENT=6
+LIBEMPATHY_GTK_AGE=0
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)