← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/25_dynamic_fusa_detection.patch/gnome-panel/applet.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Martin Pitt
  • Date: 2010-06-23 10:26:28 UTC
  • mfrom: (1.13.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20100623102628-p68n4gjw74mtv5js
Tags: 1:2.30.2-0ubuntu1
https://launchpad.net/bugs/128735
* New upstream version:
  Panel
  - Make sure that newly-created panels become unhidden 
  Notification Area Applet
  - Fix issues with old-style multiscreen setups (lp: #128735)
  Misc
  - Link the clock applet with libm 
* debian/gnome-panel.preinst: set debhelper token
* debian/patches/90_git_new_unhidden.patch:
  - dropped, the fix is in the new version

[ Martin Pitt ]
* Remove transitional code that is only relevant for upgrading from old
  Ubuntu releases to lucid:
  - Remove debian/indicator-applet.desktop, debian/add-indicator-applet.py,
    debian/fusa-applet.note.in, debian/migrate-fusa-config.py
  - debian/gnome-panel.install, debian/rules: Remove installation of above
    files.
  - Remove debian/gnome-panel.preinst, no relevant code any more
  - Remove debian/patches/20_fusa_migration_note_i18n.patch
  - Add debian/gnome-panel.preinst: Clean up indicator-applet.desktop and
    /usr/share/gconf/defaults/25_gnome_panel_indicator_applet on upgrade.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/25_dynamic_fusa_detection.patch/gnome-panel/applet.c
1033
1033
void
1034
1034
panel_applet_load_queued_applets (gboolean initial_load)
1035
1035
{
1036
 
        if (initial_load) {
1037
 
                if (!panel_applets_to_load) {
1038
 
                        panel_applet_queue_initial_unhide_toplevels (NULL);
1039
 
                        return;
1040
 
                } else {
1041
 
                        /* Install a timeout to make sure we don't block the
1042
 
                         * unhiding because of an applet that doesn't load */
1043
 
                        panel_applet_unhide_toplevels_timeout =
1044
 
                                g_timeout_add_seconds (UNHIDE_TOPLEVELS_TIMEOUT_SECONDS,
1045
 
                                                       panel_applet_queue_initial_unhide_toplevels,
1046
 
                                                       NULL);
1047
 
                }
 
1036
        if (!panel_applets_to_load) {
 
1037
                panel_applet_queue_initial_unhide_toplevels (NULL);
 
1038
                return;
 
1039
        }
 
1040
 
 
1041
        if (initial_load && panel_applets_to_load) {
 
1042
                /* Install a timeout to make sure we don't block the
 
1043
                 * unhiding because of an applet that doesn't load */
 
1044
                panel_applet_unhide_toplevels_timeout =
 
1045
                        g_timeout_add_seconds (UNHIDE_TOPLEVELS_TIMEOUT_SECONDS,
 
1046
                                               panel_applet_queue_initial_unhide_toplevels,
 
1047
                                               NULL);
1048
1048
        }
1049
1049
 
1050
1050
        panel_applets_to_load = g_slist_sort (panel_applets_to_load,