~mdz/network-manager/ubuntu.0.7

« back to all changes in this revision

Viewing changes to src/NetworkManagerDbus.c

  • Committer: tambeti
  • Date: 2007-02-12 09:23:43 UTC
  • Revision ID: vcs-imports@canonical.com-20070212092343-96d46863e2821ee2
2007-02-12  Tambet Ingo  <tambet@ximian.com>

        Totally break NetworkManager. Please use 0.6 branch until futher notice.

        * src/:
                - Remove old low-level dbus interface implementations and replace them
                  with dbus-glib one.

        * configure.in:
                - Require dbus-glib >= 0.72.
                - Plug in new sources to build.

        * libnm-glib/:
                - Implement GObject wrappers on top of DBUS glib auto-generated bindings
                  to make it more convenient to use from GObject based programs.

        * introspection/:
                - Implement DBUS XML introspection files, used by both NM and libnm-glib.

Show diffs side-by-side

added added

removed removed

Lines of Context:
104
104
 
105
105
        g_return_val_if_fail (dev != NULL, NULL);
106
106
 
107
 
        object_path = g_strdup_printf ("%s/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev));
 
107
        object_path = g_strdup_printf ("%s/%s", NM_DBUS_PATH_DEVICE, nm_device_get_iface (dev));
108
108
        escaped_object_path = nm_dbus_escape_object_path (object_path);
109
109
        g_free (object_path);
110
110
 
128
128
        if (!nm_ap_get_essid (ap))
129
129
                return NULL;
130
130
 
131
 
        object_path = g_strdup_printf ("%s/%s/Networks/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev), nm_ap_get_essid (ap));
 
131
        object_path = g_strdup_printf ("%s/%s/Networks/%s", NM_DBUS_PATH_DEVICE, nm_device_get_iface (dev), nm_ap_get_essid (ap));
132
132
        escaped_object_path = nm_dbus_escape_object_path (object_path);
133
133
        g_free (object_path);
134
134
 
159
159
                if (!(dev = NM_DEVICE (elt->data)))
160
160
                        continue;
161
161
 
162
 
                compare_path = g_strdup_printf ("%s/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev));
 
162
                compare_path = g_strdup_printf ("%s/%s", NM_DBUS_PATH_DEVICE, nm_device_get_iface (dev));
163
163
                escaped_compare_path = nm_dbus_escape_object_path (compare_path);
164
164
                g_free (compare_path);
165
165
                len = strlen (escaped_compare_path);