mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-25 17:28:11 +02:00
* libnm-glib/nm-dbus-settings.c (constructor): Fix the "PropertiesChanged" signal signature. * libnm-glib/nm-dbus-connection.c (constructor): Use the common GType defined in nm-dbus-glib-types.h. Don't register the connection on dbus, we're a proxy class to communicate with an already registered connection over dbus. 2008-04-30 Tambet Ingo <tambet@gmail.com> Implement new subclasses of NMSettings and NMExportedConnection to make it easier for the applet to access and modify system settings. * libnm-glib/nm-dbus-connection.[ch]: * libnm-glib/nm-dbus-settings.[ch]: * libnm-glib/nm-dbus-settings-system.[ch]: Implement. * libnm-glib/Makefile.am: Add the new files to build, generate some more bindings and glue. * include/NetworkManager.h: Define the system settings DBus interface. 2008-04-30 Tambet Ingo <tambet@gmail.com> Implement additional C API for exported connections to make them identical with the DBus API. Change the (list_connections) virtual function to be more usable from C - instead of requiring implementers to return a GPtrArray of dbus paths, return a list of connections. * libnm-glib/nm-settings.c (nm_exported_connection_class_init): Fix a typo. (nm_settings_list_connections): (nm_exported_connection_new): (nm_exported_connection_update): (nm_exported_connection_delete): Implement. (impl_settings_list_connections): (impl_exported_connection_update): (impl_exported_connection_delete): Use the new public functions to make sure the C and dbus interfaces stay in sync. * system-settings/src/dbus-settings.c (list_connections): Return a list of connections. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3630 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
105 lines
3.8 KiB
C
105 lines
3.8 KiB
C
|
|
#ifndef __NM_SETTINGS_H__
|
|
#define __NM_SETTINGS_H__
|
|
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
|
|
#include <nm-connection.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_SETTINGS_ERROR nm_settings_error_quark ()
|
|
GQuark nm_settings_error_quark (void);
|
|
|
|
#define NM_TYPE_EXPORTED_CONNECTION (nm_exported_connection_get_type ())
|
|
#define NM_EXPORTED_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_EXPORTED_CONNECTION, NMExportedConnection))
|
|
#define NM_EXPORTED_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_EXPORTED_CONNECTION, NMExportedConnectionClass))
|
|
#define NM_IS_EXPORTED_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_EXPORTED_CONNECTION))
|
|
#define NM_IS_EXPORTED_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_EXPORTED_CONNECTION))
|
|
#define NM_EXPORTED_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_EXPORTED_CONNECTION, NMExportedConnectionClass))
|
|
|
|
#define NM_EXPORTED_CONNECTION_CONNECTION "connection"
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
} NMExportedConnection;
|
|
|
|
typedef struct {
|
|
GObjectClass parent_class;
|
|
|
|
/* virtual methods */
|
|
const gchar *(* get_id) (NMExportedConnection *connection);
|
|
GHashTable * (* get_settings) (NMExportedConnection *connection);
|
|
void (* get_secrets) (NMExportedConnection *connection,
|
|
const gchar *setting_name,
|
|
const gchar **hints,
|
|
gboolean request_new,
|
|
DBusGMethodInvocation *context);
|
|
|
|
void (*update) (NMExportedConnection *connection,
|
|
GHashTable *new_settings);
|
|
|
|
void (*delete) (NMExportedConnection *connection);
|
|
|
|
/* signals */
|
|
void (* updated) (NMExportedConnection *connection, GHashTable *settings);
|
|
void (* removed) (NMExportedConnection *connection);
|
|
} NMExportedConnectionClass;
|
|
|
|
GType nm_exported_connection_get_type (void);
|
|
|
|
NMExportedConnection *nm_exported_connection_new (NMConnection *wrapped);
|
|
|
|
void nm_exported_connection_register_object (NMExportedConnection *connection,
|
|
NMConnectionScope scope,
|
|
DBusGConnection *dbus_connection);
|
|
|
|
NMConnection *nm_exported_connection_get_connection (NMExportedConnection *connection);
|
|
|
|
const char *nm_exported_connection_get_id (NMExportedConnection *connection);
|
|
|
|
void nm_exported_connection_update (NMExportedConnection *connection,
|
|
GHashTable *new_settings);
|
|
|
|
void nm_exported_connection_delete (NMExportedConnection *connection);
|
|
|
|
void nm_exported_connection_signal_updated (NMExportedConnection *connection,
|
|
GHashTable *new_settings);
|
|
|
|
void nm_exported_connection_signal_removed (NMExportedConnection *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 */
|
|
/* Returns a list of NMExportedConnections. Caller should free the list. */
|
|
GSList * (*list_connections) (NMSettings *settings);
|
|
|
|
/* signals */
|
|
void (* new_connection) (NMSettings *settings, NMExportedConnection *connection);
|
|
} NMSettingsClass;
|
|
|
|
GType nm_settings_get_type (void);
|
|
|
|
GSList *nm_settings_list_connections (NMSettings *settings);
|
|
|
|
void nm_settings_signal_new_connection (NMSettings *settings, NMExportedConnection *connection);
|
|
|
|
|
|
G_END_DECLS
|
|
|
|
#endif
|