Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Collazo <scollazo@activitycentral.com>2012-12-20 09:40:20 (GMT)
committer Santiago Collazo <scollazo@activitycentral.com>2012-12-20 09:40:20 (GMT)
commit1093834b297c85f43524c79cc1c4b7bb812b26de (patch)
tree8631fb8bac92b28bdc1de3ce368aa9bf803bc194
parentb03c1c6d9f05b90049c11010ec7b40759129385b (diff)
parent6d2850708e2c95940cca965f8fd582baa92ed142 (diff)
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
-rw-r--r--src/jarabe/view/buddymenu.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 71d7f0e..f5806cd 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -34,6 +34,7 @@ from jarabe.model.session import get_session_manager
from jarabe.controlpanel.gui import ControlPanel
import jarabe.desktop.homewindow
+control_panel = None
class BuddyMenu(Palette):
def __init__(self, buddy):
@@ -189,6 +190,9 @@ class BuddyMenu(Palette):
panel = ControlPanel()
panel.show()
+ global control_panel
+ control_panel = panel
+
def _update_invite_menu(self, activity):
buddy_activity = self._buddy.props.current_activity
if buddy_activity is not None:
@@ -248,3 +252,6 @@ class BuddyMenu(Palette):
raise
else:
logging.error('Invite failed, activity service not ')
+
+def get_control_panel():
+ return control_panel