mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-25 09:18:13 +02:00
326d1e8679
* src/vpn-manager/nm-vpn-connection.[ch]:
* src/vpn-manager/nm-vpn-manager.[ch]:
* src/vpn-manager/nm-vpn-service.[ch]: Rewrite the vpn handling
* code. Using
dbus-glib, GObjects, signals etc.
* libnm-glib/nm-vpn-manager.[ch]:
* libnm-glib/nm-vpn-connection.[ch]: Now that the NM
* implementation changed
so much, rewrite these too.
* libnm-glib/Makefile.am: Add new files to build, build new
* binding files for
the new introspection files.
* libnm-glib/nm-client.[ch]: Remove all VPN related stuff from
* here.
* libnm-glib/nm-dbus-utils.[ch]: Renamed from nm-utils.[ch] that
* was shadowing
the header with the same name from libnm-utils.
* libnm-glib/nm-vpn-plugin.[ch]: Implement.
* libnm-util/Makefile.am: Add nm-utils.[ch] to build.
* introspection/nm-vpn-plugin.xml: Implement.
* introspection/nm-vpn-connection.xml: Implement.
* introspection/nm-vpn-manager.xml: Implement.
* src/NetworkManagerSystem.c
* (nm_system_vpn_device_set_from_ip4_config): Remove
the named manager argument, it can just as easily get it as the
caller.
(nm_system_vpn_device_unset_from_ip4_config): Ditto.
* src/vpn-manager/nm-dbus-vpn.[ch]: Remove.
* src/nm-dbus-manager.h: Fix up the name_owner signal signature.
* src/dhcp-manager/nm-dhcp-manager.c (garray_to_string): Remove,
* use one from
libnm-utils.
* libnm-util/nm-connection.c: Ditto.
* src/NetworkManagerMain.h: Remove, it's finally empty.
* configure.in: Remove utils/ from build.
* include/NetworkManagerVPN.h: Add some more defines to reduce
* the amount
of hard-coded strings.
* utils/: Move it over to libnm-util.
* test/Makefile.am: Link against libnm-util now that util/ is
* gone.
* dispatcher-daemon/Makefile.am: Ditto.
* src/Makefile.am: Ditto.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2798 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
74 lines
2.8 KiB
C
74 lines
2.8 KiB
C
|
|
#ifndef NM_SETTINGS_H
|
|
#define NM_SETTINGS_H 1
|
|
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_CONNECTION_SETTINGS (nm_connection_settings_get_type ())
|
|
#define NM_CONNECTION_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION_SETTINGS, NMConnectionSettings))
|
|
#define NM_CONNECTION_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CONNECTION_SETTINGS, NMConnectionSettingsClass))
|
|
#define NM_IS_CONNECTION_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTION_SETTINGS))
|
|
#define NM_IS_CONNECTION_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_CONNECTION_SETTINGS))
|
|
#define NM_CONNECTION_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CONNECTION_SETTINGS, NMConnectionSettingsClass))
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
|
|
/* private */
|
|
char * dbus_path;
|
|
} NMConnectionSettings;
|
|
|
|
typedef struct {
|
|
GObjectClass parent_class;
|
|
|
|
/* virtual methods */
|
|
gchar * (* get_id) (NMConnectionSettings *connection);
|
|
GHashTable * (* get_settings) (NMConnectionSettings *connection);
|
|
GHashTable * (* get_secrets) (NMConnectionSettings *connection, const gchar *setting_name);
|
|
|
|
/* signals */
|
|
void (* updated) (NMConnectionSettings *connection, GHashTable *settings);
|
|
void (* removed) (NMConnectionSettings *connection);
|
|
} NMConnectionSettingsClass;
|
|
|
|
GType nm_connection_settings_get_type (void);
|
|
void
|
|
nm_connection_settings_register_object (NMConnectionSettings *connection,
|
|
DBusGConnection *dbus_connection);
|
|
const char *nm_connection_settings_get_dbus_object_path (NMConnectionSettings *connection);
|
|
|
|
|
|
void nm_connection_settings_signal_updated (NMConnectionSettings *connection, GHashTable *settings);
|
|
void nm_connection_settings_signal_removed (NMConnectionSettings *connection);
|
|
|
|
#define NM_TYPE_SETTINGS (nm_settings_get_type ())
|
|
#define NM_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTINGS, NMSettings))
|
|
#define NM_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTINGS, NMSettingsClass))
|
|
#define NM_IS_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTINGS))
|
|
#define NM_IS_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTINGS))
|
|
#define NM_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTINGS, NMSettingsClass))
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
} NMSettings;
|
|
|
|
typedef struct {
|
|
GObjectClass parent_class;
|
|
|
|
/* virtual methods */
|
|
GPtrArray * (* list_connections) (NMSettings *settings);
|
|
|
|
/* signals */
|
|
void (* new_connection) (NMSettings *settings, NMConnectionSettings *connection);
|
|
} NMSettingsClass;
|
|
|
|
GType nm_settings_get_type (void);
|
|
|
|
void nm_settings_signal_new_connection (NMSettings *settings, NMConnectionSettings *connection);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif
|