From 680259ef681d74ea4bdfe0a998244c2c62b7dd33 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 14 Aug 2008 20:02:06 +0000 Subject: [PATCH] 2008-08-14 Dan Williams * src/nm-properties-changed-signal.c src/nm-properties-changed-signal.h - Add a property spec flag for "don't export this property" in property changed signals * src/nm-hso-gsm-device.c src/nm-gsm-device.c src/nm-cdma-device.c - Don't export monitor interface or netdev interface properties git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3966 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 12 ++++++++++++ src/nm-cdma-device.c | 2 +- src/nm-gsm-device.c | 2 +- src/nm-hso-gsm-device.c | 2 +- src/nm-properties-changed-signal.c | 4 ++++ src/nm-properties-changed-signal.h | 2 ++ 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff728f6491..945c5820c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-08-14 Dan Williams + + * src/nm-properties-changed-signal.c + src/nm-properties-changed-signal.h + - Add a property spec flag for "don't export this property" in + property changed signals + + * src/nm-hso-gsm-device.c + src/nm-gsm-device.c + src/nm-cdma-device.c + - Don't export monitor interface or netdev interface properties + 2008-08-14 Dan Williams * src/NetworkManagerPolicy.c diff --git a/src/nm-cdma-device.c b/src/nm-cdma-device.c index 9a2fd197b0..31023e17d1 100644 --- a/src/nm-cdma-device.c +++ b/src/nm-cdma-device.c @@ -513,7 +513,7 @@ nm_cdma_device_class_init (NMCdmaDeviceClass *klass) "Monitoring interface", "Monitoring interface", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT)); /* Signals */ signals[PROPERTIES_CHANGED] = diff --git a/src/nm-gsm-device.c b/src/nm-gsm-device.c index 1388487ca2..c7367e4765 100644 --- a/src/nm-gsm-device.c +++ b/src/nm-gsm-device.c @@ -920,7 +920,7 @@ nm_gsm_device_class_init (NMGsmDeviceClass *klass) "Monitoring interface", "Monitoring interface", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT)); /* Signals */ signals[PROPERTIES_CHANGED] = diff --git a/src/nm-hso-gsm-device.c b/src/nm-hso-gsm-device.c index 56f4e2343d..d659dcba3d 100644 --- a/src/nm-hso-gsm-device.c +++ b/src/nm-hso-gsm-device.c @@ -556,7 +556,7 @@ nm_hso_gsm_device_class_init (NMHsoGsmDeviceClass *klass) "Network interface", "Network interface", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT)); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), &dbus_glib_nm_gsm_device_object_info); diff --git a/src/nm-properties-changed-signal.c b/src/nm-properties-changed-signal.c index bb7427d50a..2dcfc50384 100644 --- a/src/nm-properties-changed-signal.c +++ b/src/nm-properties-changed-signal.c @@ -141,6 +141,10 @@ notify (GObject *object, GParamSpec *pspec) PropertiesChangedInfo *info; GValue *value; + /* Ignore properties that shouldn't be exported */ + if (pspec->flags & NM_PROPERTY_PARAM_NO_EXPORT) + return; + info = (PropertiesChangedInfo *) g_object_get_data (object, NM_DBUS_PROPERTY_CHANGED); if (!info) { info = properties_changed_info_new (); diff --git a/src/nm-properties-changed-signal.h b/src/nm-properties-changed-signal.h index d77f9662a2..9ae342b965 100644 --- a/src/nm-properties-changed-signal.h +++ b/src/nm-properties-changed-signal.h @@ -5,6 +5,8 @@ #include +#define NM_PROPERTY_PARAM_NO_EXPORT (1 << (0 + G_PARAM_USER_SHIFT)) + guint nm_properties_changed_signal_new (GObjectClass *object_class, guint class_offset);