← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2009-06-20 23:46:54 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090620234654-hlg7pqvys6temuqq
Tags: 2.0.5-0ubuntu1
https://launchpad.net/bugs/390053
* New Upstream Version. (LP: #390053)
* debian/rules: 
 - Drop autoreconf call, it's fixed upstream.
 - Call dh_desktop for all desktop files.
* debian/control:
 - Add libgtkglext1-dev as depends for cairo-dock-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cairo-dock-dock-factory.c
170
170
                        "realize",
171
171
                        G_CALLBACK (_cairo_dock_on_realize_main_dock),
172
172
                        NULL);
173
 
        g_signal_connect (G_OBJECT (pWindow),
 
173
        /*g_signal_connect (G_OBJECT (pWindow),
174
174
                "delete-event",
175
175
                G_CALLBACK (cairo_dock_on_delete),
176
 
                pDock);
 
176
                pDock);*/
177
177
        g_signal_connect (G_OBJECT (pWindow),
178
178
                "expose-event",
179
179
                G_CALLBACK (cairo_dock_on_expose),
525
525
        cairo_dock_stop_polling_screen_edge ();
526
526
 
527
527
        cairo_dock_reset_docks_table ();  // detruit tous les docks, vide la table, et met le main-dock a NULL.
 
528
        
 
529
        cairo_dock_unload_additionnal_textures ();
528
530
}
529
531
 
530
532
 
646
648
        
647
649
        cairo_dock_stop_icon_animation (icon);
648
650
        
 
651
        //\___________________ On desactive sa miniature.
 
652
        if (icon->Xid != 0)
 
653
                cairo_dock_set_xicon_geometry (icon->Xid, 0, 0, 0, 0);
 
654
        
 
655
        
649
656
        //\___________________ On l'enleve de la liste.
650
657
        if (pDock->pFirstDrawnElement != NULL && pDock->pFirstDrawnElement->data == icon)
651
658
        {