Merge remote-tracking branch 'salsa/debian/master'

1 files changed, 4 insertions, 29 deletions

diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h
index a3bd9b47..f83f2b0d 100644
--- a/libnm/nm-dbus-helpers.h
+++ b/libnm/nm-dbus-helpers.h
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: LGPL-2.1+
 /*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef __NM_DBUS_HELPERS_PRIVATE_H__
@@ -26,20 +12,9 @@
 
 #include "nm-std-aux/nm-dbus-compat.h"
 
-GBusType _nm_dbus_bus_type (void);
-
-GDBusConnection *_nm_dbus_new_connection        (GCancellable *cancellable,
-                                                 GError **error);
-
-void             _nm_dbus_new_connection_async  (GCancellable *cancellable,
-                                                 GAsyncReadyCallback callback,
-                                                 gpointer user_data);
-GDBusConnection *_nm_dbus_new_connection_finish (GAsyncResult *result,
-                                                 GError **error);
+#define NM_DBUS_DEFAULT_TIMEOUT_MSEC   25000
 
-gboolean         _nm_dbus_is_connection_private (GDBusConnection *connection);
-
-void             _nm_dbus_proxy_replace_match   (GDBusProxy *proxy);
+GBusType _nm_dbus_bus_type (void);
 
 void _nm_dbus_bind_properties (gpointer object,
                                gpointer skeleton);