← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock/oneiric-201106091216

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-animations.c

  • Committer: Daniel Holbach
  • Date: 2011-06-09 11:35:26 UTC
  • mfrom: (17.1.1 cairo-dock)
  • Revision ID: daniel.holbach@canonical.com-20110609113526-1dm2g5r75wyyd49n
Tags: 2.3.0~2-0ubuntu1
https://launchpad.net/bugs/773280
https://launchpad.net/bugs/786104
* New upstream release. (LP: #786104)
* Upstream ChangeLog:
 - Fixed a crash that occured when a class sub-dock was destroyed
    (LP: #773280)
 - Fixed a major bug where the dock couldn't re-appear after a
    menu has been triggerd from outside the dock (ie, from a shortcut)
* debian/patches:
 - Added an upstream's patch to fix an annoying bug when we slowly
    leave the dock with the cursor on the edge of it

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-animations.c
378
378
                                pIcon->fInsertRemoveFactor = 0.;  // on le fait avant le reload, sinon l'icone n'est pas rechargee.
379
379
                                if (!pIcon->bIsHidden && myTaskbarParam.bHideVisibleApplis)  // on lui remet l'image normale qui servira d'embleme lorsque l'icone sera inseree a nouveau dans le dock.
380
380
                                        cairo_dock_reload_icon_image (pIcon, CAIRO_CONTAINER (pDock));
381
 
                                cairo_dock_detach_appli (pIcon);
 
381
                                pDock = cairo_dock_detach_appli (pIcon);
 
382
                                if (pDock == NULL)
 
383
                                {
 
384
                                        cairo_dock_free_icon (pIcon);
 
385
                                        return FALSE;
 
386
                                }
382
387
                        }
383
388
                        else
384
389
                        {