Updating branch refs/heads/master to 0a0d8be6c90c64aa8d594e82e1867af39d9e3075 (commit) from 4e0ea06078130a5e63fa1e0afd16b109b6502b03 (commit)
commit 0a0d8be6c90c64aa8d594e82e1867af39d9e3075 Author: Nick Schermer <n...@xfce.org> Date: Sat Apr 28 21:51:45 2012 +0200 Updates for release. NEWS | 11 +++++++++++ configure.ac.in | 6 +++--- xfconf/xfconf-cache.c | 6 ++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 2d2bdfc..f7ef63e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +4.10.0 +====== +- Don't emit property-changed on cancelled calls. +- Accept NULL as a string value (bug #8726). +- Check abicheck.sh to be more portable (bug #8702). +- Fix more deprecated g_value_set_char (bug #8690). +- Explicitly link against gthread (bug #8713). +- Drop deprecated g_mapped_file_free. +- Translation updates: English (United Kingdom), Korean, Dutch + (Flemish), Portuguese, Romanian, Turkish, Chinese (China). + 4.9.1 ===== - Use LT_PREREQ and LT_INIT. diff --git a/configure.ac.in b/configure.ac.in index 531a67e..24dc970 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,11 +9,11 @@ dnl version info m4_define([libxfconf_verinfo], [2:0:0]) m4_define([libxfconf_version_api], [0]) m4_define([xfconf_version_major], [4]) -m4_define([xfconf_version_minor], [9]) -m4_define([xfconf_version_micro], [1]) +m4_define([xfconf_version_minor], [10]) +m4_define([xfconf_version_micro], [0]) m4_define([xfconf_version_nano], []) m4_define([xfconf_version_build], [@REVISION@]) -m4_define([xfconf_version_tag], [git]) +m4_define([xfconf_version_tag], []) m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_nano(), [], [], [.xfconf_version_nano()])ifelse(xfconf_version_tag(), [git], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])]) m4_define([xfconf_default_debug], [ifelse(xfconf_version_tag(), [git], [yes], [minimum])]) diff --git a/xfconf/xfconf-cache.c b/xfconf/xfconf-cache.c index 36bd03e..1dc2e1f 100644 --- a/xfconf/xfconf-cache.c +++ b/xfconf/xfconf-cache.c @@ -751,10 +751,8 @@ xfconf_cache_set(XfconfCache *cache, dbus_error_name = dbus_g_error_get_name(tmp_error); } - if(G_UNLIKELY(!dbus_error_name - || strncmp(dbus_error_name, "org.xfce.Xfconf.Error.", 22) - || (strcmp(dbus_error_name+22, "PropertyNotFound") - && strcmp(dbus_error_name+22, "ChannelNotFound")))) + if(g_strcmp0(dbus_error_name, "org.xfce.Xfconf.Error.PropertyNotFound") != 0 + && g_strcmp0(dbus_error_name, "org.xfce.Xfconf.Error.ChannelNotFound") != 0) { /* this is bad... */ g_propagate_error(error, tmp_error); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits