← Back to branch summary

~ubuntu-branches/ubuntu/lucid/network-manager-applet/lucid-updates

« back to all changes in this revision

Viewing changes to src/wireless-security/helpers.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Alexander Sack, Tony Espy
  • Date: 2009-09-14 11:32:57 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090914113257-47x5o2kfwwm95w3l
Tags: 0.8~a~git.20090913t161448.cc2f6be-0ubuntu1
* upstream snapshot 2009-09-13 16:14:48 (GMT)
  + cc2f6bea12daec5f0caf535a3534f07ade5b5cf2

[ Alexander Sack <asac@ubuntu.com> ]
* build depend on libpolkit-gobject-1-dev instead of libpolkit-dbus-dev
  - update debian/control

[ Tony Espy <espy@ubuntu.com> ]
* adjust patches for upstream code base
  - update debian/patches/20_use_full_vpn_dialog_service_name_path.patch
  - update debian/patches/lp328572_dxteam_connect_text.patch
  - update debian/patches/lp337960_dxteam_notification_icon_names.diff
  - update debian/patches/lp341684_device_sensitive_disconnect_notify.patch
* adjust build and runtime depends due to ABI changes in latest NM
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wireless-security/helpers.c
31
31
                          const char *secret_name)
32
32
{
33
33
        NMSetting *setting;
34
 
        GHashTable *secrets;
35
 
        GError *error = NULL;
36
 
        GValue *value;
37
34
        const char *tmp;
38
35
 
39
36
        g_return_if_fail (connection != NULL);
43
40
        g_return_if_fail (secret_name != NULL);
44
41
 
45
42
        setting = nm_connection_get_setting (connection, setting_type);
46
 
 
47
 
        if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) {
48
 
                if (setting) {
49
 
                        tmp = (*func) (setting);
50
 
                        if (tmp)
51
 
                                gtk_entry_set_text (entry, tmp);
52
 
                }
53
 
        } else {
54
 
                secrets = nm_gconf_get_keyring_items (connection, setting_name, FALSE, &error);
55
 
                if (!secrets) {
56
 
                        g_clear_error (&error);
57
 
                        return;
58
 
                }
59
 
 
60
 
                value = g_hash_table_lookup (secrets, secret_name);
61
 
                if (value)
62
 
                        gtk_entry_set_text (entry, g_value_get_string (value));
63
 
                g_hash_table_destroy (secrets);
 
43
        if (setting) {
 
44
                tmp = (*func) (setting);
 
45
                if (tmp)
 
46
                        gtk_entry_set_text (entry, tmp);
64
47
        }
65
48
}
66
49