From 86ec20a3045065458913ba1665ff31b1a098f143 Mon Sep 17 00:00:00 2001 From: Timo Hoenig Date: Mon, 9 Jan 2006 15:04:43 +0000 Subject: [PATCH] 2006-01-09 Timo Hoenig * libnm-util/dbus-helpers.c libnm-util/dbus-helpers.h - (nmu_create_dbus_error_message): rename parameter 'namespace' to 'exception_namespace' (:namespace is a keyword in C++) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1301 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ libnm-util/dbus-helpers.c | 4 ++-- libnm-util/dbus-helpers.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8087f4e092..6bdf605499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-09 Timo Hoenig + * libnm-util/dbus-helpers.c + libnm-util/dbus-helpers.h + - (nmu_create_dbus_error_message): rename parameter 'namespace' + to 'exception_namespace' (:namespace is a keyword in C++) + 2006-01-09 Dan Williams * src/NetworkManagerPolicy.c diff --git a/libnm-util/dbus-helpers.c b/libnm-util/dbus-helpers.c index 724779985a..63dbe5c179 100644 --- a/libnm-util/dbus-helpers.c +++ b/libnm-util/dbus-helpers.c @@ -250,7 +250,7 @@ nmu_security_serialize_wpa_psk_with_cipher (DBusMessage *message, */ DBusMessage * nmu_create_dbus_error_message (DBusMessage *message, - const char *namespace, + const char *exception_namespace, const char *exception, const char *format, ...) @@ -265,7 +265,7 @@ nmu_create_dbus_error_message (DBusMessage *message, vsnprintf (errmsg, 512, format, args); va_end (args); - full_exception = g_strdup_printf ("%s.%s", namespace, exception); + full_exception = g_strdup_printf ("%s.%s", exception_namespace, exception); reply = dbus_message_new_error (message, full_exception, errmsg); g_free (full_exception); g_free (errmsg); diff --git a/libnm-util/dbus-helpers.h b/libnm-util/dbus-helpers.h index 7187f216ee..c5b076b9b6 100644 --- a/libnm-util/dbus-helpers.h +++ b/libnm-util/dbus-helpers.h @@ -62,7 +62,7 @@ dbus_bool_t nmu_security_serialize_wpa_psk_with_cipher (DBusMessage *message, int key_mgt); DBusMessage * nmu_create_dbus_error_message (DBusMessage *message, - const char *namespace, + const char *exception_namespace, const char *exception, const char *format, ...);