Compiz

Merge lp:~mc-return/compiz/compiz.merge-fix1178228-improved-ABI-logic into lp:compiz/0.9.10

  1. compiz.merge-fix1178228-improved-ABI-logic
  2. Merge into 0.9.10
Proposed by MC Return
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3690
Merged at revision: 3689
Proposed branch: lp:~mc-return/compiz/compiz.merge-fix1178228-improved-ABI-logic
Merge into: lp:compiz/0.9.10
Diff against target: 1998 lines (+499/-547)
87 files modified
plugins/addhelper/src/addhelper.cpp (+5/-5)
plugins/animation/src/animation.cpp (+11/-11)
plugins/animationaddon/src/animationaddon.cpp (+12/-11)
plugins/annotate/src/annotate.cpp (+5/-5)
plugins/bench/src/bench.cpp (+5/-6)
plugins/bicubic/src/bicubic.cpp (+5/-7)
plugins/blur/src/blur.cpp (+5/-6)
plugins/ccp/src/ccp.cpp (+3/-3)
plugins/clone/src/clone.cpp (+5/-5)
plugins/colorfilter/src/colorfilter.cpp (+6/-10)
plugins/commands/src/commands.cpp (+3/-4)
plugins/compiztoolbox/src/compiztoolbox.cpp (+12/-11)
plugins/composite/src/composite.cpp (+9/-8)
plugins/copytex/src/copytex.cpp (+4/-4)
plugins/crashhandler/src/crashhandler.cpp (+3/-3)
plugins/cube/src/cube.cpp (+11/-11)
plugins/cubeaddon/src/cubeaddon.cpp (+6/-6)
plugins/dbus/src/dbus.cpp (+4/-3)
plugins/decor/src/decor.cpp (+3/-4)
plugins/expo/src/expo.cpp (+5/-7)
plugins/extrawm/src/extrawm.cpp (+8/-8)
plugins/ezoom/src/ezoom.cpp (+6/-6)
plugins/fade/src/fade.cpp (+6/-7)
plugins/fadedesktop/src/fadedesktop.cpp (+5/-5)
plugins/firepaint/src/firepaint.cpp (+5/-5)
plugins/freewins/src/freewins.cpp (+6/-8)
plugins/gears/src/gears.cpp (+5/-7)
plugins/gnomecompat/src/gnomecompat.cpp (+3/-3)
plugins/grid/src/grid.cpp (+3/-3)
plugins/group/src/init.cpp (+11/-11)
plugins/imgjpeg/src/imgjpeg.cpp (+3/-4)
plugins/imgpng/src/imgpng.cpp (+3/-4)
plugins/imgsvg/src/imgsvg.cpp (+7/-7)
plugins/inotify/src/inotify.cpp (+3/-4)
plugins/kde/src/kde.cpp (+3/-3)
plugins/kdecompat/src/kdecompat.cpp (+5/-5)
plugins/loginout/src/loginout.cpp (+5/-5)
plugins/mag/src/mag.cpp (+6/-9)
plugins/maximumize/src/maximumize.cpp (+3/-3)
plugins/mblur/src/mblur.cpp (+5/-5)
plugins/mousepoll/src/mousepoll.cpp (+9/-8)
plugins/move/src/move.cpp (+3/-3)
plugins/neg/src/neg.cpp (+5/-5)
plugins/notification/src/notification.cpp (+3/-3)
plugins/obs/src/obs.cpp (+5/-5)
plugins/opacify/src/opacify.cpp (+6/-9)
plugins/opengl/src/opengl.cpp (+10/-9)
plugins/place/src/place.cpp (+3/-6)
plugins/put/src/put.cpp (+5/-7)
plugins/reflex/src/reflex.cpp (+5/-7)
plugins/regex/src/regex.cpp (+3/-3)
plugins/resize/src/resize.cpp (+3/-6)
plugins/resizeinfo/src/resizeinfo.cpp (+5/-5)
plugins/ring/src/ring.cpp (+10/-10)
plugins/rotate/src/rotate.cpp (+6/-7)
plugins/scale/src/scale.cpp (+12/-10)
plugins/scaleaddon/src/scaleaddon.cpp (+11/-11)
plugins/scalefilter/src/scalefilter.cpp (+4/-6)
plugins/screenshot/src/screenshot.cpp (+6/-6)
plugins/session/src/session.cpp (+3/-3)
plugins/shelf/src/shelf.cpp (+6/-8)
plugins/shift/src/shift.cpp (+10/-10)
plugins/showdesktop/src/showdesktop.cpp (+5/-7)
plugins/showmouse/src/showmouse.cpp (+6/-6)
plugins/showrepaint/src/showrepaint.cpp (+5/-6)
plugins/snap/src/snap.cpp (+3/-4)
plugins/splash/src/splash.cpp (+5/-5)
plugins/stackswitch/src/stackswitch.cpp (+11/-11)
plugins/staticswitcher/src/staticswitcher.cpp (+6/-7)
plugins/switcher/src/switcher.cpp (+6/-7)
plugins/td/src/3d.cpp (+6/-6)
plugins/text/src/text.cpp (+10/-8)
plugins/thumbnail/src/thumbnail.cpp (+7/-10)
plugins/titleinfo/src/titleinfo.cpp (+3/-3)
plugins/trailfocus/src/trailfocus.cpp (+5/-7)
plugins/trip/src/trip.cpp (+5/-5)
plugins/vpswitch/src/vpswitch.cpp (+3/-3)
plugins/wall/src/wall.cpp (+6/-10)
plugins/wallpaper/src/wallpaper.cpp (+5/-7)
plugins/water/src/water.cpp (+11/-8)
plugins/widget/src/widget.cpp (+5/-7)
plugins/winrules/src/winrules.cpp (+3/-4)
plugins/wizard/src/wizard.cpp (+6/-6)
plugins/wobbly/src/wobbly.cpp (+5/-6)
plugins/workarounds/src/workarounds.cpp (+6/-6)
plugins/workspacenames/src/workspacenames.cpp (+7/-6)
tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp (+3/-3)
To merge this branch: bzr merge lp:~mc-return/compiz/compiz.merge-fix1178228-improved-ABI-logic
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sam Spilsbury Approve
MC Return Needs Resubmitting
Review via email: mp+163150@code.launchpad.net

Commit message

Improved and optimized ABI logic checks consistently for all plugins.

