Files
NetworkManager/libnm-glib/nm-dbus-utils.c
Tambet Ingo 326d1e8679 2007-09-12 Tambet Ingo <tambet@gmail.com>
* 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
2007-09-12 16:23:53 +00:00

194 lines
4.7 KiB
C

#include "nm-dbus-utils.h"
char *
nm_dbus_get_string_property (DBusGProxy *proxy,
const char *interface,
const char *prop_name)
{
GError *err = NULL;
char *str = NULL;
GValue value = {0,};
g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), NULL);
if (dbus_g_proxy_call (proxy, "Get", &err,
G_TYPE_STRING, interface,
G_TYPE_STRING, prop_name,
G_TYPE_INVALID,
G_TYPE_VALUE, &value,
G_TYPE_INVALID)) {
str = g_strdup (g_value_get_string (&value));
} else {
g_warning ("Error in device_get_property: %s\n", err->message);
g_error_free (err);
}
return str;
}
char *
nm_dbus_get_object_path_property (DBusGProxy *proxy,
const char *interface,
const char *prop_name)
{
GError *err = NULL;
char *path = NULL;
GValue value = {0,};
g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), NULL);
if (dbus_g_proxy_call (proxy, "Get", &err,
G_TYPE_STRING, interface,
G_TYPE_STRING, prop_name,
G_TYPE_INVALID,
G_TYPE_VALUE, &value,
G_TYPE_INVALID)) {
path = g_strdup (g_value_get_boxed (&value));
} else {
g_warning ("Error in device_get_property: %s\n", err->message);
g_error_free (err);
}
return path;
}
gint32
nm_dbus_get_int_property (DBusGProxy *proxy,
const char *interface,
const char *prop_name)
{
GError *err = NULL;
gint32 i = 0;
GValue value = {0,};
g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), 0);
if (dbus_g_proxy_call (proxy, "Get", &err,
G_TYPE_STRING, interface,
G_TYPE_STRING, prop_name,
G_TYPE_INVALID,
G_TYPE_VALUE, &value,
G_TYPE_INVALID)) {
i = g_value_get_int (&value);
} else {
g_warning ("Error in device_get_property: %s\n", err->message);
g_error_free (err);
}
return i;
}
guint32
nm_dbus_get_uint_property (DBusGProxy *proxy,
const char *interface,
const char *prop_name)
{
GError *err = NULL;
guint32 i = 0;
GValue value = {0,};
g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), 0);
if (dbus_g_proxy_call (proxy, "Get", &err,
G_TYPE_STRING, interface,
G_TYPE_STRING, prop_name,
G_TYPE_INVALID,
G_TYPE_VALUE, &value,
G_TYPE_INVALID)) {
i = g_value_get_uint (&value);
} else {
g_warning ("Error in device_get_property: %s\n", err->message);
g_error_free (err);
}
return i;
}
gboolean
nm_dbus_get_property (DBusGProxy *proxy,
const char *interface,
const char *prop_name,
GValue *value)
{
DBusGProxy *properties_proxy;
GError *err = NULL;
gboolean ret = TRUE;
g_return_val_if_fail (proxy != NULL, FALSE);
g_return_val_if_fail (interface != NULL, FALSE);
g_return_val_if_fail (prop_name != NULL, FALSE);
properties_proxy = dbus_g_proxy_new_from_proxy (proxy,
"org.freedesktop.DBus.Properties",
dbus_g_proxy_get_path (proxy));
if (!dbus_g_proxy_call (properties_proxy, "Get", &err,
G_TYPE_STRING, interface,
G_TYPE_STRING, prop_name,
G_TYPE_INVALID,
G_TYPE_VALUE, value,
G_TYPE_INVALID)) {
g_warning ("Error in device_get_property: %s\n", err->message);
g_error_free (err);
ret = FALSE;
}
g_object_unref (properties_proxy);
return ret;
}
void
nm_dbus_set_property (DBusGProxy *proxy,
const char *interface,
const char *prop_name,
GValue *value)
{
DBusGProxy *properties_proxy;
g_return_if_fail (proxy != NULL);
g_return_if_fail (interface != NULL);
g_return_if_fail (prop_name != NULL);
properties_proxy = dbus_g_proxy_new_from_proxy (proxy,
"org.freedesktop.DBus.Properties",
dbus_g_proxy_get_path (proxy));
dbus_g_proxy_call_no_reply (properties_proxy, "Set",
G_TYPE_STRING, interface,
G_TYPE_STRING, prop_name,
G_TYPE_VALUE, value,
G_TYPE_INVALID);
g_object_unref (properties_proxy);
}
char *
nm_dbus_introspect (DBusGConnection *connection,
const char *interface,
const char *path)
{
DBusGProxy *remote_object_introspectable;
char *introspect_data = NULL;
GError *err = NULL;
g_return_val_if_fail (connection != NULL, NULL);
g_return_val_if_fail (interface != NULL, NULL);
g_return_val_if_fail (path != NULL, NULL);
remote_object_introspectable = dbus_g_proxy_new_for_name (connection,
interface,
path,
"org.freedesktop.DBus.Introspectable");
if (!dbus_g_proxy_call (remote_object_introspectable, "Introspect", &err,
G_TYPE_INVALID,
G_TYPE_STRING, &introspect_data, G_TYPE_INVALID)) {
g_error ("Failed to complete Introspect %s", err->message);
g_error_free (err);
}
g_object_unref (G_OBJECT (remote_object_introspectable));
return introspect_data;
}