← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gnome-panel/panel-layout.c

  • Committer: Bazaar Package Importer
  • Author(s): Jeremy Bicha
  • Date: 2011-08-17 21:57:14 UTC
  • mfrom: (1.13.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20110817215714-mr18pl4hqedmprd7
Tags: 1:3.1.5-0ubuntu1
* New upstream release.
* debian/control: Bump gnome-menus dependencies
* debian/libpanel-applet-4-dev.install: No longer any *.a files to install
* debian/patches/09_default_icons.patch: Disabled until it can be ported
* debian/patches/90_build_fixes.patch: Dropped, applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-panel/panel-layout.c
889
889
{
890
890
        char       **ids;
891
891
        GSList      *to_remove;
892
 
        gboolean     loading;
893
892
        gboolean     found;
894
893
        const char  *id;
895
894
        GSList      *l;
924
923
 
925
924
        /* Add what appeared in the layout */
926
925
 
927
 
        loading = FALSE;
928
 
 
929
926
        for (i = 0; ids[i] != NULL; i++) {
930
927
                found = FALSE;
931
928
 
940
937
                        }
941
938
                }
942
939
 
943
 
                if (!found) {
 
940
                if (!found)
944
941
                        panel_layout_load_object (ids[i]);
945
 
                        loading = TRUE;
946
 
                }
947
942
        }
948
943
 
949
944
        g_strfreev (ids);
950
945
 
951
 
        /* Always do this, even if loading is FALSE: if a panel has been
952
 
         * created, we want a do_load() to unhide it, even if there is no
953
 
         * object to load */
 
946
        /* Always do this, even if there is no object that got loaded: if a
 
947
         * panel has been created, we want a do_load() to unhide it, even if
 
948
         * there is no object to load */
954
949
        panel_object_loader_do_load (FALSE);
955
950
}
956
951