← Back to branch summary

~azzar1/unity/fix-1028810

« back to all changes in this revision

Viewing changes to launcher/DeviceLauncherIcon.h

  • Committer: Andrea Azzarone
  • Date: 2012-08-22 13:14:18 UTC
  • mfrom: (2516.1.92 unity)
  • Revision ID: azzaronea@gmail.com-20120822131418-mrfwx82k39xnvl9e
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/DeviceLauncherIcon.h
43
43
  void Eject();
44
44
 
45
45
protected:
46
 
  std::list<DbusmenuMenuitem*> GetMenus();
 
46
  MenuItemsVector GetMenus();
47
47
  std::string GetName() const;
48
48
 
49
49
private:
53
53
  void ShowMount(GMount* mount);
54
54
  void Unmount();
55
55
  void StopDrive();
56
 
  static void OnTogglePin(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
57
 
  static void OnOpen(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
58
 
  static void OnEject(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
59
 
  static void OnUnmount(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
 
56
  void OnTogglePin(DbusmenuMenuitem* item, int time);
 
57
  void OnSettingsChanged();
 
58
  void ShowNotification(std::string const&, unsigned, glib::Object<GdkPixbuf> const&, std::string const&);
 
59
  void OnVolumeChanged(GVolume* volume);
60
60
  static void OnChanged(GVolume* volume, DeviceLauncherIcon* self);
61
61
  static void OnMountReady(GObject* object, GAsyncResult* result, DeviceLauncherIcon* self);
62
62
  static void OnEjectReady(GObject* object, GAsyncResult* result, DeviceLauncherIcon* self);
63
63
  static void OnUnmountReady(GObject* object, GAsyncResult* result, DeviceLauncherIcon* self);
64
 
  static void OnDriveStop(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
65
 
  void OnVolumeChanged(GVolume* volume);
66
 
  void OnSettingsChanged();
67
 
  void ShowNotification(std::string const&, unsigned, glib::Object<GdkPixbuf> const&, std::string const&);
68
64
 
69
65
private:
70
 
  glib::Signal<void, GVolume*> signal_volume_changed_;
71
66
  glib::Source::UniquePtr changed_timeout_;
72
67
  glib::Object<GVolume> volume_;
 
68
  glib::SignalManager gsignals_;
73
69
 
74
70
  std::string name_;
75
71
  bool keep_in_launcher_;