diff options
| author | Didier Roche <didier.roche@canonical.com> | 2010-09-23 14:03:17 +0200 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2010-09-23 14:03:17 +0200 |
| commit | 44b6154b191f1393557973e4f914ec96f5941e90 (patch) | |
| tree | 5edaf0e01daae3752eca13e58918ed63842bf7c1 | |
| parent | 7777c56381e567550df35f77c8703662d42b7114 (diff) | |
Cherry pick from upstream bzr to avoid crash when clicking on system
indicators (LP: #645923) Fixes LP: #645923 (bzr r55.3.192)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | vapi/indicator.vapi | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a9eae3b3b..81662fca4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +unity (0.2.42-0ubuntu2) UNRELEASED; urgency=low + + * Cherry pick from upstream bzr to avoid crash when clicking on system + indicators (LP: #645923) + + -- Didier Roche <didrocks@ubuntu.com> Thu, 23 Sep 2010 14:01:07 +0200 + unity (0.2.42-0ubuntu1) maverick; urgency=low * New upstream release: diff --git a/vapi/indicator.vapi b/vapi/indicator.vapi index 7a4b34d58..6848af34d 100644 --- a/vapi/indicator.vapi +++ b/vapi/indicator.vapi @@ -27,7 +27,7 @@ namespace Indicator { [NoWrapper] public virtual unowned Gtk.Menu get_menu (); [NoWrapper] - public virtual void entry_activate (Indicator.ObjectEntry entry, uint timestamp); + public void entry_activate (Indicator.ObjectEntry entry, uint timestamp); public virtual void indicator_object_reserved_1 (); public virtual signal void entry_added (Indicator.ObjectEntry entry); public virtual signal void entry_moved (Indicator.ObjectEntry entry, uint old_pos, uint new_pos); |