summaryrefslogtreecommitdiff
diff options
authorSven Baars <svenb.linux@gmail.com>2012-02-07 16:30:12 -0500
committerTarmac <>2012-02-07 16:30:12 -0500
commit6afabbf1a2cc460329bee79b0dd4ee2ee6e43f04 (patch)
tree0353e4b7664ffe7195cc3863eec0c99aa9356d72
parent73902c4d7dc46be2eff5ca3f846dc538975db1ed (diff)
parent9a208b7fe3d46f729812ae7d972570e1ec01f829 (diff)
This should fix
==1994== Conditional jump or move depends on uninitialised value(s) ==1994== at 0x19F439E9: unity::launcher::Launcher::DndHoveredIconReset() (in /usr/lib/compiz/libunityshell.so) ==1994== by 0x19F44025: unity::launcher::Launcher::OnUpdateDragManagerTimeout(void*) (in /usr/lib/compiz/libunityshell.so) ==1994== by 0x670876A: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0) ==1994== by 0x6707B29: g_main_context_dispatch (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0) ==1994== by 0x6707EEF: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0) ==1994== by 0x67082E9: g_main_loop_run (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0) ==1994== by 0x42E855: CompScreen::eventLoop() (in /usr/bin/compiz) ==1994== by 0x422219: main (in /usr/bin/compiz) This is my first commit to unity, so I thought I'd just pick something easy to get used to bzr/launchpad. If you guys would like some more fixes of valgrind warnings, and prefer fixes for other specific warnings, or like to get more fixes in one commit (instead of one per commit), then just tell me so I know this next time.. Fixes: . Approved by Thomi Richards. (bzr r1919)
-rw-r--r--plugins/unityshell/src/Launcher.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/unityshell/src/Launcher.cpp b/plugins/unityshell/src/Launcher.cpp
index a3e5b9571..c2fcde1a7 100644
--- a/plugins/unityshell/src/Launcher.cpp
+++ b/plugins/unityshell/src/Launcher.cpp
@@ -224,6 +224,7 @@ Launcher::Launcher(nux::BaseWindow* parent,
_hidden = false;
_render_drag_window = false;
_drag_edge_touching = false;
+ _steal_drag = false;
_last_button_press = 0;
_selection_atom = 0;
_drag_out_id = 0;
@@ -2659,10 +2660,7 @@ void Launcher::DndHoveredIconReset()
}
if (!_steal_drag && _dnd_hovered_icon)
- {
_dnd_hovered_icon->SendDndLeave();
- _dnd_hovered_icon = nullptr;
- }
_steal_drag = false;
_dnd_hovered_icon = nullptr;