diff options
| -rw-r--r-- | services/panel-service.c | 9 | ||||
| -rw-r--r-- | src/PanelMenuView.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/services/panel-service.c b/services/panel-service.c index 305ebe55c..72f9292f1 100644 --- a/services/panel-service.c +++ b/services/panel-service.c @@ -568,6 +568,13 @@ on_indicator_menu_show_now_changed (IndicatorObject *object, g_free (entry_id); } +static const gchar * indicator_environment[] = { + "unity", + "unity-3d", + "unity-panel-service", + NULL +}; + static void load_indicator (PanelService *self, IndicatorObject *object, const gchar *_name) { @@ -575,6 +582,8 @@ load_indicator (PanelService *self, IndicatorObject *object, const gchar *_name) gchar *name; GList *entries, *entry; + indicator_object_set_environment(object, (const GStrv)indicator_environment); + if (_name != NULL) name = g_strdup (_name); else diff --git a/src/PanelMenuView.cpp b/src/PanelMenuView.cpp index 9720dd480..f3cef55e2 100644 --- a/src/PanelMenuView.cpp +++ b/src/PanelMenuView.cpp @@ -948,7 +948,7 @@ PanelMenuView::OnMaximizedGrab (int x, int y) if (window_xid != 0) { WindowManager::Default ()->Activate (window_xid); - _is_inside = false; + _is_inside = true; _is_grabbed = true; Refresh (); FullRedraw (); |