← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/unity/oneiric

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/DeviceLauncherSection.h

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-08-01 19:53:15 UTC
  • mfrom: (1.1.49 upstream)
  • Revision ID: james.westby@ubuntu.com-20110801195315-mrewa9g7ctnk41oh
Tags: 4.6.0-0ubuntu1
https://launchpad.net/bugs/814619
https://launchpad.net/bugs/818450
https://launchpad.net/bugs/818477
https://launchpad.net/bugs/765819
https://launchpad.net/bugs/783434
https://launchpad.net/bugs/814574
https://launchpad.net/bugs/713423
https://launchpad.net/bugs/742664
https://launchpad.net/bugs/799890
https://launchpad.net/bugs/750311
https://launchpad.net/bugs/815032
https://launchpad.net/bugs/794707
https://launchpad.net/bugs/810315
https://launchpad.net/bugs/609860
https://launchpad.net/bugs/812933
* New upstream release.
  - compiz crashed with SIGSEGV in __strlen_sse2() (LP: #814619)
  - PlacesHomeView::PlacesHomeView leaks memory (LP: #818450)
  - PluginAdapter::MaximizeIfBigEnough leaks memory (LP: #818477)
  - Launcher - Make Launcher left of screen reveal more responsive and less
    prone to false positives (LP: #765819)
  - Launcher - clicking on a App launcher icon incorrectly un-minimizes
    windows (LP: #783434)
  - Unity doesn't get any mouse wheel scroll event in Indicators InputArea
    (LP: #814574)
  - Unity launcher gets cluttered when having multiple partitions and/or
    external volumes attached (LP: #713423)
  - Unity panel menus and indicators slow to respond. Too much lag.
    (LP: #742664)
  - In Unity the distinction between GVolume, GDrive and GMount is a bit
    confusing. (LP: #799890)
  - Launcher - When a item is deleted by dragging to Trash, the trash should
    pulse once before the Launcher disappears (LP: #750311)
  - ccsm needs an option to change launcher opacity (LP: #815032)
  - add a ccsm option to hide volumes in launcher (LP: #794707)
  - scale plugin doesn't work as desired when "Click Desktop To Show
    Desktop" is true (LP: #810315)
  - mute/unmute sound when user clicks on sound applet using scroll button
    or middle mouse button (LP: #609860)
  - Secondary activate (i.e. middle click) support for indicators advanced
    usage (LP: #812933)
* debian/control:
  - dep on latest libunity-misc
  - dep on latest nux
  - add build-dep on libgnome-desktop-3-dev
* debian/rules:
  - bump libunity-core-4.0-4 shlib for ABI break
  - don't ship unity dialogs right now. Not ready for alpha quality
* distro-patch the grey to darker grey (until the blur is done in nux)
* Switch to dpkg-source 3.0 (quilt) format
* debian/patches/01_revert_removed_function_for_unity2d_to_build.patch:
  - revert a removed API making unity-2d not building

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/DeviceLauncherSection.h
19
19
#ifndef _DEVICE_LAUNCHER_SECTION_H_
20
20
#define _DEVICE_LAUNCHER_SECTION_H_
21
21
 
 
22
#include <map>
 
23
 
 
24
#include <gio/gio.h>
22
25
#include <sigc++/sigc++.h>
23
26
#include <sigc++/signal.h>
24
 
 
25
 
#include "Launcher.h"
26
 
#include "LauncherIcon.h"
27
 
#include "DevicesSettings.h"
28
 
 
29
 
#include <gio/gio.h>
 
27
#include <UnityCore/GLibWrapper.h>
 
28
 
 
29
#include "DeviceLauncherIcon.h"
 
30
 
 
31
class Launcher;
 
32
class LauncherIcon;
 
33
 
 
34
namespace unity {
30
35
 
31
36
class DeviceLauncherSection : public sigc::trackable
32
37
{
38
43
 
39
44
private:
40
45
  static bool PopulateEntries(DeviceLauncherSection* self);
41
 
  static void OnVolumeAdded(GVolumeMonitor*        monitor,
42
 
                            GVolume*               volume,
 
46
  
 
47
  static void OnVolumeAdded(GVolumeMonitor* monitor,
 
48
                            GVolume* volume,
43
49
                            DeviceLauncherSection* self);
44
 
  static void OnVolumeRemoved(GVolumeMonitor*        monitor,
45
 
                              GVolume*               volume,
 
50
 
 
51
  static void OnVolumeRemoved(GVolumeMonitor* monitor,
 
52
                              GVolume* volume,
46
53
                              DeviceLauncherSection* self);
47
 
  static void OnMountAdded(GVolumeMonitor*        monitor,
48
 
                           GMount*                mount,
 
54
 
 
55
  static void OnMountAdded(GVolumeMonitor* monitor,
 
56
                           GMount* mount,
49
57
                           DeviceLauncherSection* self);
50
 
public:
51
 
  Launcher*       _launcher;
52
 
  GVolumeMonitor* _monitor;
53
 
  GHashTable*     _ht;
 
58
 
 
59
  static void OnMountPreUnmount(GVolumeMonitor* monitor,
 
60
                                GMount* mount,
 
61
                                DeviceLauncherSection* self);
54
62
 
55
63
private:
56
 
  gulong _on_volume_added_handler_id;
57
 
  gulong _on_volume_removed_handler_id;
58
 
  gulong _on_mount_added_handler_id;
59
 
  gulong _on_device_populate_entry_id;
 
64
  Launcher* launcher_;
 
65
  glib::Object<GVolumeMonitor> monitor_;
 
66
  std::map<GVolume*, DeviceLauncherIcon*> map_;
 
67
  gulong on_volume_added_handler_id_;
 
68
  gulong on_volume_removed_handler_id_;
 
69
  gulong on_mount_added_handler_id_;
 
70
  gulong on_mount_pre_unmount_handler_id_;
 
71
  gulong on_device_populate_entry_id_;
60
72
};
61
73
 
 
74
} // namespace unity
 
75
 
62
76
#endif // _DEVICE_LAUNCHER_SECTION_H_