(LP: #1178228)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

This looks fine to me - although in future the water plugin's hardware check should really be moved to the WaterScreen ctor and setFailed () called upon failure.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/38/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-raring-amd64-autolanding/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-raring-armhf-autolanding/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-raring-i386-autolanding/38/console

review: Needs Fixing (continuous-integration)
lp:~mc-return/compiz/compiz.merge-fix1178228-improved-ABI-logic updated
3690. By MC Return

Merged latest lp:compiz and resolved conflicts

Revision history for this message
MC Return (mc-return) wrote :

Merged latest lp:compiz and fixed conflicts.

review: Needs Resubmitting
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve
Revision history for this message
MC Return (mc-return) wrote :

Thanks, Sam ;)

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/addhelper/src/addhelper.cpp'
2--- plugins/addhelper/src/addhelper.cpp 2013-02-26 02:35:34 +0000
3+++ plugins/addhelper/src/addhelper.cpp 2013-05-10 06:36:26 +0000
4@@ -243,10 +243,10 @@
5 bool
6 AddPluginVTable::init ()
7 {
8- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
9- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
10- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
11- return false;
12+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
13+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
14+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
15+ return true;
16
17- return true;
18+ return false;
19 }
20
21=== modified file 'plugins/animation/src/animation.cpp'
22--- plugins/animation/src/animation.cpp 2013-04-25 11:07:54 +0000
23+++ plugins/animation/src/animation.cpp 2013-05-10 06:36:26 +0000
24@@ -3078,16 +3078,17 @@
25 bool
26 AnimPluginVTable::init ()
27 {
28- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
29- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
30- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
31- return false;
32-
33- CompPrivate p;
34- p.uval = ANIMATION_ABI;
35- ::screen->storeValue ("animation_ABI", p);
36-
37- return true;
38+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
39+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
40+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
41+ {
42+ CompPrivate p;
43+ p.uval = ANIMATION_ABI;
44+ ::screen->storeValue ("animation_ABI", p);
45+ return true;
46+ }
47+
48+ return false;
49 }
50
51 void
52@@ -3095,4 +3096,3 @@
53 {
54 ::screen->eraseValue ("animation_ABI");
55 }
56-
57
58=== modified file 'plugins/animationaddon/src/animationaddon.cpp'
59--- plugins/animationaddon/src/animationaddon.cpp 2013-02-27 11:33:10 +0000
60+++ plugins/animationaddon/src/animationaddon.cpp 2013-05-10 06:36:26 +0000
61@@ -258,17 +258,18 @@
62 bool
63 AnimAddonPluginVTable::init ()
64 {
65- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
66- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
67- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) |
68- !CompPlugin::checkPluginABI ("animation", ANIMATION_ABI))
69- return false;
70-
71- CompPrivate p;
72- p.uval = ANIMATIONADDON_ABI;
73- ::screen->storeValue ("animationaddon_ABI", p);
74-
75- return true;
76+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
77+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
78+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
79+ CompPlugin::checkPluginABI ("animation", ANIMATION_ABI))
80+ {
81+ CompPrivate p;
82+ p.uval = ANIMATIONADDON_ABI;
83+ ::screen->storeValue ("animationaddon_ABI", p);
84+ return true;
85+ }
86+
87+ return false;
88 }
89
90 void
91
92=== modified file 'plugins/annotate/src/annotate.cpp'
93--- plugins/annotate/src/annotate.cpp 2013-01-28 13:44:52 +0000
94+++ plugins/annotate/src/annotate.cpp 2013-05-10 06:36:26 +0000
95@@ -1037,10 +1037,10 @@
96 bool
97 AnnoPluginVTable::init ()
98 {
99- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
100- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
101- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
102- return false;
103+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
104+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
105+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
106+ return true;
107
108- return true;
109+ return false;
110 }
111
112=== modified file 'plugins/bench/src/bench.cpp'
113--- plugins/bench/src/bench.cpp 2013-02-27 11:33:10 +0000
114+++ plugins/bench/src/bench.cpp 2013-05-10 06:36:26 +0000
115@@ -470,11 +470,10 @@
116 bool
117 BenchPluginVTable::init ()
118 {
119- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
120- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
121- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
122- return false;
123+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
124+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
125+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
126+ return true;
127
128- return true;
129+ return false;
130 }
131-
132
133=== modified file 'plugins/bicubic/src/bicubic.cpp'
134--- plugins/bicubic/src/bicubic.cpp 2010-09-30 22:21:03 +0000
135+++ plugins/bicubic/src/bicubic.cpp 2013-05-10 06:36:26 +0000
136@@ -305,12 +305,10 @@
137 bool
138 BicubicPluginVTable::init ()
139 {
140- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
141- return false;
142- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
143- return false;
144- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
145- return false;
146+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
147+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
148+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
149+ return true;
150
151- return true;
152+ return false;
153 }
154
155=== modified file 'plugins/blur/src/blur.cpp'
156--- plugins/blur/src/blur.cpp 2012-09-07 22:37:20 +0000
157+++ plugins/blur/src/blur.cpp 2013-05-10 06:36:26 +0000
158@@ -2329,11 +2329,10 @@
159 bool
160 BlurPluginVTable::init ()
161 {
162- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
163- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
164- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
165- return false;
166+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
167+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
168+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
169+ return true;
170
171- return true;
172+ return false;
173 }
174-
175
176=== modified file 'plugins/ccp/src/ccp.cpp'
177--- plugins/ccp/src/ccp.cpp 2013-02-11 17:24:26 +0000
178+++ plugins/ccp/src/ccp.cpp 2013-05-10 06:36:26 +0000
179@@ -533,8 +533,8 @@
180 bool
181 CcpPluginVTable::init ()
182 {
183- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
184- return false;
185+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
186+ return true;
187
188- return true;
189+ return false;
190 }
191
192=== modified file 'plugins/clone/src/clone.cpp'
193--- plugins/clone/src/clone.cpp 2012-12-10 03:28:47 +0000
194+++ plugins/clone/src/clone.cpp 2013-05-10 06:36:26 +0000
195@@ -589,10 +589,10 @@
196 bool
197 ClonePluginVTable::init ()
198 {
199- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
200- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
201- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
202- return false;
203+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
204+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
205+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
206+ return true;
207
208- return true;
209+ return false;
210 }
211
212=== modified file 'plugins/colorfilter/src/colorfilter.cpp'
213--- plugins/colorfilter/src/colorfilter.cpp 2012-09-04 15:33:44 +0000
214+++ plugins/colorfilter/src/colorfilter.cpp 2013-05-10 06:36:26 +0000
215@@ -479,19 +479,15 @@
216 bool
217 ColorfilterPluginVTable::init ()
218 {
219- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
220- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
221- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
222- {
223- compLogMessage ("colorfilter", CompLogLevelError, "Required plugins "\
224- "'opengl' and 'composite' are not loaded");
225- return false;
226- }
227-
228 if (!GL::fragmentProgram)
229 compLogMessage ("colorfilter", CompLogLevelWarn, "No fragment" \
230 "support, the plugin will continue to load but nothing"\
231 "will happen");
232
233- return true;
234+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
235+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
236+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
237+ return true;
238+
239+ return false;
240 }
241
242=== modified file 'plugins/commands/src/commands.cpp'
243--- plugins/commands/src/commands.cpp 2012-01-18 16:26:45 +0000
244+++ plugins/commands/src/commands.cpp 2013-05-10 06:36:26 +0000
245@@ -128,9 +128,8 @@
246 bool
247 CommandsPluginVTable::init ()
248 {
249- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
250- return false;
251+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
252+ return true;
253
254- return true;
255+ return false;
256 }
257-
258
259=== modified file 'plugins/compiztoolbox/src/compiztoolbox.cpp'
260--- plugins/compiztoolbox/src/compiztoolbox.cpp 2012-12-10 03:28:47 +0000
261+++ plugins/compiztoolbox/src/compiztoolbox.cpp 2013-05-10 06:36:26 +0000
262@@ -715,20 +715,21 @@
263 bool
264 CompizToolboxPluginVTable::init ()
265 {
266- openGLAvailable = true;
267-
268- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
269- return false;
270-
271- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
272- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
273+ if (CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
274+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
275+ openGLAvailable = true;
276+ else
277 openGLAvailable = false;
278
279- CompPrivate p;
280- p.uval = COMPIZ_COMPIZTOOLBOX_ABI;
281- screen->storeValue ("compiztoolbox_ABI", p);
282+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
283+ {
284+ CompPrivate p;
285+ p.uval = COMPIZ_COMPIZTOOLBOX_ABI;
286+ screen->storeValue ("compiztoolbox_ABI", p);
287+ return true;
288+ }
289
290- return true;
291+ return false;
292 }
293
294 void
295
296=== modified file 'plugins/composite/src/composite.cpp'
297--- plugins/composite/src/composite.cpp 2013-04-13 13:53:39 +0000
298+++ plugins/composite/src/composite.cpp 2013-05-10 06:36:26 +0000
299@@ -92,14 +92,15 @@
300 bool
301 CompositePluginVTable::init ()
302 {
303- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
304- return false;
305-
306- CompPrivate p;
307- p.uval = COMPIZ_COMPOSITE_ABI;
308- screen->storeValue ("composite_ABI", p);
309-
310- return true;
311+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
312+ {
313+ CompPrivate p;
314+ p.uval = COMPIZ_COMPOSITE_ABI;
315+ screen->storeValue ("composite_ABI", p);
316+ return true;
317+ }
318+
319+ return false;
320 }
321
322 void
323
324=== modified file 'plugins/copytex/src/copytex.cpp'
325--- plugins/copytex/src/copytex.cpp 2012-09-18 11:32:20 +0000
326+++ plugins/copytex/src/copytex.cpp 2013-05-10 06:36:26 +0000
327@@ -356,9 +356,9 @@
328 bool
329 CopytexPluginVTable::init ()
330 {
331- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
332- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
333- return false;
334+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
335+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
336+ return true;
337
338- return true;
339+ return false;
340 }
341
342=== modified file 'plugins/crashhandler/src/crashhandler.cpp'
343--- plugins/crashhandler/src/crashhandler.cpp 2012-05-18 06:52:20 +0000
344+++ plugins/crashhandler/src/crashhandler.cpp 2013-05-10 06:36:26 +0000
345@@ -143,8 +143,8 @@
346 bool
347 CrashPluginVTable::init ()
348 {
349- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
350- return false;
351+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
352+ return true;
353
354- return true;
355+ return false;
356 }
357
358=== modified file 'plugins/cube/src/cube.cpp'
359--- plugins/cube/src/cube.cpp 2012-12-04 15:42:09 +0000
360+++ plugins/cube/src/cube.cpp 2013-05-10 06:36:26 +0000
361@@ -1759,16 +1759,17 @@
362 bool
363 CubePluginVTable::init ()
364 {
365- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
366- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
367- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
368- return false;
369-
370- CompPrivate p;
371- p.uval = COMPIZ_CUBE_ABI;
372- screen->storeValue ("cube_ABI", p);
373-
374- return true;
375+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
376+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
377+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
378+ {
379+ CompPrivate p;
380+ p.uval = COMPIZ_CUBE_ABI;
381+ screen->storeValue ("cube_ABI", p);
382+ return true;
383+ }
384+
385+ return false;
386 }
387
388 void
389@@ -1776,4 +1777,3 @@
390 {
391 screen->eraseValue ("cube_ABI");
392 }
393-
394
395=== modified file 'plugins/cubeaddon/src/cubeaddon.cpp'
396--- plugins/cubeaddon/src/cubeaddon.cpp 2013-04-03 00:13:52 +0000
397+++ plugins/cubeaddon/src/cubeaddon.cpp 2013-05-10 06:36:26 +0000
398@@ -1588,11 +1588,11 @@
399 bool
400 CubeaddonPluginVTable::init ()
401 {
402- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
403- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
404- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
405- !CompPlugin::checkPluginABI ("cube", COMPIZ_CUBE_ABI))
406- return false;
407+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
408+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
409+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
410+ CompPlugin::checkPluginABI ("cube", COMPIZ_CUBE_ABI))
411+ return true;
412
413- return true;
414+ return false;
415 }
416
417=== modified file 'plugins/dbus/src/dbus.cpp'
418--- plugins/dbus/src/dbus.cpp 2013-01-28 19:38:00 +0000
419+++ plugins/dbus/src/dbus.cpp 2013-05-10 06:36:26 +0000
420@@ -1993,7 +1993,8 @@
421 bool
422 DbusPluginVTable::init ()
423 {
424- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
425- return false;
426- return true;
427+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
428+ return true;
429+
430+ return false;
431 }
432
433=== modified file 'plugins/decor/src/decor.cpp'
434--- plugins/decor/src/decor.cpp 2013-03-27 01:31:21 +0000
435+++ plugins/decor/src/decor.cpp 2013-05-10 06:36:26 +0000
436@@ -3276,9 +3276,8 @@
437 bool
438 DecorPluginVTable::init ()
439 {
440- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
441- return false;
442+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
443+ return true;
444
445- return true;
446+ return false;
447 }
448-
449
450=== modified file 'plugins/expo/src/expo.cpp'
451--- plugins/expo/src/expo.cpp 2013-04-05 14:47:00 +0000
452+++ plugins/expo/src/expo.cpp 2013-05-10 06:36:26 +0000
453@@ -1574,12 +1574,10 @@
454 bool
455 ExpoPluginVTable::init ()
456 {
457- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
458- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
459- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
460- return false;
461+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
462+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
463+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
464+ return true;
465
466- return true;
467+ return false;
468 }
469-
470-
471
472=== modified file 'plugins/extrawm/src/extrawm.cpp'
473--- plugins/extrawm/src/extrawm.cpp 2012-07-30 09:39:41 +0000
474+++ plugins/extrawm/src/extrawm.cpp 2013-05-10 06:36:26 +0000
475@@ -315,13 +315,13 @@
476 bool
477 ExtraWMPluginVTable::init ()
478 {
479- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
480- return false;
481-
482- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
483+ if (CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
484+ compositeAvailable = true;
485+ else
486 compositeAvailable = false;
487- else
488- compositeAvailable = true;
489-
490- return true;
491+
492+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
493+ return true;
494+
495+ return false;
496 }
497
498=== modified file 'plugins/ezoom/src/ezoom.cpp'
499--- plugins/ezoom/src/ezoom.cpp 2012-11-04 16:05:36 +0000
500+++ plugins/ezoom/src/ezoom.cpp 2013-05-10 06:36:26 +0000
501@@ -1994,11 +1994,11 @@
502 bool
503 ZoomPluginVTable::init ()
504 {
505- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
506- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
507- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
508- !CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
509- return false;
510+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
511+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
512+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
513+ CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
514+ return true;
515
516- return true;
517+ return false;
518 }
519
520=== modified file 'plugins/fade/src/fade.cpp'
521--- plugins/fade/src/fade.cpp 2012-12-04 12:06:11 +0000
522+++ plugins/fade/src/fade.cpp 2013-05-10 06:36:26 +0000
523@@ -380,11 +380,10 @@
524 bool
525 FadePluginVTable::init ()
526 {
527- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
528- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
529- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
530- {
531- return false;
532- }
533- return true;
534+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
535+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
536+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
537+ return true;
538+
539+ return false;
540 }
541
542=== modified file 'plugins/fadedesktop/src/fadedesktop.cpp'
543--- plugins/fadedesktop/src/fadedesktop.cpp 2010-05-05 15:05:14 +0000
544+++ plugins/fadedesktop/src/fadedesktop.cpp 2013-05-10 06:36:26 +0000
545@@ -256,10 +256,10 @@
546 bool
547 FadedesktopPluginVTable::init ()
548 {
549- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
550- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
551- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
552- return false;
553+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
554+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
555+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
556+ return true;
557
558- return true;
559+ return false;
560 }
561
562=== modified file 'plugins/firepaint/src/firepaint.cpp'
563--- plugins/firepaint/src/firepaint.cpp 2013-02-27 11:48:55 +0000
564+++ plugins/firepaint/src/firepaint.cpp 2013-05-10 06:36:26 +0000
565@@ -728,10 +728,10 @@
566 bool
567 FirePluginVTable::init ()
568 {
569- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
570- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
571- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
572- return false;
573+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
574+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
575+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
576+ return true;
577
578- return true;
579+ return false;
580 }
581
582=== modified file 'plugins/freewins/src/freewins.cpp'
583--- plugins/freewins/src/freewins.cpp 2013-02-19 16:21:42 +0000
584+++ plugins/freewins/src/freewins.cpp 2013-05-10 06:36:26 +0000
585@@ -254,18 +254,16 @@
586 bool
587 FWPluginVTable::init ()
588 {
589- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
590- return false;
591- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
592- return false;
593- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
594- return false;
595-
596 if (!screen->XShape ())
597 {
598 compLogMessage ("shelf", CompLogLevelError,
599 "No Shape extension found. IPW Usage not enabled \n");
600 }
601
602- return true;
603+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
604+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
605+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
606+ return true;
607+
608+ return false;
609 }
610
611=== modified file 'plugins/gears/src/gears.cpp'
612--- plugins/gears/src/gears.cpp 2013-04-14 23:06:27 +0000
613+++ plugins/gears/src/gears.cpp 2013-05-10 06:36:26 +0000
614@@ -382,12 +382,10 @@
615 bool
616 GearsPluginVTable::init ()
617 {
618- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
619- return false;
620- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
621- return false;
622- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
623- return false;
624+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
625+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
626+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
627+ return true;
628
629- return true;
630+ return false;
631 }
632
633=== modified file 'plugins/gnomecompat/src/gnomecompat.cpp'
634--- plugins/gnomecompat/src/gnomecompat.cpp 2009-07-17 22:20:23 +0000
635+++ plugins/gnomecompat/src/gnomecompat.cpp 2013-05-10 06:36:26 +0000
636@@ -124,8 +124,8 @@
637 bool
638 GnomeCompatPluginVTable::init ()
639 {
640- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
641- return false;
642+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
643+ return true;
644
645- return true;
646+ return false;
647 }
648
649=== modified file 'plugins/grid/src/grid.cpp'
650--- plugins/grid/src/grid.cpp 2013-04-24 20:57:29 +0000
651+++ plugins/grid/src/grid.cpp 2013-05-10 06:36:26 +0000
652@@ -1394,8 +1394,8 @@
653 bool
654 GridPluginVTable::init ()
655 {
656- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
657- return false;
658+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
659+ return true;
660
661- return true;
662+ return false;
663 }
664
665=== modified file 'plugins/group/src/init.cpp'
666--- plugins/group/src/init.cpp 2012-09-04 15:33:44 +0000
667+++ plugins/group/src/init.cpp 2013-05-10 06:36:26 +0000
668@@ -625,16 +625,16 @@
669 bool
670 GroupPluginVTable::init ()
671 {
672- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
673- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
674- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
675- !CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
676- return false;
677-
678- if (!CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
679+ if (CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
680+ gTextAvailable = true;
681+ else
682 gTextAvailable = false;
683- else
684- gTextAvailable = true;
685-
686- return true;
687+
688+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
689+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
690+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
691+ CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
692+ return true;
693+
694+ return false;
695 }
696
697=== modified file 'plugins/imgjpeg/src/imgjpeg.cpp'
698--- plugins/imgjpeg/src/imgjpeg.cpp 2013-02-27 11:33:10 +0000
699+++ plugins/imgjpeg/src/imgjpeg.cpp 2013-05-10 06:36:26 +0000
700@@ -307,9 +307,8 @@
701 bool
702 JpegPluginVTable::init ()
703 {
704- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
705- return false;
706+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
707+ return true;
708
709- return true;
710+ return false;
711 }
712-
713
714=== modified file 'plugins/imgpng/src/imgpng.cpp'
715--- plugins/imgpng/src/imgpng.cpp 2012-12-04 15:33:05 +0000
716+++ plugins/imgpng/src/imgpng.cpp 2013-05-10 06:36:26 +0000
717@@ -359,9 +359,8 @@
718 bool
719 PngPluginVTable::init ()
720 {
721- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
722- return false;
723+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
724+ return true;
725
726- return true;
727+ return false;
728 }
729-
730
731=== modified file 'plugins/imgsvg/src/imgsvg.cpp'
732--- plugins/imgsvg/src/imgsvg.cpp 2012-12-05 09:38:59 +0000
733+++ plugins/imgsvg/src/imgsvg.cpp 2013-05-10 06:36:26 +0000
734@@ -625,12 +625,13 @@
735 bool
736 SvgPluginVTable::init ()
737 {
738- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
739- return false;
740-
741- rsvg_init ();
742-
743- return true;
744+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
745+ {
746+ rsvg_init ();
747+ return true;
748+ }
749+
750+ return false;
751 }
752
753 void
754@@ -638,4 +639,3 @@
755 {
756 rsvg_term ();
757 }
758-
759
760=== modified file 'plugins/inotify/src/inotify.cpp'
761--- plugins/inotify/src/inotify.cpp 2013-02-26 00:05:01 +0000
762+++ plugins/inotify/src/inotify.cpp 2013-05-10 06:36:26 +0000
763@@ -167,9 +167,8 @@
764 bool
765 InotifyPluginVTable::init ()
766 {
767- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
768- return false;
769+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
770+ return true;
771
772- return true;
773+ return false;
774 }
775-
776
777=== modified file 'plugins/kde/src/kde.cpp'
778--- plugins/kde/src/kde.cpp 2010-02-10 17:52:40 +0000
779+++ plugins/kde/src/kde.cpp 2013-05-10 06:36:26 +0000
780@@ -61,8 +61,8 @@
781 bool
782 KdePluginVTable::init ()
783 {
784- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
785- return false;
786+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
787+ return true;
788
789- return true;
790+ return false;
791 }
792
793=== modified file 'plugins/kdecompat/src/kdecompat.cpp'
794--- plugins/kdecompat/src/kdecompat.cpp 2012-08-14 06:33:22 +0000
795+++ plugins/kdecompat/src/kdecompat.cpp 2013-05-10 06:36:26 +0000
796@@ -955,10 +955,10 @@
797 bool
798 KDECompatPluginVTable::init ()
799 {
800- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
801- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
802- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
803- return false;
804+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
805+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
806+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
807+ return true;
808
809- return true;
810+ return false;
811 }
812
813=== modified file 'plugins/loginout/src/loginout.cpp'
814--- plugins/loginout/src/loginout.cpp 2013-01-28 19:58:31 +0000
815+++ plugins/loginout/src/loginout.cpp 2013-05-10 06:36:26 +0000
816@@ -311,10 +311,10 @@
817 bool
818 LoginoutPluginVTable::init ()
819 {
820- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
821- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
822- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
823- return false;
824+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
825+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
826+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
827+ return true;
828
829- return true;
830+ return false;
831 }
832
833=== modified file 'plugins/mag/src/mag.cpp'
834--- plugins/mag/src/mag.cpp 2013-02-27 11:33:10 +0000
835+++ plugins/mag/src/mag.cpp 2013-05-10 06:36:26 +0000
836@@ -1040,14 +1040,11 @@
837 bool
838 MagPluginVTable::init ()
839 {
840- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
841- return false;
842- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
843- return false;
844- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
845- return false;
846- if (!CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
847- return false;
848+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
849+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
850+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
851+ CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
852+ return true;
853
854- return true;
855+ return false;
856 }
857
858=== modified file 'plugins/maximumize/src/maximumize.cpp'
859--- plugins/maximumize/src/maximumize.cpp 2012-09-07 22:48:26 +0000
860+++ plugins/maximumize/src/maximumize.cpp 2013-05-10 06:36:26 +0000
861@@ -577,8 +577,8 @@
862 bool
863 MaximumizePluginVTable::init ()
864 {
865- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
866- return false;
867+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
868+ return true;
869
870- return true;
871+ return false;
872 }
873
874=== modified file 'plugins/mblur/src/mblur.cpp'
875--- plugins/mblur/src/mblur.cpp 2012-09-04 15:33:44 +0000
876+++ plugins/mblur/src/mblur.cpp 2013-05-10 06:36:26 +0000
877@@ -294,10 +294,10 @@
878 bool
879 MblurPluginVTable::init ()
880 {
881- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
882- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
883- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
884- return false;
885+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
886+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
887+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
888+ return true;
889
890- return true;
891+ return false;
892 }
893
894=== modified file 'plugins/mousepoll/src/mousepoll.cpp'
895--- plugins/mousepoll/src/mousepoll.cpp 2013-02-27 11:33:10 +0000
896+++ plugins/mousepoll/src/mousepoll.cpp 2013-05-10 06:36:26 +0000
897@@ -241,14 +241,15 @@
898 bool
899 MousepollPluginVTable::init ()
900 {
901- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
902- return false;
903-
904- CompPrivate p;
905- p.uval = COMPIZ_MOUSEPOLL_ABI;
906- screen->storeValue ("mousepoll_ABI", p);
907-
908- return true;
909+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
910+ {
911+ CompPrivate p;
912+ p.uval = COMPIZ_MOUSEPOLL_ABI;
913+ screen->storeValue ("mousepoll_ABI", p);
914+ return true;
915+ }
916+
917+ return false;
918 }
919
920 void
921
922=== modified file 'plugins/move/src/move.cpp'
923--- plugins/move/src/move.cpp 2013-04-14 11:46:28 +0000
924+++ plugins/move/src/move.cpp 2013-05-10 06:36:26 +0000
925@@ -732,8 +732,8 @@
926 bool
927 MovePluginVTable::init ()
928 {
929- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
930- return false;
931+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
932+ return true;
933
934- return true;
935+ return false;
936 }
937
938=== modified file 'plugins/neg/src/neg.cpp'
939--- plugins/neg/src/neg.cpp 2012-09-04 15:33:44 +0000
940+++ plugins/neg/src/neg.cpp 2013-05-10 06:36:26 +0000
941@@ -478,10 +478,10 @@
942 bool
943 NegPluginVTable::init ()
944 {
945- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
946- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
947- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
948- return false;
949+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
950+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
951+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
952+ return true;
953
954- return true;
955+ return false;
956 }
957
958=== modified file 'plugins/notification/src/notification.cpp'
959--- plugins/notification/src/notification.cpp 2012-09-07 23:29:42 +0000
960+++ plugins/notification/src/notification.cpp 2013-05-10 06:36:26 +0000
961@@ -101,8 +101,8 @@
962 bool
963 NotificationPluginVTable::init ()
964 {
965- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
966- return false;
967+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
968+ return true;
969
970- return true;
971+ return false;
972 }
973
974=== modified file 'plugins/obs/src/obs.cpp'
975--- plugins/obs/src/obs.cpp 2013-05-09 10:43:37 +0000
976+++ plugins/obs/src/obs.cpp 2013-05-10 06:36:26 +0000
977@@ -301,10 +301,10 @@
978 bool
979 ObsPluginVTable::init ()
980 {
981- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
982- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
983- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
984- return false;
985+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
986+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
987+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
988+ return true;
989
990- return true;
991+ return false;
992 }
993
994=== modified file 'plugins/opacify/src/opacify.cpp'
995--- plugins/opacify/src/opacify.cpp 2012-09-24 12:33:26 +0000
996+++ plugins/opacify/src/opacify.cpp 2013-05-10 06:36:26 +0000
997@@ -426,13 +426,10 @@
998 bool
999 OpacifyPluginVTable::init ()
1000 {
1001- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1002- return false;
1003- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1004- return false;
1005- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1006- return false;
1007-
1008-
1009- return true;
1010+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1011+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1012+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1013+ return true;
1014+
1015+ return false;
1016 }
1017
1018=== modified file 'plugins/opengl/src/opengl.cpp'
1019--- plugins/opengl/src/opengl.cpp 2012-09-07 23:29:42 +0000
1020+++ plugins/opengl/src/opengl.cpp 2013-05-10 06:36:26 +0000
1021@@ -92,15 +92,16 @@
1022 bool
1023 OpenglPluginVTable::init ()
1024 {
1025- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1026- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1027- return false;
1028-
1029- CompPrivate p;
1030- p.uval = COMPIZ_OPENGL_ABI;
1031- screen->storeValue ("opengl_ABI", p);
1032-
1033- return true;
1034+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1035+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1036+ {
1037+ CompPrivate p;
1038+ p.uval = COMPIZ_OPENGL_ABI;
1039+ screen->storeValue ("opengl_ABI", p);
1040+ return true;
1041+ }
1042+
1043+ return false;
1044 }
1045
1046 void
1047
1048=== modified file 'plugins/place/src/place.cpp'
1049--- plugins/place/src/place.cpp 2013-04-10 12:27:25 +0000
1050+++ plugins/place/src/place.cpp 2013-05-10 06:36:26 +0000
1051@@ -1298,11 +1298,8 @@
1052 bool
1053 PlacePluginVTable::init ()
1054 {
1055- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1056- return false;
1057+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1058+ return true;
1059
1060- return true;
1061+ return false;
1062 }
1063-
1064-
1065-
1066
1067=== modified file 'plugins/put/src/put.cpp'
1068--- plugins/put/src/put.cpp 2013-03-27 12:26:30 +0000
1069+++ plugins/put/src/put.cpp 2013-05-10 06:36:26 +0000
1070@@ -1294,12 +1294,10 @@
1071 bool
1072 PutPluginVTable::init ()
1073 {
1074- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1075- return false;
1076- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1077- return false;
1078- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1079- return false;
1080+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1081+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1082+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1083+ return true;
1084
1085- return true;
1086+ return false;
1087 }
1088
1089=== modified file 'plugins/reflex/src/reflex.cpp'
1090--- plugins/reflex/src/reflex.cpp 2012-05-18 06:52:20 +0000
1091+++ plugins/reflex/src/reflex.cpp 2013-05-10 06:36:26 +0000
1092@@ -371,12 +371,10 @@
1093 bool
1094 ReflexPluginVTable::init ()
1095 {
1096- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1097- return false;
1098- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1099- return false;
1100- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1101- return false;
1102+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1103+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1104+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1105+ return true;
1106
1107- return true;
1108+ return false;
1109 }
1110
1111=== modified file 'plugins/regex/src/regex.cpp'
1112--- plugins/regex/src/regex.cpp 2012-12-10 05:35:03 +0000
1113+++ plugins/regex/src/regex.cpp 2013-05-10 06:36:26 +0000
1114@@ -323,8 +323,8 @@
1115 bool
1116 RegexPluginVTable::init ()
1117 {
1118- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1119- return false;
1120+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1121+ return true;
1122
1123- return true;
1124+ return false;
1125 }
1126
1127=== modified file 'plugins/resize/src/resize.cpp'
1128--- plugins/resize/src/resize.cpp 2012-10-19 09:23:11 +0000
1129+++ plugins/resize/src/resize.cpp 2013-05-10 06:36:26 +0000
1130@@ -485,18 +485,15 @@
1131 GLWindowInterface::setHandler (gWindow, false);
1132 }
1133
1134-
1135 ResizeWindow::~ResizeWindow ()
1136 {
1137 }
1138
1139-
1140 bool
1141 ResizePluginVTable::init ()
1142 {
1143- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1144- return false;
1145+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1146+ return true;
1147
1148- return true;
1149+ return false;
1150 }
1151-
1152
1153=== modified file 'plugins/resizeinfo/src/resizeinfo.cpp'
1154--- plugins/resizeinfo/src/resizeinfo.cpp 2013-04-08 14:53:31 +0000
1155+++ plugins/resizeinfo/src/resizeinfo.cpp 2013-05-10 06:36:26 +0000
1156@@ -553,10 +553,10 @@
1157 bool
1158 InfoPluginVTable::init ()
1159 {
1160- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1161- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1162- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1163- return false;
1164+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1165+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1166+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1167+ return true;
1168
1169- return true;
1170+ return false;
1171 }
1172
1173=== modified file 'plugins/ring/src/ring.cpp'
1174--- plugins/ring/src/ring.cpp 2013-01-19 11:47:22 +0000
1175+++ plugins/ring/src/ring.cpp 2013-05-10 06:36:26 +0000
1176@@ -1339,19 +1339,19 @@
1177 bool
1178 RingPluginVTable::init ()
1179 {
1180- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1181- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1182- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1183- return false;
1184-
1185- if (!CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1186+ if (CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1187+ textAvailable = true;
1188+ else
1189 {
1190 compLogMessage ("ring", CompLogLevelWarn, "No compatible text plugin"\
1191 " loaded");
1192 textAvailable = false;
1193 }
1194- else
1195- textAvailable = true;
1196-
1197- return true;
1198+
1199+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1200+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1201+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1202+ return true;
1203+
1204+ return false;
1205 }
1206
1207=== modified file 'plugins/rotate/src/rotate.cpp'
1208--- plugins/rotate/src/rotate.cpp 2013-03-27 01:51:57 +0000
1209+++ plugins/rotate/src/rotate.cpp 2013-05-10 06:36:26 +0000
1210@@ -1068,12 +1068,11 @@
1211 bool
1212 RotatePluginVTable::init ()
1213 {
1214- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1215- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1216- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
1217- !CompPlugin::checkPluginABI ("cube", COMPIZ_CUBE_ABI))
1218- return false;
1219+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1220+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1221+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
1222+ CompPlugin::checkPluginABI ("cube", COMPIZ_CUBE_ABI))
1223+ return true;
1224
1225- return true;
1226+ return false;
1227 }
1228-
1229
1230=== modified file 'plugins/scale/src/scale.cpp'
1231--- plugins/scale/src/scale.cpp 2013-01-29 23:16:32 +0000
1232+++ plugins/scale/src/scale.cpp 2013-05-10 06:36:26 +0000
1233@@ -1933,16 +1933,18 @@
1234 bool
1235 ScalePluginVTable::init ()
1236 {
1237- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1238- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1239- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1240- return false;
1241-
1242- CompPrivate p;
1243- p.uval = COMPIZ_SCALE_ABI;
1244- screen->storeValue ("scale_ABI", p);
1245-
1246- return true;
1247+
1248+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1249+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1250+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1251+ {
1252+ CompPrivate p;
1253+ p.uval = COMPIZ_SCALE_ABI;
1254+ screen->storeValue ("scale_ABI", p);
1255+ return true;
1256+ }
1257+
1258+ return false;
1259 }
1260
1261 void
1262
1263=== modified file 'plugins/scaleaddon/src/scaleaddon.cpp'
1264--- plugins/scaleaddon/src/scaleaddon.cpp 2012-12-04 15:22:08 +0000
1265+++ plugins/scaleaddon/src/scaleaddon.cpp 2013-05-10 06:36:26 +0000
1266@@ -1324,20 +1324,20 @@
1267 bool
1268 ScaleAddonPluginVTable::init ()
1269 {
1270- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1271- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1272- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
1273- !CompPlugin::checkPluginABI ("scale", COMPIZ_SCALE_ABI))
1274- return false;
1275-
1276- if (!CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1277+ if (CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1278+ textAvailable = true;
1279+ else
1280 {
1281 compLogMessage ("scaleaddon", CompLogLevelInfo,
1282 "Text Plugin not loaded, no text will be drawn.");
1283 textAvailable = false;
1284 }
1285- else
1286- textAvailable = true;
1287-
1288- return true;
1289+
1290+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1291+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1292+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
1293+ CompPlugin::checkPluginABI ("scale", COMPIZ_SCALE_ABI))
1294+ return true;
1295+
1296+ return false;
1297 }
1298
1299=== modified file 'plugins/scalefilter/src/scalefilter.cpp'
1300--- plugins/scalefilter/src/scalefilter.cpp 2013-02-27 11:33:10 +0000
1301+++ plugins/scalefilter/src/scalefilter.cpp 2013-05-10 06:36:26 +0000
1302@@ -589,11 +589,9 @@
1303 bool
1304 ScalefilterPluginVTable::init ()
1305 {
1306- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1307- !CompPlugin::checkPluginABI ("scale", COMPIZ_SCALE_ABI))
1308- {
1309- return false;
1310- }
1311+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1312+ CompPlugin::checkPluginABI ("scale", COMPIZ_SCALE_ABI))
1313+ return true;
1314
1315- return true;
1316+ return false;
1317 }
1318
1319=== modified file 'plugins/screenshot/src/screenshot.cpp'
1320--- plugins/screenshot/src/screenshot.cpp 2013-04-27 05:54:57 +0000
1321+++ plugins/screenshot/src/screenshot.cpp 2013-05-10 06:36:26 +0000
1322@@ -574,11 +574,11 @@
1323 bool
1324 ShotPluginVTable::init ()
1325 {
1326- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1327- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1328- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
1329- !CompPlugin::checkPluginABI ("compiztoolbox", COMPIZ_COMPIZTOOLBOX_ABI))
1330- return false;
1331+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1332+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1333+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
1334+ CompPlugin::checkPluginABI ("compiztoolbox", COMPIZ_COMPIZTOOLBOX_ABI))
1335+ return true;
1336
1337- return true;
1338+ return false;
1339 }
1340
1341=== modified file 'plugins/session/src/session.cpp'
1342--- plugins/session/src/session.cpp 2013-02-27 11:33:10 +0000
1343+++ plugins/session/src/session.cpp 2013-05-10 06:36:26 +0000
1344@@ -781,8 +781,8 @@
1345 bool
1346 SessionPluginVTable::init ()
1347 {
1348- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1349- return false;
1350+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1351+ return true;
1352
1353- return true;
1354+ return false;
1355 }
1356
1357=== modified file 'plugins/shelf/src/shelf.cpp'
1358--- plugins/shelf/src/shelf.cpp 2013-03-26 22:02:39 +0000
1359+++ plugins/shelf/src/shelf.cpp 2013-05-10 06:36:26 +0000
1360@@ -816,13 +816,6 @@
1361 bool
1362 ShelfPluginVTable::init ()
1363 {
1364- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1365- return false;
1366- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1367- return false;
1368- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1369- return false;
1370-
1371 if (!screen->XShape ())
1372 {
1373 compLogMessage ("shelf", CompLogLevelError,
1374@@ -830,5 +823,10 @@
1375 return false;
1376 }
1377
1378- return true;
1379+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1380+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1381+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1382+ return true;
1383+
1384+ return false;
1385 }
1386
1387=== modified file 'plugins/shift/src/shift.cpp'
1388--- plugins/shift/src/shift.cpp 2013-04-28 00:43:01 +0000
1389+++ plugins/shift/src/shift.cpp 2013-05-10 06:36:26 +0000
1390@@ -2093,19 +2093,19 @@
1391 bool
1392 ShiftPluginVTable::init ()
1393 {
1394- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1395- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1396- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1397- return false;
1398-
1399- if (!CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1400+ if (CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1401+ textAvailable = true;
1402+ else
1403 {
1404 compLogMessage ("shift", CompLogLevelWarn, "No compatible text plugin"\
1405 " loaded");
1406 textAvailable = false;
1407 }
1408- else
1409- textAvailable = true;
1410-
1411- return true;
1412+
1413+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1414+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1415+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1416+ return true;
1417+
1418+ return false;
1419 }
1420
1421=== modified file 'plugins/showdesktop/src/showdesktop.cpp'
1422--- plugins/showdesktop/src/showdesktop.cpp 2013-03-30 11:01:04 +0000
1423+++ plugins/showdesktop/src/showdesktop.cpp 2013-05-10 06:36:26 +0000
1424@@ -903,12 +903,10 @@
1425 bool
1426 ShowdesktopPluginVTable::init ()
1427 {
1428- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1429- return false;
1430- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1431- return false;
1432- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1433- return false;
1434+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1435+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1436+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1437+ return true;
1438
1439- return true;
1440+ return false;
1441 }
1442
1443=== modified file 'plugins/showmouse/src/showmouse.cpp'
1444--- plugins/showmouse/src/showmouse.cpp 2013-04-22 18:17:04 +0000
1445+++ plugins/showmouse/src/showmouse.cpp 2013-05-10 06:36:26 +0000
1446@@ -638,11 +638,11 @@
1447 bool
1448 ShowmousePluginVTable::init ()
1449 {
1450- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1451- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1452- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
1453- !CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
1454- return false;
1455+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1456+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1457+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
1458+ CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
1459+ return true;
1460
1461- return true;
1462+ return false;
1463 }
1464
1465=== modified file 'plugins/showrepaint/src/showrepaint.cpp'
1466--- plugins/showrepaint/src/showrepaint.cpp 2012-09-04 15:33:44 +0000
1467+++ plugins/showrepaint/src/showrepaint.cpp 2013-05-10 06:36:26 +0000
1468@@ -111,11 +111,10 @@
1469 bool
1470 ShowrepaintPluginVTable::init ()
1471 {
1472- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1473- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1474- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1475- return false;
1476+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1477+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1478+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1479+ return true;
1480
1481- return true;
1482+ return false;
1483 }
1484-
1485
1486=== modified file 'plugins/snap/src/snap.cpp'
1487--- plugins/snap/src/snap.cpp 2013-03-27 01:19:01 +0000
1488+++ plugins/snap/src/snap.cpp 2013-05-10 06:36:26 +0000
1489@@ -862,9 +862,8 @@
1490 bool
1491 SnapPluginVTable::init ()
1492 {
1493- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1494- return false;
1495+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1496+ return true;
1497
1498- return true;
1499+ return false;
1500 }
1501-
1502
1503=== modified file 'plugins/splash/src/splash.cpp'
1504--- plugins/splash/src/splash.cpp 2013-02-07 10:27:08 +0000
1505+++ plugins/splash/src/splash.cpp 2013-05-10 06:36:26 +0000
1506@@ -568,10 +568,10 @@
1507 bool
1508 SplashPluginVTable::init ()
1509 {
1510- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1511- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1512- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1513- return false;
1514+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1515+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1516+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1517+ return true;
1518
1519- return true;
1520+ return false;
1521 }
1522
1523=== modified file 'plugins/stackswitch/src/stackswitch.cpp'
1524--- plugins/stackswitch/src/stackswitch.cpp 2013-04-27 14:39:06 +0000
1525+++ plugins/stackswitch/src/stackswitch.cpp 2013-05-10 06:36:26 +0000
1526@@ -1362,19 +1362,19 @@
1527 bool
1528 StackswitchPluginVTable::init ()
1529 {
1530- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1531- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1532- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1533- return false;
1534-
1535- if (!CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1536+ if (CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1537+ textAvailable = true;
1538+ else
1539 {
1540 compLogMessage ("stackswitch", CompLogLevelWarn, "No compatible text plugin"\
1541- " loaded");
1542+ " loaded");
1543 textAvailable = false;
1544 }
1545- else
1546- textAvailable = true;
1547-
1548- return true;
1549+
1550+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1551+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1552+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1553+ return true;
1554+
1555+ return false;
1556 }
1557
1558=== modified file 'plugins/staticswitcher/src/staticswitcher.cpp'
1559--- plugins/staticswitcher/src/staticswitcher.cpp 2012-12-10 03:28:47 +0000
1560+++ plugins/staticswitcher/src/staticswitcher.cpp 2013-05-10 06:36:26 +0000
1561@@ -1435,12 +1435,11 @@
1562 bool
1563 StaticSwitchPluginVTable::init ()
1564 {
1565- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1566- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1567- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
1568- !CompPlugin::checkPluginABI ("compiztoolbox", COMPIZ_COMPIZTOOLBOX_ABI))
1569- return false;
1570+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1571+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1572+ CompPlugin::checkPluginABI ("compiztoolbox", COMPIZ_COMPIZTOOLBOX_ABI) &&
1573+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1574+ return true;
1575
1576- return true;
1577+ return false;
1578 }
1579-
1580
1581=== modified file 'plugins/switcher/src/switcher.cpp'
1582--- plugins/switcher/src/switcher.cpp 2012-12-10 03:28:47 +0000
1583+++ plugins/switcher/src/switcher.cpp 2013-05-10 06:36:26 +0000
1584@@ -1193,12 +1193,11 @@
1585 bool
1586 SwitchPluginVTable::init ()
1587 {
1588- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1589- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1590- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
1591- !CompPlugin::checkPluginABI ("compiztoolbox", COMPIZ_COMPIZTOOLBOX_ABI))
1592- return false;
1593+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1594+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1595+ CompPlugin::checkPluginABI ("compiztoolbox", COMPIZ_COMPIZTOOLBOX_ABI) &&
1596+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1597+ return true;
1598
1599- return true;
1600+ return false;
1601 }
1602-
1603
1604=== modified file 'plugins/td/src/3d.cpp'
1605--- plugins/td/src/3d.cpp 2013-02-03 17:50:59 +0000
1606+++ plugins/td/src/3d.cpp 2013-05-10 06:36:26 +0000
1607@@ -606,11 +606,11 @@
1608 bool
1609 TdPluginVTable::init ()
1610 {
1611- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1612- !CompPlugin::checkPluginABI ("cube", COMPIZ_CUBE_ABI) ||
1613- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1614- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1615- return false;
1616+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1617+ CompPlugin::checkPluginABI ("cube", COMPIZ_CUBE_ABI) &&
1618+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1619+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1620+ return true;
1621
1622- return true;
1623+ return false;
1624 }
1625
1626=== modified file 'plugins/text/src/text.cpp'
1627--- plugins/text/src/text.cpp 2013-02-27 11:33:10 +0000
1628+++ plugins/text/src/text.cpp 2013-05-10 06:36:26 +0000
1629@@ -606,14 +606,16 @@
1630 bool
1631 TextPluginVTable::init ()
1632 {
1633- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1634- return false;
1635-
1636- CompPrivate p;
1637- p.uval = COMPIZ_TEXT_ABI;
1638- screen->storeValue ("text_ABI", p);
1639-
1640- return true;
1641+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1642+ {
1643+ CompPrivate p;
1644+ p.uval = COMPIZ_TEXT_ABI;
1645+ screen->storeValue ("text_ABI", p);
1646+
1647+ return true;
1648+ }
1649+
1650+ return false;
1651 }
1652
1653 void
1654
1655=== modified file 'plugins/thumbnail/src/thumbnail.cpp'
1656--- plugins/thumbnail/src/thumbnail.cpp 2013-02-03 17:48:32 +0000
1657+++ plugins/thumbnail/src/thumbnail.cpp 2013-05-10 06:36:26 +0000
1658@@ -1219,22 +1219,19 @@
1659 ts->pointedWin = NULL;
1660 }
1661
1662-
1663 bool
1664 ThumbPluginVTable::init ()
1665 {
1666- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1667- return false;
1668- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1669- return false;
1670- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1671- return false;
1672- if (!CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
1673- return false;
1674 if (CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1675 textPluginLoaded = true;
1676 else
1677 textPluginLoaded = false;
1678
1679- return true;
1680+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1681+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1682+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
1683+ CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
1684+ return true;
1685+
1686+ return false;
1687 }
1688
1689=== modified file 'plugins/titleinfo/src/titleinfo.cpp'
1690--- plugins/titleinfo/src/titleinfo.cpp 2010-02-05 11:27:25 +0000
1691+++ plugins/titleinfo/src/titleinfo.cpp 2013-05-10 06:36:26 +0000
1692@@ -290,8 +290,8 @@
1693 bool
1694 TitleinfoPluginVTable::init ()
1695 {
1696- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1697- return false;
1698+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1699+ return true;
1700
1701- return true;
1702+ return false;
1703 };
1704
1705=== modified file 'plugins/trailfocus/src/trailfocus.cpp'
1706--- plugins/trailfocus/src/trailfocus.cpp 2013-02-03 17:43:30 +0000
1707+++ plugins/trailfocus/src/trailfocus.cpp 2013-05-10 06:36:26 +0000
1708@@ -414,12 +414,10 @@
1709 bool
1710 TrailfocusPluginVTable::init ()
1711 {
1712- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1713- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1714- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1715- {
1716- return false;
1717- }
1718+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1719+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1720+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1721+ return true;
1722
1723- return true;
1724+ return false;
1725 }
1726
1727=== modified file 'plugins/trip/src/trip.cpp'
1728--- plugins/trip/src/trip.cpp 2013-02-27 11:33:10 +0000
1729+++ plugins/trip/src/trip.cpp 2013-05-10 06:36:26 +0000
1730@@ -576,10 +576,10 @@
1731 bool
1732 TripPluginVTable::init ()
1733 {
1734- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1735- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1736- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1737- return false;
1738+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1739+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1740+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1741+ return true;
1742
1743- return true;
1744+ return false;
1745 }
1746
1747=== modified file 'plugins/vpswitch/src/vpswitch.cpp'
1748--- plugins/vpswitch/src/vpswitch.cpp 2012-05-27 04:32:55 +0000
1749+++ plugins/vpswitch/src/vpswitch.cpp 2013-05-10 06:36:26 +0000
1750@@ -356,8 +356,8 @@
1751 bool
1752 VPSwitchPluginVTable::init ()
1753 {
1754- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1755- return false;
1756+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1757+ return true;
1758
1759- return true;
1760+ return false;
1761 }
1762
1763=== modified file 'plugins/wall/src/wall.cpp'
1764--- plugins/wall/src/wall.cpp 2013-03-27 12:41:42 +0000
1765+++ plugins/wall/src/wall.cpp 2013-05-10 06:36:26 +0000
1766@@ -1768,15 +1768,11 @@
1767 bool
1768 WallPluginVTable::init ()
1769 {
1770- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1771- return false;
1772- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1773- return false;
1774- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1775- return false;
1776- if (!CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
1777- return false;
1778+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1779+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1780+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
1781+ CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
1782+ return true;
1783
1784- return true;
1785+ return false;
1786 }
1787-
1788
1789=== modified file 'plugins/wallpaper/src/wallpaper.cpp'
1790--- plugins/wallpaper/src/wallpaper.cpp 2013-01-07 10:22:56 +0000
1791+++ plugins/wallpaper/src/wallpaper.cpp 2013-05-10 06:36:26 +0000
1792@@ -688,12 +688,10 @@
1793 bool
1794 WallpaperPluginVTable::init ()
1795 {
1796- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1797- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1798- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1799- {
1800- return false;
1801- }
1802+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1803+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1804+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1805+ return true;
1806
1807- return true;
1808+ return false;
1809 }
1810
1811=== modified file 'plugins/water/src/water.cpp'
1812--- plugins/water/src/water.cpp 2013-01-28 19:45:04 +0000
1813+++ plugins/water/src/water.cpp 2013-05-10 06:36:26 +0000
1814@@ -827,25 +827,28 @@
1815 bool
1816 WaterPluginVTable::init ()
1817 {
1818- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
1819- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
1820- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1821- return false;
1822-
1823 const char *missing = NULL;
1824+
1825 if (!GL::fboSupported)
1826 missing = "framebuffer objects";
1827+
1828 if (!GL::vboSupported)
1829 missing = "vertexbuffer objects";
1830+
1831 if (!GL::shaders)
1832 missing = "GLSL";
1833+
1834 if (missing)
1835 {
1836 compLogMessage ("water", CompLogLevelError,
1837- "Missing hardware support for %s", missing);
1838+ "Missing hardware support for %s", missing);
1839 return false;
1840 }
1841
1842- return true;
1843+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1844+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1845+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1846+ return true;
1847+
1848+ return false;
1849 }
1850-
1851
1852=== modified file 'plugins/widget/src/widget.cpp'
1853--- plugins/widget/src/widget.cpp 2013-02-27 11:33:10 +0000
1854+++ plugins/widget/src/widget.cpp 2013-05-10 06:36:26 +0000
1855@@ -730,12 +730,10 @@
1856 bool
1857 WidgetPluginVTable::init ()
1858 {
1859- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1860- return false;
1861- if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
1862- return false;
1863- if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1864- return false;
1865+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1866+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1867+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1868+ return true;
1869
1870- return true;
1871+ return false;
1872 }
1873
1874=== modified file 'plugins/winrules/src/winrules.cpp'
1875--- plugins/winrules/src/winrules.cpp 2012-12-10 03:28:47 +0000
1876+++ plugins/winrules/src/winrules.cpp 2013-05-10 06:36:26 +0000
1877@@ -546,9 +546,8 @@
1878 bool
1879 WinrulesPluginVTable::init ()
1880 {
1881- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1882- return false;
1883+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1884+ return true;
1885
1886- return true;
1887+ return false;
1888 }
1889-
1890
1891=== modified file 'plugins/wizard/src/wizard.cpp'
1892--- plugins/wizard/src/wizard.cpp 2012-12-29 16:22:34 +0000
1893+++ plugins/wizard/src/wizard.cpp 2013-05-10 06:36:26 +0000
1894@@ -993,11 +993,11 @@
1895 bool
1896 WizardPluginVTable::init ()
1897 {
1898- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1899- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1900- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
1901- !CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
1902- return false;
1903+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1904+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1905+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) &&
1906+ CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
1907+ return true;
1908
1909- return true;
1910+ return false;
1911 }
1912
1913=== modified file 'plugins/wobbly/src/wobbly.cpp'
1914--- plugins/wobbly/src/wobbly.cpp 2013-03-26 22:02:39 +0000
1915+++ plugins/wobbly/src/wobbly.cpp 2013-05-10 06:36:26 +0000
1916@@ -2193,11 +2193,10 @@
1917 bool
1918 WobblyPluginVTable::init ()
1919 {
1920- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
1921- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
1922- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1923- return false;
1924+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1925+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1926+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1927+ return true;
1928
1929- return true;
1930+ return false;
1931 }
1932-
1933
1934=== modified file 'plugins/workarounds/src/workarounds.cpp'
1935--- plugins/workarounds/src/workarounds.cpp 2013-04-10 11:02:06 +0000
1936+++ plugins/workarounds/src/workarounds.cpp 2013-05-10 06:36:26 +0000
1937@@ -1167,14 +1167,14 @@
1938 bool
1939 WorkaroundsPluginVTable::init ()
1940 {
1941- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1942- return false;
1943-
1944- if ((CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI)) &&
1945- (CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI)))
1946+ if (CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1947+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1948 haveOpenGL = true;
1949 else
1950 haveOpenGL = false;
1951
1952- return true;
1953+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1954+ return true;
1955+
1956+ return false;
1957 }
1958
1959=== modified file 'plugins/workspacenames/src/workspacenames.cpp'
1960--- plugins/workspacenames/src/workspacenames.cpp 2013-04-24 07:59:56 +0000
1961+++ plugins/workspacenames/src/workspacenames.cpp 2013-05-10 06:36:26 +0000
1962@@ -268,13 +268,14 @@
1963 bool
1964 WorkspacenamesPluginVTable::init ()
1965 {
1966- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1967- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
1968- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1969- return false;
1970-
1971 if (!CompPlugin::checkPluginABI ("text", COMPIZ_TEXT_ABI))
1972 compLogMessage ("workspacenames", CompLogLevelWarn,
1973 "No compatible text plugin loaded");
1974- return true;
1975+
1976+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) &&
1977+ CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
1978+ CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
1979+ return true;
1980+
1981+ return false;
1982 }
1983
1984=== modified file 'tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp'
1985--- tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp 2013-03-21 18:19:04 +0000
1986+++ tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp 2013-05-10 06:36:26 +0000
1987@@ -225,8 +225,8 @@
1988 bool
1989 TestHelperPluginVTable::init ()
1990 {
1991- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1992- return false;
1993+ if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1994+ return true;
1995
1996- return true;
1997+ return false;
1998 }

Subscribers

People subscribed via source and target branches

to all changes: