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

« back to all changes in this revision

Viewing changes to src/gconf-helpers/gconf-upgrade.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Alexander Sack, Mathieu Trudel
  • Date: 2009-09-24 15:30:33 UTC
  • mfrom: (1.2.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090924153033-3vgr750vd9im5r22
Tags: 0.8~a~git.20090923t220421.1ac8ffd-0ubuntu1
* upstream snapshot 2009-09-23 22:04:21 (GMT)
  + 1ac8ffd41a2d162d23713415cec6c3e96fbc3c82 
  + new upstream UI for beta (prepatched) - LP: #435333
  + mini-abi transition respin for libnm-glib-vpn rename fixes LP: #435888

[ Alexander Sack <asac@ubuntu.com> ]
* increase build-depend version requirements for network-manager bits to
  latest upstream (>= 0.8~a~git.20090923t064445)
  - update debian/control
* add new nm08 applet prepatch and add icons not shippable in diff manually
  using uudecode
  - add debian/patches/nm08-applet-preview.patch
  - update debian/patches/series
  - add debian/icons/22/nm-secure-lock.png.uue
  - update debian/rules

[ Mathieu Trudel <mathieu.tl@gmail.com> ]
* fix noisy output: use grep -q -c rather than just -c in GET_SOURCE etc.
  - update debian/rules
* add get-snapshot-info rule
  - update debian/rules
* make GET_SOURCE not go mad for git versions that use a different abbrev-id syntax
  - update debian/rules
* drop ellipsize patch, addressed libhal issues, superseded by the use of udev
  - delete debian/patches/lp341940_use_ellipsized_menu_entries.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
869
869
                            const char *setting,
870
870
                            const char *key)
871
871
{
 
872
        GConfValue *val;
872
873
        char *path;
873
874
 
874
875
        path = g_strdup_printf ("%s/%s/%s", dir, setting, key);
875
 
        gconf_client_unset (client, path, NULL);
 
876
        val = gconf_client_get_without_default (client, path, NULL);
 
877
        if (val) {
 
878
                if (val->type != GCONF_VALUE_INVALID)
 
879
                        gconf_client_unset (client, path, NULL);
 
880
                gconf_value_free (val);
 
881
        }
876
882
        g_free (path);
877
883
}
878
884
 
1464
1470
 
1465
1471
                next:
1466
1472
                        g_free (key_name);
1467
 
                }
1468
 
 
1469
 
                /* delete old vpn-properties dir */
1470
 
                gconf_client_recursive_unset (client, path, 0, NULL);
 
1473
                        gconf_entry_unref (entry);
 
1474
                }
 
1475
 
 
1476
                if (properties) {
 
1477
                        g_slist_free (properties);
 
1478
 
 
1479
                        /* delete old vpn-properties dir */
 
1480
                        gconf_client_recursive_unset (client, path, 0, NULL);
 
1481
                }
 
1482
 
1471
1483
                g_free (path);
1472
1484
        }
1473
1485
        nm_utils_slist_free (connections, g_free);