[Xfce4-commits] <xfce4-clipman-plugin:master> === Release 1.2.3 ===

[Mike Massonnet]

Updating branch refs/heads/master
         to b04de51467b888a2e49c769393cb9da5847e46c3 (commit)
       from 1cf448d3f02d369b90e51fb340e813f9c90f10a9 (commit)

commit b04de51467b888a2e49c769393cb9da5847e46c3
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Mon Apr 9 11:10:16 2012 +0200

    === Release 1.2.3 ===

 ChangeLog       |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS            |    9 +++++++++
 configure.ac.in |    2 +-
 doc             |    2 +-
 4 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2aa941a..135f3a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+2012-04-09	Mike Massonnet
+=== Release 1.2.3 ===
+
+2012-04-09	Mike Massonnet
+Fix typo s/ClipboardHistoryItem/ClipmanHistoryItem/
+
+2012-04-06	Mike Massonnet
+Fix 906099: Handle images and texts as one stack
+
+	Texts and images were still handled differently, and copying
+	new texts wouldn't remove old images. That's fixed.
+
+	Now max_texts_in_history is used as the length of the history.
+
+2012-03-15	Mike Massonnet
+Bug #8571: Fix height of history menu
+
+2012-03-15	Mike Massonnet
+Fix 1a5a2b: Add support for GTK 2.14
+
+2012-03-12	Mike Massonnet
+settings: Update online documentation URL
+
+2012-03-08	Mike Massonnet
+Bug #8307: Handle images and texts as one stack
+
+	The images and texts are handle in two lists, but the History class
+	returns a copy of a list named in intern "items" that is a copy of
+	the pointers from the images and texts lists.
+
+2012-03-06	Mike Massonnet
+Bug #8523: Added a checkbox "Don't ask again" to clear the history
+
+2012-03-05	 Mike Massonnet
+actions: Make sure configuration directory for actions exists
+
+2012-03-05	Mike Massonnet
+Update copyright years
+
+2012-03-04	Mike Massonnet
+Bug 8403: Include rows support from Xfce Panel 4.9
+
+2012-03-04	Mike Massonnet
+daemon: Rename directory daemon to x11-clipboard-manager
+
+2011-11-14	Mike Massonnet
+Bug 8147: Don't terminate gtk_message_dialog_new_with_markup with NULL
+
+2011-11-05	Mike Massonnet
+Bug 8106: Use g_return_val_if_fail instead of g_return_if_fail
+
 2011-11-01	Mike Massonnet
 === Release 1.2.2 ===
 
diff --git a/NEWS b/NEWS
index 61e147b..f0d377e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Version 1.2.3 - 2012-04-09
+
+- Use new online documentation location http://docs.xfce.org/
+- Bug 8307: Handle images and texts as one stack
+- Bug 8523: Added a checkbox "Don't ask again" to clear the history
+- Bug 8403: Include rows support from Xfce Panel 4.9
+- Bug 8147: Don't terminate gtk_message_dialog_new_with_markup with NULL
+- Bug 8106: Use g_return_val_if_fail instead of g_return_if_fail
+
 Version 1.2.2 - 2011-11-01
 
 - Update build environment.
diff --git a/configure.ac.in b/configure.ac.in
index 18368bc..16944c3 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -13,7 +13,7 @@ m4_define([project_version_major], [1])
 m4_define([project_version_minor], [2])
 m4_define([project_version_micro], [3])
 m4_define([project_version_build], [@REVISION@])
-m4_define([project_version_tag], [git]) # leave empty for release
+m4_define([project_version_tag], []) # leave empty for release
 m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()ifelse(project_version_tag(), [git], [project_version_tag()-project_version_build()], [project_version_tag()])])
 
 dnl ***************************
diff --git a/doc b/doc
index 744dd08..cf87175 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit 744dd08e6e5de3f170206b3dc56cb675e1af483d
+Subproject commit cf87175977008f876cea8a1bd0b2b503045d3213