← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-class-manager.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 20:31:25 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100907203125-tkq6wc8rw0flx5se
Tags: 2.2.0~0rc1-0ubuntu1
https://launchpad.net/bugs/632055
https://launchpad.net/bugs/618336
https://launchpad.net/bugs/614686
https://launchpad.net/bugs/612617
https://launchpad.net/bugs/612355
https://launchpad.net/bugs/611733
* New Upstream Version (LP: #632055)
* Fixed a few bugs on LP:
 - LP: #618336 all button tips visible if icons 'maximum zoom' set to 1.0
 - LP: #614686 create new sud-dock icon that looking like flat
 - LP: #612617 Add custom launchers or sub-docks, can't modify name.
 - LP: #612355 Add option in config file to set GL/Cairo mode            
 - LP: #611733 icon labels go off-screen
* Fixed a crash when changing theme or gauges
* Updated translations

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-class-manager.c
37
37
#include "cairo-dock-icon-loader.h"
38
38
#include "cairo-dock-internal-taskbar.h"
39
39
#include "cairo-dock-internal-icons.h"
 
40
#include "cairo-dock-internal-indicators.h"
40
41
#include "cairo-dock-container.h"
41
42
#include "cairo-dock-animations.h"
42
43
#include "cairo-dock-application-facility.h"
561
562
                        cd_debug ("  %s", pInhibatorIcon->cName);
562
563
                        if (! CAIRO_DOCK_ICON_TYPE_IS_APPLET (pInhibatorIcon))
563
564
                        {
564
 
                                cd_message ("%s va fournir genereusement sa surface", pInhibatorIcon->cName);
565
 
                                return cairo_dock_duplicate_inhibator_surface_for_appli (pInhibatorIcon, iWidth, iHeight);
 
565
                                if (pInhibatorIcon->pSubDock == NULL || myIndicators.bUseClassIndic)  // dans le cas d'un lanceur qui aurait deja plusieurs instances de sa classe, et qui les representerait en pile, on ne prend pas son icone.
 
566
                                {
 
567
                                        cd_debug ("%s va fournir genereusement sa surface", pInhibatorIcon->cName);
 
568
                                        return cairo_dock_duplicate_inhibator_surface_for_appli (pInhibatorIcon, iWidth, iHeight);
 
569
                                }
566
570
                        }
567
571
                }
568
572
        }
579
583
        }
580
584
        
581
585
        cd_debug ("classe %s prend l'icone X", cClass);
582
 
        
583
586
        return NULL;
584
587
}
585
588
 
597
600
                        
598
601
                        if (pInhibatorIcon->Xid == Xid)
599
602
                        {
600
 
                                cd_message (" %s aussi se %s", pInhibatorIcon->cName, (bIsHidden ? "cache" : "montre"));
 
603
                                cd_debug (" %s aussi se %s", pInhibatorIcon->cName, (bIsHidden ? "cache" : "montre"));
601
604
                                pInhibatorIcon->bIsHidden = bIsHidden;
602
605
                                if (! CAIRO_DOCK_ICON_TYPE_IS_APPLET (pInhibatorIcon) && myTaskBar.fVisibleAppliAlpha != 0)
603
606
                                {
623
626
                        
624
627
                        if (pInhibatorIcon->Xid == Xid)
625
628
                        {
626
 
                                cd_message (" %s aussi devient active", pInhibatorIcon->cName);
 
629
                                cd_debug (" %s aussi devient active", pInhibatorIcon->cName);
627
630
                                ///pInhibatorIcon->bIsActive = TRUE;
628
631
                                CairoDock *pParentDock = cairo_dock_search_dock_from_name (pInhibatorIcon->cParentDockName);
629
632
                                if (pParentDock != NULL)
646
649
                        
647
650
                        if (pInhibatorIcon->Xid == Xid)
648
651
                        {
649
 
                                cd_message (" %s aussi devient inactive", pInhibatorIcon->cName);
 
652
                                cd_debug (" %s aussi devient inactive", pInhibatorIcon->cName);
650
653
                                ///pInhibatorIcon->bIsActive = FALSE;
651
654
                                CairoDock *pParentDock = cairo_dock_search_dock_from_name (pInhibatorIcon->cParentDockName);
652
655
                                if (pParentDock != NULL && ! pParentDock->bIsShrinkingDown)
674
677
                                {
675
678
                                        if (! CAIRO_DOCK_ICON_TYPE_IS_APPLET (pInhibatorIcon))
676
679
                                        {
677
 
                                                cd_message (" %s change son nom en %s", pInhibatorIcon->cName, cNewName);
 
680
                                                cd_debug (" %s change son nom en %s", pInhibatorIcon->cName, cNewName);
678
681
                                                if (pInhibatorIcon->cInitialName == NULL)
679
682
                                                {
680
683
                                                        pInhibatorIcon->cInitialName = pInhibatorIcon->cName;