compiz-fusion-bcop: Changes to 'upstream-unstable'

2010-02-04 Thread Sean Finney
 VERSION   |2 +-
 src/bcop.xslt |   17 +
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 1ac65736c1eb23f4cf18eb2f12fe3e889b152f47
Author: Guillaume Seguin guilla...@segu.in
Date:   Wed Oct 14 04:08:57 2009 +0200

* Bump version to 0.8.4

diff --git a/VERSION b/VERSION
index 9b265c0..e4184f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.3
+VERSION=0.8.4

commit 379b43fe0ab2665c942ffa2d14fc4228f533401c
Author: Dennis Kasprzyk onest...@compiz-fusion.org
Date:   Thu Aug 27 18:36:40 2009 +0200

Don't return Options if Screen/Display has been freed.

diff --git a/src/bcop.xslt b/src/bcop.xslt
index 8f169d6..6976df2 100644
--- a/src/bcop.xslt
+++ b/src/bcop.xslt
@@ -723,6 +723,11 @@ void /xsl:text
 /xsl:text
 xsl:value-of select=$PLUGIN/
 xsl:text_OPTIONS_DISPLAY(d);
+if (!od)
+{
+*count = 0;
+return NULL;
+}
 *count = /xsl:text
 xsl:value-of select=$Plugin/
 xsl:textDisplayOptionNum;
@@ -740,6 +745,11 @@ void /xsl:text
 /xsl:text
 xsl:value-of select=$PLUGIN/
 xsl:text_OPTIONS_SCREEN(s);
+if (!os)
+{
+*count = 0;
+return NULL;
+}
 *count = /xsl:text
 xsl:value-of select=$Plugin/
 xsl:textScreenOptionNum;
@@ -955,6 +965,9 @@ static void /xsl:text
 /xsl:text
 xsl:value-of select=$PLUGIN/
 xsl:text_OPTIONS_SCREEN (s);
+/xsl:text
+xsl:value-of select=$PLUGIN/
+xsl:text_OPTIONS_DISPLAY (s-display);
 
 /xsl:text
 xsl:if 
test=/compiz/plug...@name=$pname]/screen/descendant-or-self::option
@@ -966,6 +979,7 @@ static void /xsl:text
 /xsl:text
 /xsl:if
 xsl:textfree (os);
+s-base.privates[od-screenPrivateIndex].ptr = NULL;
 }
 
 /xsl:text
@@ -1067,6 +1081,9 @@ static void /xsl:text
 /xsl:text
 /xsl:if
 xsl:textfree (od);
+d-base.privates[/xsl:text
+xsl:value-of select=$Plugin/
+xsl:textOptionsDisplayPrivateIndex].ptr = NULL;
 }
 
 /xsl:text

commit a6ae8e25a17e408dcbe8b31f42754c06b83d23c3
Author: Guillaume Seguin guilla...@segu.in
Date:   Mon Mar 9 15:43:44 2009 +0100

* Bump version to 0.8.3

diff --git a/VERSION b/VERSION
index 2dcc312..9b265c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.2
+VERSION=0.8.3


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



compiz-fusion-bcop: Changes to 'upstream-unstable'

2009-04-05 Thread Sean Finney
 VERSION |2 +-
 src/bcop.in |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 436a8858618a9dcb8cda6025c81f1dccb004e1d6
Author: Guillaume Seguin guilla...@segu.in
Date:   Mon Mar 9 15:43:35 2009 +0100

* Bump version to 0.8.2

diff --git a/VERSION b/VERSION
index 1357b31..2dcc312 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.9
+VERSION=0.8.2

commit 40aec5975dda0a1d3eb4d5483636f4f4b12f11f9
Author: Guillaume Seguin guilla...@segu.in
Date:   Tue Sep 23 13:34:19 2008 +0200

* Bump version to 0.7.9

diff --git a/VERSION b/VERSION
index 38e4baa..1357b31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.8
+VERSION=0.7.9

commit 8c1190f17e730ee57eebbf39f350b1ef871015ca
Author: Guillaume Seguin guilla...@segu.in
Date:   Tue Sep 23 13:34:17 2008 +0200

* Bump version to 0.7.8

diff --git a/VERSION b/VERSION
index fce301a..38e4baa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.7
+VERSION=0.7.8

commit 521c22755c11ce96310ed84b09d1a5583af8ebc8
Author: Danny Baumann dannybaum...@web.de
Date:   Thu Jul 3 13:21:27 2008 +0200

Depend on pkgconfig file only at configure time, not at runtime.

