Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 3 insertions, 26 deletions

diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h
index ad78f92b..63c4142d 100644
--- a/libnm/nm-object-private.h
+++ b/libnm/nm-object-private.h
@@ -39,23 +39,13 @@ void _nm_object_register_properties (NMObject *object,
                                      const char *interface,
                                      const NMPropertiesInfo *info);
 
-void     _nm_object_reload_properties_async  (NMObject *object,
-                                              GCancellable *cancellable,
-                                              GAsyncReadyCallback callback,
-                                              gpointer user_data);
-gboolean _nm_object_reload_properties_finish (NMObject *object,
-                                              GAsyncResult *result,
-                                              GError **error);
-
 void _nm_object_queue_notify (NMObject *object, const char *property);
 
-void _nm_object_suppress_property_updates (NMObject *object, gboolean suppress);
+GDBusObjectManager *_nm_object_get_dbus_object_manager (NMObject *object);
 
-/* DBus property accessors */
+GQuark _nm_object_obj_nm_quark (void);
 
-void _nm_object_reload_property (NMObject *object,
-                                 const char *interface,
-                                 const char *prop_name);
+/* DBus property accessors */
 
 void _nm_object_set_property (NMObject *object,
                               const char *interface,
@@ -63,19 +53,6 @@ void _nm_object_set_property (NMObject *object,
                               const char *format_string,
                               ...);
 
-/* object demarshalling support */
-typedef GType (*NMObjectDecideTypeFunc) (GVariant *);
-
-void _nm_object_register_type_func (GType base_type,
-                                    NMObjectDecideTypeFunc type_func,
-                                    const char *interface,
-                                    const char *property);
-
-#define NM_OBJECT_NM_RUNNING "nm-running-internal"
-gboolean _nm_object_get_nm_running (NMObject *self);
-
-void _nm_object_class_add_interface (NMObjectClass *object_class,
-                                     const char    *interface);
 GDBusProxy *_nm_object_get_proxy (NMObject   *object,
                                   const char *interface);