diff options
| author | Didier Roche <didier.roche@canonical.com> | 2011-02-28 20:58:17 +0100 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2011-02-28 20:58:17 +0100 |
| commit | 0cb5d5ece77fd20bbb1b010ac6be5623c4572560 (patch) | |
| tree | 2472424eee5840c70929b9ebbb7080cb547c3979 | |
| parent | 36e9520fbba8f38bb330af420a45a58e1f67f966 (diff) | |
| parent | afcc55b69b8803f82de094c02a55fd7113872665 (diff) | |
* Cherry-pick some fixes from trunk to ensure at least having those in
alpha3: - stop make the launcher dance (LP: #717364) - fix FTBFS on armel (LP: #724615) Fixed bugs: - LP: #717364 - LP: #724615 (bzr r55.3.344)
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | src/Launcher.cpp | 1 | ||||
| -rw-r--r-- | src/WindowManager.cpp | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 8e51ec950..d90c85c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +unity (3.4.6-0ubuntu2) UNRELEASED; urgency=low + + * Cherry-pick some fixes from trunk to ensure at least having those in + alpha3: + - stop make the launcher dance (LP: #717364) + - fix FTBFS on armel (LP: #724615) + + -- Didier Roche <didrocks@ubuntu.com> Mon, 28 Feb 2011 20:57:23 +0100 + unity (3.4.6-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/src/Launcher.cpp b/src/Launcher.cpp index c18b535f2..4694b0a66 100644 --- a/src/Launcher.cpp +++ b/src/Launcher.cpp @@ -316,6 +316,7 @@ Launcher::Launcher (nux::BaseWindow* parent, _hide_on_drag_hover = false; _render_drag_window = false; _dnd_window_is_mapped = false; + _drag_edge_touching = false; _backlight_mode = BACKLIGHT_NORMAL; _last_button_press = 0; _selection_atom = 0; diff --git a/src/WindowManager.cpp b/src/WindowManager.cpp index 47688f6e1..02ec71a5b 100644 --- a/src/WindowManager.cpp +++ b/src/WindowManager.cpp @@ -172,7 +172,7 @@ gdk_window_set_mwm_hints (Window xid, { GdkDisplay *display = gdk_display_get_default(); Atom hints_atom = None; - guchar *data = NULL; + MotifWmHints *data = NULL; MotifWmHints *hints = NULL; Atom type = None; gint format; @@ -189,7 +189,7 @@ gdk_window_set_mwm_hints (Window xid, xid, hints_atom, 0, sizeof (MotifWmHints)/sizeof (long), False, AnyPropertyType, &type, &format, &nitems, - &bytes_after, &data); + &bytes_after, (guchar **)&data); gdk_flush (); if (gdk_error_trap_pop ()) { @@ -201,7 +201,7 @@ gdk_window_set_mwm_hints (Window xid, hints = new_hints; else { - hints = (MotifWmHints *)data; + hints = data; if (new_hints->flags & MWM_HINTS_FUNCTIONS) { |