aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS8
-rw-r--r--configure.ac4
-rw-r--r--doc/libempathy-gtk/tmpl/empathy-preferences.sgml7
-rw-r--r--po/POTFILES.in1
5 files changed, 26 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b81fd11da..762fd1a95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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:
* libempathy-gtk/empathy-contact-widget.c:
* libempathy-gtk/empathy-accounts-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 e10fa0aaf..141e5b6e2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
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".
- Do not list profiles that don't have the corresponding CM installed when
creating a new account.
diff --git a/configure.ac b/configure.ac
index a89c5a247..9b4661fc6 100644
--- 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 0b7a7d27a..d97f5b57b 100644
--- 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 137bf8949..e2e3a6254 100644
--- 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