← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 20:31:25 UTC
  • mto: (18.1.1 cairo-dock) (19.1.1 cairo-dock)
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: james.westby@ubuntu.com-20100907203125-a91ch8odv2r6ziic
Tags: upstream-2.2.0~0rc1
Import upstream version 2.2.0~0rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-modules.c
702
702
                cairo_destroy (pInstance->pDrawContext);
703
703
        
704
704
        if (pInstance->pIcon != NULL)
 
705
        {
 
706
                if (pInstance->pIcon->pSubDock != NULL)
 
707
                {
 
708
                        cairo_dock_destroy_dock (pInstance->pIcon->pSubDock, pInstance->pIcon->cName);
 
709
                        pInstance->pIcon->pSubDock = NULL;
 
710
                }
705
711
                pInstance->pIcon->pModuleInstance = NULL;
 
712
        }
706
713
}
707
714
 
708
715
void cairo_dock_deinstanciate_module (CairoDockModuleInstance *pInstance)
777
784
                                pNewDock = cairo_dock_search_dock_from_name (cDockName);
778
785
                                if (pNewDock == NULL)  // c'est un nouveau dock.
779
786
                                {
 
787
                                        cairo_dock_add_root_dock_config_for_name (cDockName);
780
788
                                        pNewDock = cairo_dock_create_dock (cDockName, NULL);
781
789
                                }
782
790
                                pNewContainer = CAIRO_CONTAINER (pNewDock);
906
914
        {
907
915
                if (pCurrentDock->iRefCount == 0 && pCurrentDock->icons == NULL && !pCurrentDock->bIsMainDock)  // dock principal vide.
908
916
                {
909
 
                        cairo_dock_destroy_dock (pCurrentDock, cOldDockName);
 
917
                        ///cairo_dock_destroy_dock (pCurrentDock, cOldDockName);
 
918
                        pCurrentDock = NULL;  // se fera detruire automatiquement.
910
919
                }
911
920
                else
912
921
                {
964
973
        do
965
974
        {
966
975
                if (j == 0)
967
 
                        cInstanceFilePath = g_strdup (module->cConfFilePath);
 
976
                        cInstanceFilePath = g_strdup (module->cConfFilePath);  // NULL si cConfFilePath l'est.
968
977
                else
969
978
                        cInstanceFilePath = g_strdup_printf ("%s-%d",  module->cConfFilePath, j);
970
979
                
977
986
                cairo_dock_instanciate_module (module, cInstanceFilePath);  // prend possession de 'cInstanceFilePath'.
978
987
                
979
988
                j ++;
980
 
        } while (1);
 
989
        } while (cInstanceFilePath != NULL);
981
990
        
982
991
        if (j == 0)
983
992
        {