← Back to branch summary

~3v1n0/unity/scale-window-cast-protection

« back to all changes in this revision

Viewing changes to launcher/TrashLauncherIcon.cpp

  • Committer: Marco Trevisan (Treviño)
  • Date: 2015-12-07 16:13:42 UTC
  • mto: (4067.6.1 unity)
  • mto: This revision was merged to the branch mainline in revision 4069.
  • Revision ID: mail@3v1n0.net-20151207161342-qv68puyy6nr5rciy
FileManagerLauncherIcon: fix diamond-problem by using virtual inheritance of WindowedLauncherIcon

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/TrashLauncherIcon.cpp
44
44
}
45
45
 
46
46
TrashLauncherIcon::TrashLauncherIcon(FileManager::Ptr const& fm)
47
 
  : StorageLauncherIcon(IconType::TRASH, fm ? fm : GnomeFileManager::Get())
 
47
  : WindowedLauncherIcon(IconType::TRASH)
 
48
  , StorageLauncherIcon(GetIconType(), fm ? fm : GnomeFileManager::Get())
48
49
  , empty_(true)
49
50
{
50
51
  tooltip_text = _("Trash");