diff --git a/src/bcop.in b/src/bcop.in
index cdb34ea..1b1b224 100755
--- a/src/bcop.in
+++ b/src/bcop.in
@@ -18,7 +18,7 @@
 #  GNU General Public License for more details.
 #
 
-xsltdir=`pkg-config --variable xsltpath bcop`
+xsltd...@prefix@/share/bcop
 
 function usage
 {

commit f5cd61042ab58ba2177f8a6c9d9f16f332e88fea
Author: Guillaume Seguin guilla...@segu.in
Date:   Sat May 31 14:08:47 2008 +0200

* Bump version to 0.7.7

diff --git a/VERSION b/VERSION
index 6410fd5..fce301a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.6
+VERSION=0.7.7


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



compiz-fusion-bcop: Changes to 'upstream-unstable'

2008-06-02 Thread Sean Finney
 VERSION |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab82df6368c68a5d6551a88325993d5d5732cd0c
Author: Guillaume Seguin [EMAIL PROTECTED]
Date:   Sat May 31 14:08:30 2008 +0200

* Bump version to 0.7.6

diff --git a/VERSION b/VERSION
index 130f2d5..6410fd5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.5
+VERSION=0.7.6

commit f4fdaa3be29a8ad1393a818254351ae1ff82c672
Author: Guillaume Seguin [EMAIL PROTECTED]
Date:   Fri Apr 4 00:17:22 2008 +0200

* Bump version to 0.7.5

diff --git a/VERSION b/VERSION
index 8eafcce..130f2d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.4
+VERSION=0.7.5


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



compiz-fusion-bcop: Changes to 'upstream-unstable'

2008-05-19 Thread Sean Finney
New branch 'upstream-unstable' available with the following commits:
commit cbd3ccc712aed69d95efe47a855ba1fbf964b298
Author: Jigish Gohil [EMAIL PROTECTED](none)
Date:   Wed Oct 3 13:27:20 2007 +0530

bump version to 0.6.0

commit ed02fffef70b92e440025d79fa4fa964759851e3
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Mon Aug 13 16:42:00 2007 +0200

Added VERSION file to EXTRA_DIST.

commit 09543be06f21ed318b3b3ae79b42ad439d865f7b
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Sun Aug 12 21:52:01 2007 +0200

Version update.

commit 61e0e35681b4d3812e76fcf59a30204f59a40326
Merge: 0f2f3d6c6a4e362f62370be67ce613ecf8d3d91c 
c2bcb6afd2b5159281f52e075030d7f2a65e0fc2
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Mon Jul 9 20:23:13 2007 +0200

Merge branch 'master' of 
git+ssh://git.beryl-project.org/git/compcomm/libraries/bcop

commit 0f2f3d6c6a4e362f62370be67ce613ecf8d3d91c
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Mon Jul 9 20:23:03 2007 +0200

Generate c++ compatible headers.

commit c2bcb6afd2b5159281f52e075030d7f2a65e0fc2
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Thu Jul 5 00:26:13 2007 +0200

Work around one stupid bug in xsltproc.

commit fcced4de651a2a71b028af9994ae959760139a99
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed Jun 20 18:45:43 2007 +0200

Package rename

commit 260db8eea6c7fdfc04b728957e4b43374df342f8
Merge: b55f2077daf5e6331fc746ea40f3dc7601713693 
f3b383f7769a4a2a496ca2b4db48e52901a7773f
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed Jun 20 15:43:01 2007 +0200

Merge branch 'master' of 
git+ssh://git.beryl-project.org/git/compcomm/libraries/bcop

commit b55f2077daf5e6331fc746ea40f3dc7601713693
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed Jun 20 15:42:39 2007 +0200

Added support of translated/non translated metadata files

commit f3b383f7769a4a2a496ca2b4db48e52901a7773f
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Jun 12 19:43:34 2007 +0200

Datarootdir must be assigned before datadir.

commit 5831c2ac2491c62cb073750eef78709981490527
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Jun 12 17:01:10 2007 +0200

Only include bcop.in in DIST.

commit 0b4ae0cf5f9a5efcc2efc774c2512f3247a52300
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Jun 12 16:36:19 2007 +0200

Fix automake warning.

commit 3d4e9af7144ea8564e8eba40f5e4d9811a2b7677
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Jun 12 16:30:33 2007 +0200

Install BCOP pkg-config file to $DATADIR, not $LIBDIR as it's not 
architecture dependant.

commit c1cb688a121c258a8027f03e52a7e563a947b592
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Mon Jun 11 18:07:05 2007 +0200

universal plugin Makefile has now it's own repo

commit 2fd8078997771bd81edf85da478e787aeadf4367
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed Jun 6 16:29:56 2007 +0200

Removed string restrictions

commit e4cb7eea9459b9f24ae888c17cf8fde6da5c2c05
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Mon May 21 01:18:48 2007 +0200

build everything in build directory

commit ae3a7a9c8e4e78d3a9f1c31a3104bfbe521fc89d
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed May 16 21:04:55 2007 +0200

some autotool cleanups

commit c6a4db48750d829bedae1137f1c3d6480f3447b2
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed May 16 15:00:48 2007 +0200

added support for int descriptions (restricted strings will be removed 
later)

commit ecf0457f11ec96235a4a6f88cd64cbd79642027f
Merge: fcc7297bb8e1647f82b766eec591a58e8a478bdb 
f760713b5a232c2e7ffdbb7c3a8c3d937c7fae59
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed May 9 15:51:20 2007 +0200

Merge branch 'master' of 
git+ssh://git.beryl-project.org/git/compcomm/libraries/bcop

commit fcc7297bb8e1647f82b766eec591a58e8a478bdb
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed May 9 15:51:07 2007 +0200

corrected global metadata directory

commit f760713b5a232c2e7ffdbb7c3a8c3d937c7fae59
Author: Roi Cohen [EMAIL PROTECTED](none)
Date:   Wed May 9 01:08:01 2007 +0300

fix typo in makefile

commit 40c24085938a34e75e4822974cc992c100697ad3
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue May 8 08:17:09 2007 +0200

Delete target files if an error occured.

commit edca4ee3bb49feab278bf3190b4465458f536ccf
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue May 8 08:13:32 2007 +0200

Better (more generic) error handling.

commit e662a72172abea2d9cfb8dd321efa434a121e82e
Merge: 6f9f289d30a6b54369b5ed7a0d2be0c85ff9aa92 
1c168270a6dd9fa2ff3c325604eb859b523de26f
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Mon May 7 12:34:25 2007 +0200

Merge branch 'master' of 
git+ssh://git.beryl-project.org/git/compcomm/libraries/bcop

commit 6f9f289d30a6b54369b5ed7a0d2be0c85ff9aa92
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Mon May 7 12:31:14 2007 +0200

- Install to global compiz directories if the BUILD_GLOBAL environment 
variable is set to true
- Generate and 

compiz-fusion-bcop: Changes to 'upstream-unstable'

2008-05-19 Thread Sean Finney
 VERSION  |2 
 bcopconvert/bcopconvert.xslt |  323 -
 src/bcop.xslt|  418 ++-
 3 files changed, 254 insertions(+), 489 deletions(-)

New commits:
commit 080ee3f1ae6fe4bd00688e3f30460859f73d847b
Author: Guillaume Seguin [EMAIL PROTECTED]
Date:   Fri Apr 4 00:17:20 2008 +0200

* Bump version to 0.7.4

diff --git a/VERSION b/VERSION
index a48124b..8eafcce 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.3
+VERSION=0.7.4

commit 144f609c556d6947182f3295ea03bc1d924e46aa
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed Mar 19 18:22:02 2008 +0100

Fixed generic private defines.

diff --git a/src/bcop.xslt b/src/bcop.xslt
index 792ad73..8f169d6 100644
--- a/src/bcop.xslt
+++ b/src/bcop.xslt
@@ -1422,7 +1422,7 @@ CompPluginVTable * getCompPluginInfo (void);
 #define PLUGIN_SCREEN(object, plugin, prefix) \
 plugin##Screen * prefix##s = \
GET_PLUGIN_SCREEN (object, \
-   GET_PLUGIN_DISPLAY (s-display, plugin), plugin)
+   GET_PLUGIN_DISPLAY ((object)-display, plugin), plugin)
 
 #define GET_PLUGIN_WINDOW(object, parent, plugin) \
 ((plugin##Window *) \
@@ -1430,8 +1430,8 @@ CompPluginVTable * getCompPluginInfo (void);
 #define PLUGIN_WINDOW(object, plugin, prefix) \
 plugin##Window * prefix##w = \
GET_PLUGIN_WINDOW  (object, \
-   GET_PLUGIN_SCREEN  (w-screen, \
-   GET_PLUGIN_DISPLAY (w-screen-display, plugin), plugin), plugin)
+   GET_PLUGIN_SCREEN  ((object)-screen, \
+   GET_PLUGIN_DISPLAY ((object)-screen-display, plugin), plugin), plugin)
 
 #endif
 

commit e56989fb493c200c75a0aa71705cfcc281dc62ee
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Wed Mar 19 15:20:44 2008 +0100

Use generic private defines.

diff --git a/src/bcop.xslt b/src/bcop.xslt
index 5c3e742..792ad73 100644
--- a/src/bcop.xslt
+++ b/src/bcop.xslt
@@ -208,7 +208,9 @@
 xsl:value-of select=$filename/
 xsl:text
 
-static int displayPrivateIndex;
+static int /xsl:text
+   xsl:value-of select=$Plugin/
+   xsl:textOptionsDisplayPrivateIndex;
 
 static CompMetadata /xsl:text
 xsl:value-of select=$plugin/
@@ -221,39 +223,16 @@ CompPluginVTable /xsl:text
 xsl:value-of select=$plugin/
 xsl:textOptionsVTable;
 
-#define GET_/xsl:text
-xsl:value-of select=$PLUGIN/
-xsl:text_OPTIONS_DISPLAY(d) \
-((/xsl:text
-xsl:value-of select=$Plugin/
-xsl:textOptionsDisplay *) 
(d)-base.privates[displayPrivateIndex].ptr)
-
 #define /xsl:text
 xsl:value-of select=$PLUGIN/
-xsl:text_OPTIONS_DISPLAY(d) \
-/xsl:text
+xsl:text_OPTIONS_DISPLAY(d) PLUGIN_DISPLAY(d, /xsl:text
 xsl:value-of select=$Plugin/
-xsl:textOptionsDisplay *od = GET_/xsl:text
-xsl:value-of select=$PLUGIN/
-xsl:text_OPTIONS_DISPLAY (d)
-
-#define GET_/xsl:text
-xsl:value-of select=$PLUGIN/
-xsl:text_OPTIONS_SCREEN(s, od) \
-((/xsl:text
-xsl:value-of select=$Plugin/
-xsl:textOptionsScreen *) 
(s)-base.privates[(od)-screenPrivateIndex].ptr)
-
+xsl:textOptions, o)
 #define /xsl:text
 xsl:value-of select=$PLUGIN/
-xsl:text_OPTIONS_SCREEN(s) \
-/xsl:text
+xsl:text_OPTIONS_SCREEN(s) PLUGIN_SCREEN(s, /xsl:text
 xsl:value-of select=$Plugin/
-xsl:textOptionsScreen *os = GET_/xsl:text
-xsl:value-of select=$PLUGIN/
-xsl:text_OPTIONS_SCREEN (s, GET_/xsl:text
-xsl:value-of select=$PLUGIN/
-xsl:text_OPTIONS_DISPLAY (s-display))
+xsl:textOptions, o)
 
 typedef struct _/xsl:text
 xsl:value-of select=$Plugin/
@@ -1025,7 +1004,9 @@ static void /xsl:text
 return FALSE;
 }
 
