~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to libpanel-applet/panel-applet.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-07-10 14:24:56 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090710142456-i431i68lcp91i69e
Tags: 1:2.26.3-0ubuntu1
* New upstream version
* debian/control.in:
  - typo fix
* debian/patches/18_lockdown_lock_editor.patch:
  - change to have lockdown locking the menu editor (lp: #4712, #385596)
* debian/patches/31_fix_crash_second_screen.patch:
  - the change is in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
161
161
                        gconf_engine_associate_schema (client->engine,
162
162
                                                       key, schema_key, error);
163
163
 
164
 
                        if (gconf_entry_get_value (applet_entry) == NULL ||
 
164
                        if (applet_entry == NULL ||
 
165
                            gconf_entry_get_value (applet_entry) == NULL ||
165
166
                            gconf_entry_get_is_default (applet_entry)) {
166
167
                                /* unset the key: gconf_client_get_entry()
167
168
                                 * brought an invalid entry in the client