I have made the following changes intended for : CE:UX:MTF / lipstick Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/7896 Thank You, mharju [This message was auto-generated] --- Request # 7896: Messages from BOSS: State: review at 2013-02-14T13:49:53 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:mharju:branches:CE:UX:MTF / lipstick -> CE:UX:MTF / lipstick changes files: -------------- --- lipstick.changes +++ lipstick.changes @@ -0,0 +1,3 @@ +* Thu Feb 14 2013 Mikko Harju <[email protected]> - 0.9.2 +- Fix check for _NET_WM_STATE_SKIP_TASKBAR (from Mikko) + old: ---- lipstick-0.9.1.tar.bz2 new: ---- lipstick-0.9.2.tar.bz2 spec files: ----------- --- lipstick.spec +++ lipstick.spec @@ -9,7 +9,7 @@ # << macros Summary: QML toolkit for homescreen creation -Version: 0.9.1 +Version: 0.9.2 Release: 1 Group: System/Libraries License: LGPLv2.1 other changes: -------------- ++++++ lipstick-0.9.1.tar.bz2 -> lipstick-0.9.2.tar.bz2 --- src/components/windowinfo.cpp +++ src/components/windowinfo.cpp @@ -214,28 +214,18 @@ ulong bytesLeft; uchar *propertyData = 0; - // Step 1: Get the size of the list - bool result = XGetWindowProperty(display, window, AtomCache::atom("_NET_WM_STATE"), 0, 0, + bool result = XGetWindowProperty(display, window, AtomCache::atom("_NET_WM_STATE"), 0, 12L, false, XA_ATOM, &actualType, &actualFormat, &propertyLength, &bytesLeft, &propertyData); - if (result != Success || actualType != XA_ATOM || actualFormat != 32) - return atomList; - - XFree(propertyData); - - // Step 2: Get the actual list - if (!XGetWindowProperty(display, window, AtomCache::atom("_NET_WM_STATE"), 0, - atomList.size(), false, XA_ATOM, - &actualType, &actualFormat, - &propertyLength, &bytesLeft, - &propertyData) == Success) { - qWarning("Unable to retrieve window properties: %i", (int) window); + if (result != Success || actualType != XA_ATOM || actualFormat != 32) { + if (propertyData) { + XFree(propertyData); + } return atomList; } atomList.resize(propertyLength); - if (!atomList.isEmpty()) memcpy(atomList.data(), propertyData, atomList.size() * sizeof(Atom)); --- src/src.pro +++ src/src.pro @@ -3,7 +3,7 @@ TEMPLATE = lib TARGET = lipstick -VERSION = 0.9.1 +VERSION = 0.9.2 DEFINES += LIPSTICK_BUILD_LIBRARY VERSION=\\\"$$VERSION\\\" ++++++ lipstick.yaml --- lipstick.yaml +++ lipstick.yaml @@ -1,6 +1,6 @@ Name: lipstick Summary: QML toolkit for homescreen creation -Version: 0.9.1 +Version: 0.9.2 Release: 1 Group: System/Libraries License: LGPLv2.1