-d-base.privates[displayPrivateIndex].ptr = od;
+d-base.privates[/xsl:text
+xsl:value-of select=$Plugin/
+xsl:textOptionsDisplayPrivateIndex].ptr = od;
 
 /xsl:text
 xsl:if test=/compiz/[EMAIL 
PROTECTED]/display/descendant-or-self::option
@@ -1098,8 +1079,12 @@ static void /xsl:text
 xsl:value-of select=$plugin/
 xsl:textOptionsInit (CompPlugin *p)
 {
-displayPrivateIndex = allocateDisplayPrivateIndex();
-if (displayPrivateIndex lt; 0)
+/xsl:text
+xsl:value-of select=$Plugin/
+xsl:textOptionsDisplayPrivateIndex = allocateDisplayPrivateIndex();
+if (/xsl:text
+xsl:value-of select=$Plugin/
+xsl:textOptionsDisplayPrivateIndex lt; 0)
 return FALSE;
 
 if (!compInitPluginMetadataFromInfo (amp;/xsl:text
@@ -1161,8 +1146,12 @@ static void /xsl:text
 xsl:value-of select=$plugin/
 xsl:textPluginVTable-fini (p);
 
-if (displayPrivateIndex = 0)
-freeDisplayPrivateIndex(displayPrivateIndex);
+if (/xsl:text
+xsl:value-of select=$Plugin/
+xsl:textOptionsDisplayPrivateIndex = 0)
+freeDisplayPrivateIndex (/xsl:text
+