← Back to branch summary

~ubuntu-branches/ubuntu/precise/unity-2d/precise-security

« back to all changes in this revision

Viewing changes to libunity-2d-private/src/windowsintersectmonitor.cpp

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-03-05 09:52:30 UTC
  • mfrom: (1.1.28)
  • Revision ID: package-import@ubuntu.com-20120305095230-alpmktmmfnjs2t4b
Tags: 5.6.0-0ubuntu1
https://launchpad.net/bugs/944724
https://launchpad.net/bugs/812104
https://launchpad.net/bugs/932092
https://launchpad.net/bugs/942045
https://launchpad.net/bugs/942031
https://launchpad.net/bugs/841902
https://launchpad.net/bugs/932291
https://launchpad.net/bugs/936881
https://launchpad.net/bugs/939586
https://launchpad.net/bugs/934059
* New upstream release
  - [dash] [hud] If no active window, shell processes crashes (LP: #944724)
  - Long delay on session logout (LP: #812104)
  - apps/docs are not launched when performing a search on the home lens
    (LP: #932092)
  - [unity-2d] FF exception to add HUD to Unity2d (LP: #942045)
  - There's a gap between the launcher and the upper panel (LP: #942031)
  - Dash - Genre filter category in the Music Lens should use a 3 column
    layout (LP: #841902)
  - selected lens arrow should be on top instead of bottom (LP: #932291)
  - [launcher] pixel-perfection fixes, new assets, tile & pip position,
    border line & context menu position (LP: #936881)
  - Workspace switcher icon should not generate background from icon
    (LP: #939586)
  - No glow assets still needed X Y Z (LP: #934059)
* Revert an upstream commit to ensure that there is not regression with
  libunity-core 5.4 (change will be introduced again when unity 5.6 released)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libunity-2d-private/src/windowsintersectmonitor.cpp
16
16
 
17
17
// libunity-2d
18
18
#include <debug_p.h>
 
19
#include "gobjectcallback.h"
19
20
 
20
21
// Qt
21
22
#include <QCursor>
29
30
#include <libwnck/libwnck.h>
30
31
}
31
32
 
32
 
// Handy macros to declare GObject callbacks. The 'n' in CALLBACKn refers to
33
 
// the number of dummy arguments the callback returns
34
 
#define GOBJECT_CALLBACK0(callbackName, slot) \
35
 
static void \
36
 
callbackName(GObject* src, QObject* dst) \
37
 
{ \
38
 
    QMetaObject::invokeMethod(dst, slot); \
39
 
}
40
 
 
41
 
#define GOBJECT_CALLBACK1(callbackName, slot) \
42
 
static void \
43
 
callbackName(GObject* src, void* dummy1, QObject* dst) \
44
 
{ \
45
 
    QMetaObject::invokeMethod(dst, slot); \
46
 
}
47
 
 
48
 
#define GOBJECT_CALLBACK2(callbackName, slot) \
49
 
static void \
50
 
callbackName(GObject* src, void* dummy1, void* dummy2, QObject* dst) \
51
 
{ \
52
 
    QMetaObject::invokeMethod(dst, slot); \
53
 
}
54
 
 
55
33
// Screen callbacks
56
34
GOBJECT_CALLBACK1(activeWindowChangedCB, "updateActiveWindowConnections");
57
35
GOBJECT_CALLBACK1(activeWorkspaceChangedCB, "updateIntersect");