Compiz

Merge lp:~vanvugt/compiz/fix-1076876 into lp:compiz/0.9.9

  1. fix-1076876
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3459
Merged at revision: 3459
Proposed branch: lp:~vanvugt/compiz/fix-1076876
Merge into: lp:compiz/0.9.9
Diff against target: 419 lines (+51/-51)
1 file modified
debian/patches/100_expo_layout.patch (+51/-51)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1076876
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+133617@code.launchpad.net

Commit message

Refresh 100_expo_layout.patch so it applies cleanly and reduces the
likelihood of conflicts later.
(LP: #1076876)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/patches/100_expo_layout.patch'
--- debian/patches/100_expo_layout.patch 2012-11-08 06:22:21 +0000
+++ debian/patches/100_expo_layout.patch 2012-11-09 06:28:19 +0000
@@ -1,7 +1,7 @@
1Index: ubuntu/plugins/expo/expo.xml.in1Index: ubuntu/plugins/expo/expo.xml.in
2===================================================================2===================================================================
3--- ubuntu.orig/plugins/expo/expo.xml.in 2012-09-12 22:20:42.944758828 +08003--- ubuntu.orig/plugins/expo/expo.xml.in 2012-11-09 14:08:43.708467616 +0800
4+++ ubuntu/plugins/expo/expo.xml.in 2012-09-12 22:20:43.240760303 +08004+++ ubuntu/plugins/expo/expo.xml.in 2012-11-09 14:09:37.532468627 +0800
5@@ -17,6 +17,7 @@5@@ -17,6 +17,7 @@
6 <plugin>wobbly</plugin>6 <plugin>wobbly</plugin>
7 <plugin>animation</plugin>7 <plugin>animation</plugin>
@@ -123,8 +123,8 @@
123 <precision>0.01</precision>123 <precision>0.01</precision>
124Index: ubuntu/plugins/expo/src/expo.cpp124Index: ubuntu/plugins/expo/src/expo.cpp
125===================================================================125===================================================================
126--- ubuntu.orig/plugins/expo/src/expo.cpp 2012-09-12 22:09:32.323735000 +0800126--- ubuntu.orig/plugins/expo/src/expo.cpp 2012-11-09 14:08:43.708467616 +0800
127+++ ubuntu/plugins/expo/src/expo.cpp 2012-09-12 22:29:50.643474721 +0800127+++ ubuntu/plugins/expo/src/expo.cpp 2012-11-09 14:09:37.532468627 +0800
128@@ -27,6 +27,8 @@128@@ -27,6 +27,8 @@
129 129
130 #include "expo.h"130 #include "expo.h"
@@ -134,8 +134,8 @@
134 #include <math.h>134 #include <math.h>
135 #ifndef USE_GLES135 #ifndef USE_GLES
136 #include <GL/glu.h>136 #include <GL/glu.h>
137@@ -73,11 +75,10 @@137@@ -65,11 +67,10 @@
138 138 {
139 if (dndState == DnDDuring || dndState == DnDStart)139 if (dndState == DnDDuring || dndState == DnDStart)
140 {140 {
141- if (dndWindow)141- if (dndWindow)
@@ -147,7 +147,7 @@
147 147
148 action->setState (action->state () & CompAction::StateInitButton);148 action->setState (action->state () & CompAction::StateInitButton);
149 cScreen->damageScreen ();149 cScreen->damageScreen ();
150@@ -113,7 +114,6 @@150@@ -101,7 +102,6 @@
151 clickTime = 0;151 clickTime = 0;
152 152
153 dndState = DnDNone;153 dndState = DnDNone;
@@ -155,7 +155,7 @@
155 155
156 selectedVp = screen->vp ();156 selectedVp = screen->vp ();
157 lastSelectedVp = screen->vp ();157 lastSelectedVp = screen->vp ();
158@@ -156,8 +156,8 @@158@@ -140,8 +140,8 @@
159 else159 else
160 vpUpdateMode = VPUpdateMouseOver;160 vpUpdateMode = VPUpdateMouseOver;
161 161
@@ -166,7 +166,7 @@
166 166
167 screen->removeAction (&optionGetDndButton ());167 screen->removeAction (&optionGetDndButton ());
168 screen->removeAction (&optionGetExitButton ());168 screen->removeAction (&optionGetExitButton ());
169@@ -202,6 +202,8 @@169@@ -179,6 +179,8 @@
170 if (!expoMode)170 if (!expoMode)
171 return false;171 return false;
172 172
@@ -175,7 +175,7 @@
175 newX = selectedVp.x () + 1;175 newX = selectedVp.x () + 1;
176 newY = selectedVp.y ();176 newY = selectedVp.y ();
177 177
178@@ -225,7 +227,7 @@178@@ -202,7 +204,7 @@
179 CompAction::State state,179 CompAction::State state,
180 CompOption::Vector& options)180 CompOption::Vector& options)
181 {181 {
@@ -184,7 +184,7 @@
184 184
185 if (!expoMode)185 if (!expoMode)
186 return false;186 return false;
187@@ -272,53 +274,39 @@187@@ -246,53 +248,39 @@
188 void188 void
189 ExpoScreen::finishWindowMovement ()189 ExpoScreen::finishWindowMovement ()
190 {190 {
@@ -265,7 +265,7 @@
265 }265 }
266 266
267 void267 void
268@@ -402,6 +390,80 @@268@@ -376,6 +364,80 @@
269 screen->handleEvent (event);269 screen->handleEvent (event);
270 }270 }
271 271
@@ -346,7 +346,7 @@
346 void346 void
347 ExpoScreen::preparePaint (int msSinceLastPaint)347 ExpoScreen::preparePaint (int msSinceLastPaint)
348 {348 {
349@@ -412,33 +474,43 @@349@@ -386,33 +448,43 @@
350 else350 else
351 expoCam = MAX (0.0, expoCam - val);351 expoCam = MAX (0.0, expoCam - val);
352 352
@@ -409,7 +409,7 @@
409 {409 {
410 float fi = (float) i;410 float fi = (float) i;
411 411
412@@ -509,6 +581,31 @@412@@ -483,6 +555,31 @@
413 cScreen->paint (outputs, mask);413 cScreen->paint (outputs, mask);
414 }414 }
415 415
@@ -441,7 +441,7 @@
441 void441 void
442 ExpoScreen::donePaint ()442 ExpoScreen::donePaint ()
443 {443 {
444@@ -539,6 +636,11 @@444@@ -513,6 +610,11 @@
445 foreach (float& vp, vpActivity)445 foreach (float& vp, vpActivity)
446 if (vp != 0.0 && vp != 1.0)446 if (vp != 0.0 && vp != 1.0)
447 cScreen->damageScreen ();447 cScreen->damageScreen ();
@@ -453,7 +453,7 @@
453 }453 }
454 454
455 if (grabIndex && expoCam <= 0.0f && !expoMode)455 if (grabIndex && expoCam <= 0.0f && !expoMode)
456@@ -553,10 +655,25 @@456@@ -527,10 +629,25 @@
457 switch (dndState) {457 switch (dndState) {
458 case DnDDuring:458 case DnDDuring:
459 {459 {
@@ -483,7 +483,7 @@
483 483
484 prevCursor = newCursor;484 prevCursor = newCursor;
485 cScreen->damageScreen ();485 cScreen->damageScreen ();
486@@ -621,13 +738,13 @@486@@ -595,13 +712,13 @@
487 break;487 break;
488 488
489 dndState = DnDDuring;489 dndState = DnDDuring;
@@ -499,7 +499,7 @@
499 499
500 w->raise ();500 w->raise ();
501 w->moveInputFocusTo ();501 w->moveInputFocusTo ();
502@@ -762,6 +879,124 @@502@@ -736,6 +853,124 @@
503 }503 }
504 504
505 void505 void
@@ -624,7 +624,7 @@
624 ExpoScreen::paintWall (const GLScreenPaintAttrib& attrib,624 ExpoScreen::paintWall (const GLScreenPaintAttrib& attrib,
625 const GLMatrix& transform,625 const GLMatrix& transform,
626 const CompRegion& region,626 const CompRegion& region,
627@@ -772,13 +1007,11 @@627@@ -746,13 +981,11 @@
628 GLfloat vertexData[12];628 GLfloat vertexData[12];
629 GLushort colorData[16];629 GLushort colorData[16];
630 GLMatrix sTransformW, sTransform (transform);630 GLMatrix sTransformW, sTransform (transform);
@@ -641,7 +641,7 @@
641 float aspectX = 1.0f, aspectY = 1.0f;641 float aspectX = 1.0f, aspectY = 1.0f;
642 GLVector cam;642 GLVector cam;
643 CompPoint vpSize (screen->vpSize ().width (), screen->vpSize ().height ());643 CompPoint vpSize (screen->vpSize ().width (), screen->vpSize ().height ());
644@@ -910,9 +1143,24 @@644@@ -884,9 +1117,24 @@
645 sTransform.rotate (rotation, 0.0f, 1.0f, 0.0f);645 sTransform.rotate (rotation, 0.0f, 1.0f, 0.0f);
646 sTransform.scale (aspectX, aspectY, 1.0);646 sTransform.scale (aspectX, aspectY, 1.0);
647 647
@@ -668,7 +668,7 @@
668 668
669 if (optionGetDeform () == DeformCurve)669 if (optionGetDeform () == DeformCurve)
670 sTransform.translate ((vpSize.x () - 1) * sx * 0.5, 0.0, 0.0);670 sTransform.translate ((vpSize.x () - 1) * sx * 0.5, 0.0, 0.0);
671@@ -936,90 +1184,29 @@671@@ -910,90 +1158,29 @@
672 672
673 expoActive = true;673 expoActive = true;
674 674
@@ -774,7 +774,7 @@
774 // glNormal3f (0.0, 0.0, -1.0);774 // glNormal3f (0.0, 0.0, -1.0);
775 775
776 if (reflection)776 if (reflection)
777@@ -1187,12 +1374,16 @@777@@ -1161,12 +1348,16 @@
778 778
779 expoActive = false;779 expoActive = false;
780 780
@@ -793,7 +793,7 @@
793 bool793 bool
794 ExpoScreen::glPaintOutput (const GLScreenPaintAttrib& attrib,794 ExpoScreen::glPaintOutput (const GLScreenPaintAttrib& attrib,
795 const GLMatrix& transform,795 const GLMatrix& transform,
796@@ -1243,10 +1434,15 @@796@@ -1217,10 +1408,15 @@
797 797
798 bool798 bool
799 ExpoWindow::glDraw (const GLMatrix& transform,799 ExpoWindow::glDraw (const GLMatrix& transform,
@@ -810,7 +810,7 @@
810 if (eScreen->expoCam == 0.0f)810 if (eScreen->expoCam == 0.0f)
811 return gWindow->glDraw (transform, attrib, region, mask);811 return gWindow->glDraw (transform, attrib, region, mask);
812 812
813@@ -1275,8 +1471,11 @@813@@ -1249,8 +1445,11 @@
814 }814 }
815 }815 }
816 816
@@ -824,7 +824,7 @@
824 }824 }
825 else825 else
826 {826 {
827@@ -1287,7 +1486,79 @@827@@ -1261,7 +1460,79 @@
828 (1 - sigmoidProgress (eScreen->expoCam));828 (1 - sigmoidProgress (eScreen->expoCam));
829 }829 }
830 830
@@ -904,8 +904,8 @@
904+904+
905 }905 }
906 906
907 #define EXPO_GRID_SIZE 100907 static const unsigned short EXPO_GRID_SIZE = 100;
908@@ -1425,11 +1696,17 @@908@@ -1399,11 +1670,17 @@
909 const CompRegion& region,909 const CompRegion& region,
910 unsigned int mask)910 unsigned int mask)
911 {911 {
@@ -923,7 +923,7 @@
923 923
924 zoomAnim = eScreen->optionGetExpoAnimation () ==924 zoomAnim = eScreen->optionGetExpoAnimation () ==
925 ExpoScreen::ExpoAnimationZoom;925 ExpoScreen::ExpoAnimationZoom;
926@@ -1458,9 +1735,47 @@926@@ -1432,9 +1709,47 @@
927 927
928 if (opacity <= 0)928 if (opacity <= 0)
929 mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;929 mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
@@ -972,7 +972,7 @@
972 }972 }
973 973
974 bool974 bool
975@@ -1489,7 +1804,7 @@975@@ -1463,7 +1778,7 @@
976 expoActive (false),976 expoActive (false),
977 expoMode (false),977 expoMode (false),
978 dndState (DnDNone),978 dndState (DnDNone),
@@ -981,7 +981,7 @@
981 origVp (s->vp ()),981 origVp (s->vp ()),
982 selectedVp (s->vp ()),982 selectedVp (s->vp ()),
983 lastSelectedVp (s->vp ()),983 lastSelectedVp (s->vp ()),
984@@ -1497,14 +1812,21 @@984@@ -1471,14 +1786,21 @@
985 clickTime (0),985 clickTime (0),
986 doubleClick (false),986 doubleClick (false),
987 vpNormals (360 * 3),987 vpNormals (360 * 3),
@@ -1006,7 +1006,7 @@
1006 1006
1007 EXPOINITBIND (ExpoKey, doExpo);1007 EXPOINITBIND (ExpoKey, doExpo);
1008 EXPOTERMBIND (ExpoKey, termExpo);1008 EXPOTERMBIND (ExpoKey, termExpo);
1009@@ -1522,12 +1844,58 @@1009@@ -1496,12 +1818,58 @@
1010 ScreenInterface::setHandler (screen, false);1010 ScreenInterface::setHandler (screen, false);
1011 CompositeScreenInterface::setHandler (cScreen, false);1011 CompositeScreenInterface::setHandler (cScreen, false);
1012 GLScreenInterface::setHandler (gScreen, false);1012 GLScreenInterface::setHandler (gScreen, false);
@@ -1067,7 +1067,7 @@
1067 }1067 }
1068 1068
1069 ExpoWindow::ExpoWindow (CompWindow *w) :1069 ExpoWindow::ExpoWindow (CompWindow *w) :
1070@@ -1535,10 +1903,28 @@1070@@ -1509,10 +1877,28 @@
1071 window (w),1071 window (w),
1072 cWindow (CompositeWindow::get (w)),1072 cWindow (CompositeWindow::get (w)),
1073 gWindow (GLWindow::get (w)),1073 gWindow (GLWindow::get (w)),
@@ -1099,8 +1099,8 @@
1099 bool1099 bool
1100Index: ubuntu/plugins/expo/src/expo.h1100Index: ubuntu/plugins/expo/src/expo.h
1101===================================================================1101===================================================================
1102--- ubuntu.orig/plugins/expo/src/expo.h 2012-09-08 17:26:40.599035911 +08001102--- ubuntu.orig/plugins/expo/src/expo.h 2012-11-09 14:08:43.708467616 +0800
1103+++ ubuntu/plugins/expo/src/expo.h 2012-09-12 22:20:43.276760475 +08001103+++ ubuntu/plugins/expo/src/expo.h 2012-11-09 14:09:37.536468627 +0800
1104@@ -30,6 +30,44 @@1104@@ -30,6 +30,44 @@
1105 #include <opengl/opengl.h>1105 #include <opengl/opengl.h>
1106 1106
@@ -1285,7 +1285,7 @@
1285Index: ubuntu/plugins/expo/src/glow.cpp1285Index: ubuntu/plugins/expo/src/glow.cpp
1286===================================================================1286===================================================================
1287--- /dev/null 1970-01-01 00:00:00.000000000 +00001287--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1288+++ ubuntu/plugins/expo/src/glow.cpp 2012-09-12 22:20:43.280760497 +08001288+++ ubuntu/plugins/expo/src/glow.cpp 2012-11-09 14:09:37.536468627 +0800
1289@@ -0,0 +1,429 @@1289@@ -0,0 +1,429 @@
1290+/**1290+/**
1291+ *1291+ *
@@ -1719,7 +1719,7 @@
1719Index: ubuntu/plugins/expo/src/glow.h1719Index: ubuntu/plugins/expo/src/glow.h
1720===================================================================1720===================================================================
1721--- /dev/null 1970-01-01 00:00:00.000000000 +00001721--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1722+++ ubuntu/plugins/expo/src/glow.h 2012-09-12 22:20:43.280760497 +08001722+++ ubuntu/plugins/expo/src/glow.h 2012-11-09 14:09:37.536468627 +0800
1723@@ -0,0 +1,66 @@1723@@ -0,0 +1,66 @@
1724+/**1724+/**
1725+ *1725+ *
@@ -1790,7 +1790,7 @@
1790Index: ubuntu/plugins/expo/src/group_glow.h1790Index: ubuntu/plugins/expo/src/group_glow.h
1791===================================================================1791===================================================================
1792--- /dev/null 1970-01-01 00:00:00.000000000 +00001792--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1793+++ ubuntu/plugins/expo/src/group_glow.h 2012-09-12 22:20:43.280760497 +08001793+++ ubuntu/plugins/expo/src/group_glow.h 2012-11-09 14:09:37.536468627 +0800
1794@@ -0,0 +1,197 @@1794@@ -0,0 +1,197 @@
1795+#ifndef _GROUP_GLOWTEX_H1795+#ifndef _GROUP_GLOWTEX_H
1796+#define _GROUP_GLOWTEX_H1796+#define _GROUP_GLOWTEX_H
@@ -1992,7 +1992,7 @@
1992Index: ubuntu/plugins/expo/src/wall_offset/CMakeLists.txt1992Index: ubuntu/plugins/expo/src/wall_offset/CMakeLists.txt
1993===================================================================1993===================================================================
1994--- /dev/null 1970-01-01 00:00:00.000000000 +00001994--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1995+++ ubuntu/plugins/expo/src/wall_offset/CMakeLists.txt 2012-09-12 22:20:43.280760497 +08001995+++ ubuntu/plugins/expo/src/wall_offset/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
1996@@ -0,0 +1,33 @@1996@@ -0,0 +1,33 @@
1997+include_directories (1997+include_directories (
1998+ ${CMAKE_CURRENT_SOURCE_DIR}/include1998+ ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -2030,7 +2030,7 @@
2030Index: ubuntu/plugins/expo/src/wall_offset/include/wall-offset.h2030Index: ubuntu/plugins/expo/src/wall_offset/include/wall-offset.h
2031===================================================================2031===================================================================
2032--- /dev/null 1970-01-01 00:00:00.000000000 +00002032--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2033+++ ubuntu/plugins/expo/src/wall_offset/include/wall-offset.h 2012-09-12 22:20:43.280760497 +08002033+++ ubuntu/plugins/expo/src/wall_offset/include/wall-offset.h 2012-11-09 14:09:37.536468627 +0800
2034@@ -0,0 +1,43 @@2034@@ -0,0 +1,43 @@
2035+/**2035+/**
2036+ * Copyright © 2012 Canonical Ltd.2036+ * Copyright © 2012 Canonical Ltd.
@@ -2078,7 +2078,7 @@
2078Index: ubuntu/plugins/expo/src/wall_offset/src/wall-offset.cpp2078Index: ubuntu/plugins/expo/src/wall_offset/src/wall-offset.cpp
2079===================================================================2079===================================================================
2080--- /dev/null 1970-01-01 00:00:00.000000000 +00002080--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2081+++ ubuntu/plugins/expo/src/wall_offset/src/wall-offset.cpp 2012-09-12 22:20:43.280760497 +08002081+++ ubuntu/plugins/expo/src/wall_offset/src/wall-offset.cpp 2012-11-09 14:09:37.536468627 +0800
2082@@ -0,0 +1,55 @@2082@@ -0,0 +1,55 @@
2083+/**2083+/**
2084+ * Copyright © 2012 Canonical Ltd.2084+ * Copyright © 2012 Canonical Ltd.
@@ -2138,7 +2138,7 @@
2138Index: ubuntu/plugins/expo/src/wall_offset/tests/CMakeLists.txt2138Index: ubuntu/plugins/expo/src/wall_offset/tests/CMakeLists.txt
2139===================================================================2139===================================================================
2140--- /dev/null 1970-01-01 00:00:00.000000000 +00002140--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2141+++ ubuntu/plugins/expo/src/wall_offset/tests/CMakeLists.txt 2012-09-12 22:20:43.280760497 +08002141+++ ubuntu/plugins/expo/src/wall_offset/tests/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
2142@@ -0,0 +1,19 @@2142@@ -0,0 +1,19 @@
2143+if (NOT GTEST_FOUND)2143+if (NOT GTEST_FOUND)
2144+ message ("Google Test not found - cannot build tests!")2144+ message ("Google Test not found - cannot build tests!")
@@ -2162,7 +2162,7 @@
2162Index: ubuntu/plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp2162Index: ubuntu/plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp
2163===================================================================2163===================================================================
2164--- /dev/null 1970-01-01 00:00:00.000000000 +00002164--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2165+++ ubuntu/plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp 2012-09-12 22:20:43.280760497 +08002165+++ ubuntu/plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp 2012-11-09 14:09:37.536468627 +0800
2166@@ -0,0 +1,263 @@2166@@ -0,0 +1,263 @@
2167+/*2167+/*
2168+ * Copyright © 2012 Canonical Ltd.2168+ * Copyright © 2012 Canonical Ltd.
@@ -2429,8 +2429,8 @@
2429+ nAnimationSteps)));2429+ nAnimationSteps)));
2430Index: ubuntu/plugins/expo/CMakeLists.txt2430Index: ubuntu/plugins/expo/CMakeLists.txt
2431===================================================================2431===================================================================
2432--- ubuntu.orig/plugins/expo/CMakeLists.txt 2012-09-08 17:26:40.599035911 +08002432--- ubuntu.orig/plugins/expo/CMakeLists.txt 2012-11-09 14:08:43.708467616 +0800
2433+++ ubuntu/plugins/expo/CMakeLists.txt 2012-09-12 22:20:43.300760590 +08002433+++ ubuntu/plugins/expo/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
2434@@ -1,7 +1,16 @@2434@@ -1,7 +1,16 @@
2435 find_package (Compiz REQUIRED)2435 find_package (Compiz REQUIRED)
2436 include (CompizPlugin)2436 include (CompizPlugin)
@@ -2452,7 +2452,7 @@
2452Index: ubuntu/plugins/expo/src/windows_on_viewport/CMakeLists.txt2452Index: ubuntu/plugins/expo/src/windows_on_viewport/CMakeLists.txt
2453===================================================================2453===================================================================
2454--- /dev/null 1970-01-01 00:00:00.000000000 +00002454--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2455+++ ubuntu/plugins/expo/src/windows_on_viewport/CMakeLists.txt 2012-09-12 22:20:43.300760590 +08002455+++ ubuntu/plugins/expo/src/windows_on_viewport/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
2456@@ -0,0 +1,36 @@2456@@ -0,0 +1,36 @@
2457+include_directories (2457+include_directories (
2458+ ${CMAKE_CURRENT_SOURCE_DIR}/include2458+ ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -2493,7 +2493,7 @@
2493Index: ubuntu/plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h2493Index: ubuntu/plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h
2494===================================================================2494===================================================================
2495--- /dev/null 1970-01-01 00:00:00.000000000 +00002495--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2496+++ ubuntu/plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h 2012-09-12 22:31:06.807852402 +08002496+++ ubuntu/plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h 2012-11-09 14:09:37.536468627 +0800
2497@@ -0,0 +1,43 @@2497@@ -0,0 +1,43 @@
2498+/**2498+/**
2499+ * Copyright © 2012 Canonical Ltd.2499+ * Copyright © 2012 Canonical Ltd.
@@ -2541,7 +2541,7 @@
2541Index: ubuntu/plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp2541Index: ubuntu/plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp
2542===================================================================2542===================================================================
2543--- /dev/null 1970-01-01 00:00:00.000000000 +00002543--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2544+++ ubuntu/plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp 2012-09-12 22:20:43.300760590 +08002544+++ ubuntu/plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp 2012-11-09 14:09:37.536468627 +0800
2545@@ -0,0 +1,80 @@2545@@ -0,0 +1,80 @@
2546+/**2546+/**
2547+ * Copyright © 2012 Canonical Ltd.2547+ * Copyright © 2012 Canonical Ltd.
@@ -2626,7 +2626,7 @@
2626Index: ubuntu/plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt2626Index: ubuntu/plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt
2627===================================================================2627===================================================================
2628--- /dev/null 1970-01-01 00:00:00.000000000 +00002628--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2629+++ ubuntu/plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt 2012-09-12 22:20:43.300760590 +08002629+++ ubuntu/plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
2630@@ -0,0 +1,22 @@2630@@ -0,0 +1,22 @@
2631+if (NOT GTEST_FOUND)2631+if (NOT GTEST_FOUND)
2632+ message ("Google Test not found - cannot build tests!")2632+ message ("Google Test not found - cannot build tests!")
@@ -2653,7 +2653,7 @@
2653Index: ubuntu/plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp2653Index: ubuntu/plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp
2654===================================================================2654===================================================================
2655--- /dev/null 1970-01-01 00:00:00.000000000 +00002655--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2656+++ ubuntu/plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp 2012-09-12 22:20:43.304760606 +08002656+++ ubuntu/plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp 2012-11-09 14:09:37.536468627 +0800
2657@@ -0,0 +1,149 @@2657@@ -0,0 +1,149 @@
2658+/*2658+/*
2659+ * Copyright © 2012 Canonical Ltd.2659+ * Copyright © 2012 Canonical Ltd.
@@ -2807,7 +2807,7 @@
2807Index: ubuntu/plugins/expo/src/client-list-generator.h2807Index: ubuntu/plugins/expo/src/client-list-generator.h
2808===================================================================2808===================================================================
2809--- /dev/null 1970-01-01 00:00:00.000000000 +00002809--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2810+++ ubuntu/plugins/expo/src/client-list-generator.h 2012-09-12 22:20:43.304760606 +08002810+++ ubuntu/plugins/expo/src/client-list-generator.h 2012-11-09 14:09:37.536468627 +0800
2811@@ -0,0 +1,45 @@2811@@ -0,0 +1,45 @@
2812+/*2812+/*
2813+ * Copyright © 2012 Canonical Ltd.2813+ * Copyright © 2012 Canonical Ltd.
@@ -2857,7 +2857,7 @@
2857Index: ubuntu/plugins/expo/src/viewport-member-window.h2857Index: ubuntu/plugins/expo/src/viewport-member-window.h
2858===================================================================2858===================================================================
2859--- /dev/null 1970-01-01 00:00:00.000000000 +00002859--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2860+++ ubuntu/plugins/expo/src/viewport-member-window.h 2012-09-12 22:20:43.304760606 +08002860+++ ubuntu/plugins/expo/src/viewport-member-window.h 2012-11-09 14:09:37.536468627 +0800
2861@@ -0,0 +1,46 @@2861@@ -0,0 +1,46 @@
2862+/*2862+/*
2863+ * Copyright © 2012 Canonical Ltd.2863+ * Copyright © 2012 Canonical Ltd.

Subscribers

People subscribed via source and target branches