← Back to branch summary

~ubuntu-branches/ubuntu/karmic/network-manager/karmic

« back to all changes in this revision

Viewing changes to system-settings/src/dbus-settings.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-04-06 12:43:31 UTC
  • mfrom: (1.1.25 upstream)
  • Revision ID: james.westby@ubuntu.com-20090406124331-gbo7kiyhoxv51rg6
Tags: 0.7.1~rc4-0ubuntu1
https://launchpad.net/bugs/351803
https://launchpad.net/bugs/319918
* upstream release 0.7.1 rc4
  + http://git.freedesktop.org/NetworkManager/NetworkManager/
  + NETWORKMANAGER_0_7 (branch)
    - dont send AT commands to serial consoles that are not using a modem driver 
    - nozomi probing (LP: #351803)
    - allow users with polkit authorization to view/edit secrets for system connections
    - fix crash that might be LP: #319918
* allow connection sharing out of the box; we add dnsmasq-base to Recommends:
  - update control

Show diffs side-by-side

added added

removed removed

Lines of Context:
system-settings/src/dbus-settings.c
355
355
{
356
356
        NMSysconfigSettingsPrivate *priv = NM_SYSCONFIG_SETTINGS_GET_PRIVATE (self);
357
357
        char hostname[HOST_NAME_MAX + 2];
 
358
        GError *error = NULL;
358
359
 
359
360
        priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL);
360
361
        priv->unmanaged_devices = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
361
362
 
362
 
        priv->pol_ctx = create_polkit_context ();
 
363
        priv->pol_ctx = create_polkit_context (&error);
 
364
        if (!priv->pol_ctx) {
 
365
                g_warning ("%s: failed to create PolicyKit context: %s",
 
366
                           __func__,
 
367
                           (error && error->message) ? error->message : "(unknown)");
 
368
        }
363
369
 
364
370
        /* Grab hostname on startup and use that if no plugins provide one */
365
371
        memset (hostname, 0, sizeof (hostname));