diff options
author | Thomas Haller <thaller@redhat.com> | 2013-10-02 23:55:53 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2013-10-18 19:56:37 +0200 |
commit | 3344ce9ff6213585d641e568a96bf063c2cce24f (patch) | |
tree | 3d2f45abe65130493ef8ffedcc7cd0678e6c3002 | |
parent | ef8501096fd7a458f14c0fb36fbdf3c592b6c957 (diff) | |
download | NetworkManager-3344ce9ff6213585d641e568a96bf063c2cce24f.tar.gz |
bluez: copy bluez-manager file for version 4 and 5
Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r-- | src/Makefile.am | 7 | ||||
-rw-r--r-- | src/bluez-manager/nm-bluez4-manager.c | 2 | ||||
-rw-r--r-- | src/bluez-manager/nm-bluez4-manager.h (renamed from src/bluez-manager/nm-bluez-manager.h) | 0 | ||||
-rw-r--r-- | src/bluez-manager/nm-bluez5-manager.c (renamed from src/bluez-manager/nm-bluez-manager.c) | 2 | ||||
-rw-r--r-- | src/bluez-manager/nm-bluez5-manager.h | 69 | ||||
-rw-r--r-- | src/nm-manager.c | 6 |
6 files changed, 80 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7799cbfddd..c23266afcd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -261,17 +261,18 @@ nm_sources = \ nm_sources += \ bluez-manager/nm-bluez-common.h \ bluez-manager/nm-bluez-device.c \ - bluez-manager/nm-bluez-device.h \ - bluez-manager/nm-bluez-manager.h + bluez-manager/nm-bluez-device.h if WITH_BLUEZ4 nm_sources += \ bluez-manager/nm-bluez4-adapter.h \ bluez-manager/nm-bluez4-adapter.c \ bluez-manager/nm-bluez4-manager.c + bluez-manager/nm-bluez4-manager.h else nm_sources += \ - bluez-manager/nm-bluez-manager.c + bluez-manager/nm-bluez5-manager.c \ + bluez-manager/nm-bluez5-manager.h endif if WITH_MODEM_MANAGER_1 diff --git a/src/bluez-manager/nm-bluez4-manager.c b/src/bluez-manager/nm-bluez4-manager.c index 1e7fc2010e..981bf454c6 100644 --- a/src/bluez-manager/nm-bluez4-manager.c +++ b/src/bluez-manager/nm-bluez4-manager.c @@ -26,7 +26,7 @@ #include "nm-logging.h" #include "nm-dbus-glib-types.h" -#include "nm-bluez-manager.h" +#include "nm-bluez4-manager.h" #include "nm-bluez4-adapter.h" #include "nm-dbus-manager.h" #include "nm-bluez-common.h" diff --git a/src/bluez-manager/nm-bluez-manager.h b/src/bluez-manager/nm-bluez4-manager.h index 95e319c5e0..95e319c5e0 100644 --- a/src/bluez-manager/nm-bluez-manager.h +++ b/src/bluez-manager/nm-bluez4-manager.h diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez5-manager.c index 2dd050a249..bf2ae40b0c 100644 --- a/src/bluez-manager/nm-bluez-manager.c +++ b/src/bluez-manager/nm-bluez5-manager.c @@ -26,7 +26,7 @@ #include <gio/gio.h> #include "nm-logging.h" -#include "nm-bluez-manager.h" +#include "nm-bluez5-manager.h" #include "nm-bluez-device.h" #include "nm-bluez-common.h" diff --git a/src/bluez-manager/nm-bluez5-manager.h b/src/bluez-manager/nm-bluez5-manager.h new file mode 100644 index 0000000000..95e319c5e0 --- /dev/null +++ b/src/bluez-manager/nm-bluez5-manager.h @@ -0,0 +1,69 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2007 - 2008 Novell, Inc. + * Copyright (C) 2007 - 2012 Red Hat, Inc. + */ + +#ifndef NM_BLUEZ_MANAGER_H +#define NM_BLUEZ_MANAGER_H + +#include <glib.h> +#include <glib-object.h> + +#include <config.h> +#include "nm-connection-provider.h" + +G_BEGIN_DECLS + +#define NM_TYPE_BLUEZ_MANAGER (nm_bluez_manager_get_type ()) +#define NM_BLUEZ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ_MANAGER, NMBluezManager)) +#define NM_BLUEZ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ_MANAGER, NMBluezManagerClass)) +#define NM_IS_BLUEZ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ_MANAGER)) +#define NM_IS_BLUEZ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ_MANAGER)) +#define NM_BLUEZ_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ_MANAGER, NMBluezManagerClass)) + +#define NM_BLUEZ_MANAGER_BDADDR_ADDED "bdaddr-added" +#define NM_BLUEZ_MANAGER_BDADDR_REMOVED "bdaddr-removed" + +typedef struct { + GObject parent; +} NMBluezManager; + +typedef struct { + GObjectClass parent; + + /* Virtual functions */ + void (*bdaddr_added) (NMBluezManager *manager, + const char *bdaddr, + const char *name, + const char *object_path, + guint uuids); + + void (*bdaddr_removed) (NMBluezManager *manager, + const char *bdaddr, + const char *object_path); +} NMBluezManagerClass; + +GType nm_bluez_manager_get_type (void); + +NMBluezManager *nm_bluez_manager_get (NMConnectionProvider *provider); + +void nm_bluez_manager_query_devices (NMBluezManager *manager); + +#endif /* NM_BLUEZ_MANAGER_H */ + diff --git a/src/nm-manager.c b/src/nm-manager.c index 008c62d99a..6ee2a80d2f 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -67,7 +67,11 @@ #include "nm-atm-manager.h" #include "nm-rfkill-manager.h" #include "nm-hostname-provider.h" -#include "nm-bluez-manager.h" +#if WITH_BLUEZ4 +#include "nm-bluez4-manager.h" +#else +#include "nm-bluez5-manager.h" +#endif #include "nm-bluez-common.h" #include "nm-settings.h" #include "nm-settings-connection.h" |