Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/controlpanel/gui.py
diff options
context:
space:
mode:
authorSantiago Collazo <scollazo@activitycentral.com>2013-05-20 14:04:18 (GMT)
committer Santiago Collazo <scollazo@activitycentral.com>2013-05-20 14:04:18 (GMT)
commit99d2a541c472911af5bb56035b56a7a197b8aaf5 (patch)
treea2c51d8e703e0e4353273a77e95b20a211ae721c /src/jarabe/controlpanel/gui.py
parent374643150988c296f2c5aa6de239138481a1e822 (diff)
parent43702a73b2832c7a8d995c2003fd5b5f93c13697 (diff)
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
Conflicts: po/es.po
Diffstat (limited to 'src/jarabe/controlpanel/gui.py')
-rw-r--r--src/jarabe/controlpanel/gui.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 0a53a60..0ebf43f 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -380,6 +380,9 @@ class ControlPanel(Gtk.Window):
from jarabe.view.keyhandler import set_key_handlers_active
set_key_handlers_active(True)
+ from jarabe.view.buddymenu import set_control_panel
+ set_control_panel(None)
+
self.destroy()
def __close_request_cb(self, widget, event=None):