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

[Mike Massonnet]

Updating branch refs/heads/master
         to b421c1d32533337221c265e251666160e88b15f2 (commit)
       from 0791dc6ea6f6954249a26a9f7875b56a7badfa65 (commit)

commit b421c1d32533337221c265e251666160e88b15f2
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Mon Oct 31 21:51:31 2011 +0100

    === Release 1.2.1 ===

 ChangeLog       |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS            |   11 +++++++++
 configure.ac.in |    2 +-
 doc             |    2 +-
 4 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bcede3..80becdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,70 @@
+2011-10-31	Mike Massonnet
+=== Release 1.2.1 ===
+
+2011-10-31	Mike Massonnet
+actions: Use "skip_action_on_key_down" option only for selections
+
+	Don't use this option for actions that have to be triggered for
+	the default clipboard (Ctrl+C).
+
+2011-10-28	Mike Massonnet
+menu.c: Remove forgotten #ifdef HAVE_LIBXTST
+
+2011-10-28	Mike Massonnet
+build-env: Make xtst a hard-dependency
+
+2011-10-28	Mike Massonnet
+build-env: Update error message for --enable-gen-doc
+
+2011-10-28	Mike Massonnet
+Bind paste-on-activate combobox to Xfconf
+
+	The paste-on-activate combobox shows a list of possible values as
+	text strings None, Ctrl+V, and Shift+Ins and has its 'active'
+	property binded to the Xfconf property /tweaks/paste-on-activate.
+
+2011-10-27	Mike Massonnet
+Add "Tweaks" tab in the Settings dialog
+
+	Modified the settings-dialog.ui file to include a new tab with
+	existing hidden settings.
+	
+	Binded all the checkboxes to their Xfconf properties.
+
+2011-10-27	Mike Massonnet
+README: Update dependencies list
+
+2011-10-26	Mike Massonnet
+Use new Panel 4.8 installation directory for plugin
+
+	Install plugin under the new location $prefix/lib/xfce4/panel/plugins/
+	and update the main-panel-plugin.c code with the right macro to build
+	libclipman.so instead of the executable binary.
+	
+	Moved the xfce4-clipman-plugin.desktop.in file to the panel-plugin
+	directory as xfce4-clipman.desktop.in.
+
+2011-10-25	Mike Massonnet
+doc: Update git submodule reference
+
+
+2011-10-24	Mike Massonnet
+actions: Add "skip-action-on-key-down" option
+
+	This option lets the user skip the actions popup menu by holding
+	the Control key down when the selection is done, by default it's
+	set to false.
+	
+	The Xfconf property /tweaks/skip-action-key-down is binded to it.
+
+2011-10-24	Mike Massonnet
+history: Add "reorder-items" option
+
+	This option lets user choose to push or not the last copied text to
+	the top of the history, by default it's set to true.
+	
+	The Xfconf property /tweaks/reorder-items is binded to it.
+
 2011-10-24	Mike Massonnet
 === Release 1.2.0 ===
 
diff --git a/NEWS b/NEWS
index 39187da..9cd36e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Version 1.2.1 - 2011-10-31
+
+- New options in the settings dialog under the tab "Tweaks".
+  * reorder-items: push or not the last copied text to the top of
+    history, default is set to true.
+  * skip-action-on-key-down: ignore matched actions when Ctrl is
+    pressed down at the end of the selection, default is set to
+    false.
+- Include existing hidden options in the "Tweaks" tab.
+- Use new Xfce Panel plugin installation location.
+
 Version 1.2.0 - 2011-10-24
 
 - Ported documentation to Mallard and moved it into the xfce4-docs repo.
diff --git a/configure.ac.in b/configure.ac.in
index 82dade7..711ea94 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], [1])
 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..d010e13 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit 744dd08e6e5de3f170206b3dc56cb675e1af483d
+Subproject commit d010e1353ceaefda74fa9b34ce62c6958f253471