← Back to branch summary

~ubuntu-branches/ubuntu/utopic/cairo-dock/utopic

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-desklet-factory.c

  • Committer: Matthieu Baerts
  • Date: 2012-08-18 12:02:27 UTC
  • mto: This revision was merged to the branch mainline in revision 30.
  • Revision ID: matttbe@gmail.com-20120818120227-egczdficyxkeitzf
Tags: upstream-3.0.99.beta1
Import upstream version 3.0.99.beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-desklet-factory.c
152
152
                pDesklet->iDesiredWidth = 0;
153
153
                pDesklet->iDesiredHeight = 0;
154
154
                
155
 
                cairo_dock_load_desklet_decorations (pDesklet);
 
155
                cairo_dock_load_desklet_decorations (pDesklet);  // reload the decorations at the new desklet size.
156
156
                
157
157
                if (pDesklet->pIcon != NULL && pDesklet->pIcon->pModuleInstance != NULL)
158
158
                {
170
170
                                {
171
171
                                        pIcon->iImageWidth = pIcon->fWidth;
172
172
                                        pIcon->iImageHeight = pIcon->fHeight;
173
 
                                        if (pIcon->iImageWidth > 0)
 
173
                                        if (pIcon->iImageWidth > 0)  // the view displays the main icon -> load it.
174
174
                                                cairo_dock_load_icon_buffers (pIcon, CAIRO_CONTAINER (pDesklet));  // pas de trigger, car on veut pouvoir associer un contexte a l'icone principale tout de suite.
175
175
                                }
176
176
                                
838
838
{
839
839
        if (pDesklet == NULL)
840
840
                return;
841
 
 
 
841
        
842
842
        if (pDesklet->iSidWriteSize != 0)
843
843
                g_source_remove (pDesklet->iSidWriteSize);
844
844
        if (pDesklet->iSidWritePosition != 0)