NetworkManager r3966 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Aug 14 20:02:06 2008
New Revision: 3966
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3966&view=rev

Log:
2008-08-14  Dan Williams  <dcbw redhat com>

	* 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



Modified:
   trunk/ChangeLog
   trunk/src/nm-cdma-device.c
   trunk/src/nm-gsm-device.c
   trunk/src/nm-hso-gsm-device.c
   trunk/src/nm-properties-changed-signal.c
   trunk/src/nm-properties-changed-signal.h

Modified: trunk/src/nm-cdma-device.c
==============================================================================
--- trunk/src/nm-cdma-device.c	(original)
+++ trunk/src/nm-cdma-device.c	Thu Aug 14 20:02:06 2008
@@ -513,7 +513,7 @@
 						  "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] = 

Modified: trunk/src/nm-gsm-device.c
==============================================================================
--- trunk/src/nm-gsm-device.c	(original)
+++ trunk/src/nm-gsm-device.c	Thu Aug 14 20:02:06 2008
@@ -920,7 +920,7 @@
 						  "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] = 

Modified: trunk/src/nm-hso-gsm-device.c
==============================================================================
--- trunk/src/nm-hso-gsm-device.c	(original)
+++ trunk/src/nm-hso-gsm-device.c	Thu Aug 14 20:02:06 2008
@@ -556,7 +556,7 @@
 						  "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);

Modified: trunk/src/nm-properties-changed-signal.c
==============================================================================
--- trunk/src/nm-properties-changed-signal.c	(original)
+++ trunk/src/nm-properties-changed-signal.c	Thu Aug 14 20:02:06 2008
@@ -141,6 +141,10 @@
 	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 ();

Modified: trunk/src/nm-properties-changed-signal.h
==============================================================================
--- trunk/src/nm-properties-changed-signal.h	(original)
+++ trunk/src/nm-properties-changed-signal.h	Thu Aug 14 20:02:06 2008
@@ -5,6 +5,8 @@
 
 #include <glib-object.h>
 
+#define NM_PROPERTY_PARAM_NO_EXPORT    (1 << (0 + G_PARAM_USER_SHIFT))
+
 guint nm_properties_changed_signal_new (GObjectClass *object_class,
 								guint class_offset);