Merge lp:~sbte/unity/fix-919328 into lp:unity

[Sven Baars]

Initialize _is_grabbed before use. Also remove some comparisons to true and false.

Fixes https://bugs.launchpad.net/unity/+bug/919328

[Thomi Richards (thomir-deactivatedaccount)]

Looks great - thanks.

review: Approve

=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2012-02-07 23:25:11 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2012-02-08 18:26:19 +0000
@@ -63,6 +63,7 @@
     _is_inside(false),
     _is_maximized(false),
     _is_own_window(false),
+    _is_grabbed(false),
     _last_active_view(nullptr),
     _new_application(nullptr),
     _last_width(0),
@@ -258,7 +259,7 @@
 {
   bool mouse_inside = TestMousePointerInclusionFilterMouseWheel(mouse_position, event_type);
 
-  if (mouse_inside == false)
+  if (!mouse_inside)
     return nullptr;
 
   Area* found_area = nullptr;
@@ -1644,7 +1645,7 @@
 void
 PanelMenuView::OnPanelViewMouseEnter(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state)
 {
-  if (_is_inside != true)
+  if (!_is_inside)
   {
     if (_is_grabbed)
       _is_grabbed = false;
@@ -1658,7 +1659,7 @@
 void
 PanelMenuView::OnPanelViewMouseLeave(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state)
 {
-  if (_is_inside != false)
+  if (_is_inside)
   {
     _is_inside = false;
     FullRedraw();