[Xfce4-commits] <terminal:master> Updates for release.

[Nick Schermer]

Updating branch refs/heads/master
         to 7abbb22a5431b41679ba4d3aad5976c94ccac42d (commit)
       from 0ec25381f3ea9fcafbc3dc9ac3ba5c32d256a9c5 (commit)

commit 7abbb22a5431b41679ba4d3aad5976c94ccac42d
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 30 17:09:46 2011 +0100

    Updates for release.

 NEWS                        |   15 +++++++++++++++
 configure.ac.in             |    4 ++--
 terminal/main.c             |    2 +-
 terminal/terminal-dialogs.c |    2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 36028f2..e56f55c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+0.4.6
+=====
+- Parse the tab title if dynamic title is hidden.
+- Abort doc generation if validating the xml file fails.
+- Plug small memory leak and fix some compiler warnings.
+- Recognize sftp in urls.
+- Work around deprecated API in vte 0.26.
+- Unbind title dialog binding before destroy.
+- Protect against NULL border values (bug #7120).
+- Set colormap on window init.
+- Translation updates (cs, de, el, en_GB, es, eu, fr, gl, hr, id, ja,
+  kk, nb, nl, pl, pt, ro, ru, ug, uk).
+- Manual translation updates (el, es, fr, gl, hr, ja, pt, sv, ug).
+
+
 0.4.5
 =====
 - Improve support for --program-transform-name.
diff --git a/configure.ac.in b/configure.ac.in
index fd763ee..b0b6ad1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,10 +10,10 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([terminal_version_major], [0])
 m4_define([terminal_version_minor], [4])
-m4_define([terminal_version_micro], [5])
+m4_define([terminal_version_micro], [6])
 m4_define([terminal_version_nano], [])
 m4_define([terminal_version_build], [@REVISION@])
-m4_define([terminal_version_tag], [git])
+m4_define([terminal_version_tag], [])
 m4_define([terminal_version_dbus], [4])
 m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])])
 
diff --git a/terminal/main.c b/terminal/main.c
index 80e0155..50daa03 100644
--- a/terminal/main.c
+++ b/terminal/main.c
@@ -149,7 +149,7 @@ main (int argc, char **argv)
                  "Please report bugs to <%s>.\n"),
                  name, PACKAGE_VERSION,
                  xfce_version_string (),
-                 "2003-2010",
+                 "2003-2011",
                  GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
                  gtk_major_version, gtk_minor_version, gtk_micro_version,
                  PACKAGE_BUGREPORT);
diff --git a/terminal/terminal-dialogs.c b/terminal/terminal-dialogs.c
index 3ac122b..45dadd2 100644
--- a/terminal/terminal-dialogs.c
+++ b/terminal/terminal-dialogs.c
@@ -95,7 +95,7 @@ terminal_dialogs_show_about (GtkWindow *parent)
                          "comments", _("Xfce Terminal Emulator"),
                          "documenters", documenters,
                          "copyright", "Copyright \302\251 2003-2008 Benedikt Meurer\n"
-                                      "Copyright \302\251 2007-2010 Nick Schermer",
+                                      "Copyright \302\251 2007-2011 Nick Schermer",
                          "license", XFCE_LICENSE_GPL,
                          "logo", logo,
                          "program-name", g_get_application_name (),