[goffice] Compilation: don't use reserved identifier "close".
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Subject: [goffice] Compilation: don't use reserved identifier "close".
- Date: Wed, 1 Jul 2009 14:51:04 +0000 (UTC)
commit 9342a4a361d553b72b78ffc138a57311e3b7477e
Author: Morten Welinder <terra gnome org>
Date: Wed Jul 1 10:50:43 2009 -0400
Compilation: don't use reserved identifier "close".
ChangeLog | 5 +++++
goffice/app/go-conf-gconf.c | 15 ++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7732d53..ab3fdc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-01 Morten Welinder <terra gnome org>
+
+ * goffice/app/go-conf-gconf.c (go_conf_add_monitor): Don't use
+ reserved identifier.
+
2009-06-30 Emmanuel Pacaud <emmanuel pacaud lapp in2p3 fr>
More workaround for http://bugzilla.gnome.org/show_bug.cgi?id=585421
diff --git a/goffice/app/go-conf-gconf.c b/goffice/app/go-conf-gconf.c
index 3c42d65..b981d8b 100644
--- a/goffice/app/go-conf-gconf.c
+++ b/goffice/app/go-conf-gconf.c
@@ -440,9 +440,9 @@ typedef struct {
static void
cb_key_changed (GConfClient *client, guint cnxn_id,
- GConfEntry *entry, GOConfClosure *close)
+ GConfEntry *entry, GOConfClosure *cls)
{
- close->monitor (NULL, gconf_entry_get_key (entry), close->data);
+ cls->monitor (NULL, gconf_entry_get_key (entry), cls->data);
}
guint
@@ -450,14 +450,15 @@ go_conf_add_monitor (GOConfNode *node, gchar const *key,
GOConfMonitorFunc monitor, gpointer data)
{
guint ret;
- GOConfClosure *close = g_new0 (GOConfClosure, 1);
+ GOConfClosure *cls = g_new0 (GOConfClosure, 1);
gchar *real_key;
- close->monitor = monitor;
- close->data = data;
+ cls->monitor = monitor;
+ cls->data = data;
real_key = go_conf_get_real_key (node, key);
- ret = gconf_client_notify_add (gconf_client, real_key,
- (GConfClientNotifyFunc) cb_key_changed, close, g_free, NULL);
+ ret = gconf_client_notify_add
+ (gconf_client, real_key, (GConfClientNotifyFunc)cb_key_changed,
+ cls, g_free, NULL);
g_free (real_key);
return ret;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]