Updated.

2007-08-24 Xavier Claessens  <xclaesse@gmail.com>

	 * configure.ac:
	 * doc/libempathy-gtk/tmpl/empathy-preferences.sgml:
	 * NEWS:
	 * po/POTFILES.in: Updated.

svn path=/trunk/; revision=271

diff --git a/ChangeLog b/ChangeLog
index b81fd11daf55a38e3d046bf7c40fe5bde067632a..762fd1a956890f97a8dd2f5d294d4ddf005e8813 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-24 Xavier Claessens  <xclaesse@gmail.com>
+
+        * configure.ac:
+        * doc/libempathy-gtk/tmpl/empathy-preferences.sgml:
+        * NEWS:
+        * po/POTFILES.in: Updated.
+
 2007-08-24 Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-new-chatroom-dialog.c:
@@ -9,7 +16,7 @@
 
 2007-08-24 Xavier Claessens  <xclaesse@gmail.com>
 
-       * src/empathy.c: Chech if there is already a Salut account before
+       * src/empathy.c: Check if there is already a Salut account before
        creating a new one and add more debug messages.
 
 2007-08-24 Xavier Claessens  <xclaesse@gmail.com>

diff --git a/NEWS b/NEWS
index e10fa0aaf36885baa5f58608eb48b2bc24f41f43..141e5b6e27b9ca7531e15256d296e828a9e22eb0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+NEW in 0.11:
+===========
+ - Only update the topic of it has really be changed, avoid diplaying many
+   times "Topic set to:" message.
+ - Some Jabber chatroom sends messages received before we joined the room, avoid
+   displaying those messages if we already logged them last time we joined that
+   room. Previous workaround prevented Empathy to log offline messages.
+
 NEW in 0.11:
 ===========
  - Change main window's title to "Contact list".

diff --git a/configure.ac b/configure.ac
index a89c5a2475cd2d0d58687eeefd19f3d2491f08eb..9b4661fc6fdc9b260e9cfe814a69e4105821a7c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ LIBEMPATHY_CURRENT=2
 LIBEMPATHY_AGE=0
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=2
-LIBEMPATHY_GTK_AGE=1
+LIBEMPATHY_GTK_CURRENT=3
+LIBEMPATHY_GTK_AGE=2
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)

diff --git a/doc/libempathy-gtk/tmpl/empathy-preferences.sgml b/doc/libempathy-gtk/tmpl/empathy-preferences.sgml
index 0b7a7d27abb36058566e1c52a9833b68b6a307f3..d97f5b57b732cc9c077fae935406da47a1eeea04 100644 (file)
--- a/doc/libempathy-gtk/tmpl/empathy-preferences.sgml
+++ b/doc/libempathy-gtk/tmpl/empathy-preferences.sgml
@@ -143,6 +143,13 @@ empathy-preferences
 
 
 
+<!-- ##### MACRO EMPATHY_PREFS_SALUT_ACCOUNT_CREATED ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION empathy_preferences_show ##### -->
 <para>
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 137bf8949e655e7d5830625bca9b5e13bad18a8b..e2e3a6254ffcfb60777b33b0f302976a205805cf 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,6 +16,7 @@ libempathy-gtk/empathy-account-chooser.c
 libempathy-gtk/empathy-account-widget-generic.c
 libempathy-gtk/empathy-account-widget-jabber.glade
 libempathy-gtk/empathy-account-widget-msn.glade
+libempathy-gtk/empathy-account-widget-salut.glade
 libempathy-gtk/empathy-accounts-dialog.c
 libempathy-gtk/empathy-accounts-dialog.glade
 libempathy-gtk/empathy-chat.c