← Back to branch summary

~vanvugt/unity/fix-865006

« back to all changes in this revision

Viewing changes to launcher/LauncherModel.h

  • Committer: Andrea Azzarone
  • Date: 2012-06-12 08:23:23 UTC
  • mfrom: (2400 unity)
  • mto: This revision was merged to the branch mainline in revision 2404.
  • Revision ID: azzaronea@gmail.com-20120612082323-zdw8jxwjcia8vi71
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/LauncherModel.h
20
20
#ifndef LAUNCHERMODEL_H
21
21
#define LAUNCHERMODEL_H
22
22
 
23
 
#include <memory>
24
 
 
 
23
#include <UnityCore/GLibSource.h>
25
24
#include "AbstractLauncherIcon.h"
26
25
#include "unity-shared/Introspectable.h"
27
 
#include <sigc++/sigc++.h>
28
26
 
29
27
namespace unity
30
28
{
99
97
  Base             _inner_main;
100
98
  int              selection_;
101
99
  std::list<unity::debug::Introspectable*> introspection_results_;
 
100
  glib::SourceManager timeouts_;
102
101
 
103
102
  bool Populate();
104
103
 
105
104
  bool IconShouldShelf(AbstractLauncherIcon::Ptr icon) const;
106
105
 
107
 
  static gboolean RemoveCallback(gpointer data);
108
 
 
109
106
  static bool CompareIcons(AbstractLauncherIcon::Ptr first, AbstractLauncherIcon::Ptr second);
110
107
 
111
108
  /* Template Methods */