[dconf] fixup last commit...
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf] fixup last commit...
- Date: Mon, 21 Jun 2010 18:03:52 +0000 (UTC)
commit 33305a4225ae1fda6a9c9c717253f3f1b04ec1fc
Author: Ryan Lortie <desrt desrt ca>
Date: Mon Jun 21 14:04:07 2010 -0400
fixup last commit...
configure.ac | 4 ++++
engine/dconf-engine.c | 9 +++++----
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 03c64a2..960b7d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,10 @@ AC_SUBST(dbussystemservicedir)
AC_SUBST(dconfincludedir, ${includedir}/dconf)
+LDFLAGS='-Wl,-Bsymbolic-functions'
+AC_TRY_LINK([], [int main (void) { return 0; }],
+ [echo good], [echo bad])
+
AC_PATH_PROG(gio_QUERYMODULES, gio-querymodules, no)
AC_CONFIG_FILES([
diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
index 2122f0d..d8272cf 100644
--- a/engine/dconf-engine.c
+++ b/engine/dconf-engine.c
@@ -240,7 +240,6 @@ dconf_engine_decode_notify (DConfEngine *engine,
const gchar *method,
GVariant *body)
{
- gboolean matched;
guint64 seqno;
gchar *ae;
@@ -254,13 +253,15 @@ dconf_engine_decode_notify (DConfEngine *engine,
if (anti_expose)
{
+ gboolean matched;
+
ae = dconf_engine_make_tag (bus_type, sender, seqno);
matched = strcmp (ae, anti_expose) == 0;
g_free (ae);
- }
- if (matched)
- return FALSE;
+ if (matched)
+ return FALSE;
+ }
g_variant_get (body, "(t&s^a&s)", NULL, path, rels);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]