VERSION | 2 +-
debian/changelog | 7 +++++++
debian/control | 2 +-
include/ccs.h | 12 +++++++++---
metadata/global.xml | 4 ++++
src/compiz.c | 25 +++++++++++++++++++++++++
src/main.c | 16 +++++++++++++---
7 files changed, 60 insertions(+), 8 deletions(-)
New commits:
commit 17c4ccb44683123b07cb35163449f8c40452f668
Author: Sean Finney <[EMAIL PROTECTED]>
Date: Tue Jun 3 00:43:20 2008 +0200
new upstream release
diff --git a/debian/changelog b/debian/changelog
index 6b092e2..a876151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcompizconfig (0.7.6-1) unstable; urgency=low
+
+ * New upstream release. Includes ABI change so build-deps changed
+ accordingly.
+
+ -- Sean Finney <[EMAIL PROTECTED]> Tue, 03 Jun 2008 00:42:01 +0200
+
libcompizconfig (0.7.4-2) unstable; urgency=low
* Add build-deps on autoconf, automake1.9, libglib2.0-dev, and libtool
diff --git a/debian/control b/debian/control
index 9167e8b..f8ef646 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Sean Finney <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev,
compiz-dev (>= 0.7.3), intltool, libtool, libglib2.0-dev, libxml2-dev,
libxslt1-dev
+Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev,
compiz-dev (>= 0.7.6), intltool, libtool, libglib2.0-dev, libxml2-dev,
libxslt1-dev
Standards-Version: 3.7.2
Section: libs
commit 4b8f5d694ecf5b0cff73fb16dc9e211172c92e35
Author: Guillaume Seguin <[EMAIL PROTECTED]>
Date: Sat May 31 14:08:49 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 b1c52a6d0c71f34092c0c544cc0a9ca53a59459f
Author: Dennis Kasprzyk <[EMAIL PROTECTED]>
Date: Fri Apr 25 01:59:19 2008 +0200
Added an action information that indicates that a binding is not a global
binding. The new "internal" tag (<internal/> or <internal>true</internal>) can
now be used to mark an action setting as plugin internal.
diff --git a/include/ccs.h b/include/ccs.h
index 885597c..a7d8663 100644
--- a/include/ccs.h
+++ b/include/ccs.h
@@ -253,11 +253,17 @@ typedef struct _CCSSettingListInfo
union _CCSSettingInfo *listInfo; /* list of settings */
} CCSSettingListInfo;
+typedef struct _CCSSettingActionInfo
+{
+ Bool internal; /* is this binding global or plugin internal*/
+} CCSSettingActionInfo;
+
typedef union _CCSSettingInfo
{
- CCSSettingIntInfo forInt;
- CCSSettingFloatInfo forFloat;
- CCSSettingListInfo forList;
+ CCSSettingIntInfo forInt;
+ CCSSettingFloatInfo forFloat;
+ CCSSettingListInfo forList;
+ CCSSettingActionInfo forAction;
} CCSSettingInfo;
typedef struct _CCSSettingColorValueColor
diff --git a/src/compiz.c b/src/compiz.c
index f89a724..7ce15f9 100644
--- a/src/compiz.c
+++ b/src/compiz.c
@@ -860,6 +860,25 @@ initListInfo (CCSSettingInfo * i, xmlNode * node)
}
static void
+initActionInfo (CCSSettingInfo * i, xmlNode * node)
+{
+ char *value;
+
+ i->forAction.internal = FALSE;
+
+ value = getStringFromPath (node->doc, node, "internal/child::text()");
+ if (value)
+ {
+ if (strcasecmp (value, "true") == 0)
+ i->forAction.internal = TRUE;
+ free (value);
+ return;
+ }
+ if (nodeExists (node, "internal"))
+ i->forAction.internal = TRUE;
+}
+
+static void
addOptionForPlugin (CCSPlugin * plugin,
char * name,
char * type,
@@ -929,6 +948,12 @@ addOptionForPlugin (CCSPlugin * plugin,
case TypeList:
initListInfo (&setting->info, node);
break;
+ case TypeKey:
+ case TypeButton:
+ case TypeEdge:
+ case TypeBell:
+ initActionInfo (&setting->info, node);
+ break;
default:
break;
}
commit 4d728b6eb6d00fcf8a4066dd47049692352ef3f0
Author: Danny Baumann <[EMAIL PROTECTED]>
Date: Tue Apr 15 08:23:46 2008 +0200
But switcher panel bindings into Bindings group.
diff --git a/metadata/global.xml b/metadata/global.xml
index 870b56f..147726e 100644
--- a/metadata/global.xml
+++ b/metadata/global.xml
@@ -373,6 +373,10 @@
<option name="next_no_popup_key" type="key"/>
<option name="prev_no_popup_button"
type="button"/>
<option name="prev_no_popup_key" type="key"/>
+ <option name="next_panel_button" type="button"/>
+ <option name="next_panel_key" type="key"/>
+ <option name="prev_panel_button" type="button"/>
+ <option name="prev_panel_key" type="key"/>
</group>
</display>
</plugin>
commit a2bedd700b3573159ae602d52b30edf74097ddf4
Author: Dennis Kasprzyk <[EMAIL PROTECTED]>
Date: Thu Apr 10 12:27:16 2008 +0200
Added workaround to ensure that bench is the last plugin.
diff --git a/src/main.c b/src/main.c
index 70e0e19..b5931dc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1552,6 +1552,11 @@ ccsGetSortedPluginStringList (CCSContext * context)
if (plugins[i].after)
continue;
+ /* This is a special case to ensure that bench is the last plugin */
+ if (len - removed > 1 &&
+ strcmp (plugins[i].plugin->name, "bench") == 0)
+ continue;
+
found = TRUE;
removed++;
p = plugins[i].plugin;
commit 50eb74a0df3aa9e3d35284f8f63c05665d67a579
Author: Guillaume Seguin <[EMAIL PROTECTED]>
Date: Fri Apr 4 00:17:24 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
commit 15dc54fdf763861a124443fffbedd56aa18e3bf7
Author: Dennis Kasprzyk <[EMAIL PROTECTED]>
Date: Wed Sep 5 17:07:29 2007 +0200
Make sure "core" is always the first plugin.
diff --git a/src/main.c b/src/main.c
index 528f598..84a5b46 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1454,12 +1454,17 @@ CCSStringList
ccsGetSortedPluginStringList (CCSContext * context)
{
CCSPluginList ap = ccsGetActivePluginList (context);
- CCSPluginList list = ap;
+ CCSPluginList list;
CCSPlugin *p = NULL;
- CCSStringList rv = NULL;
+ CCSStringList rv = ccsStringListAppend (NULL, strdup ("core"));
PluginSortHelper *ph = NULL;
+ p = findPluginInList (ap, "core");
+ if (p)
+ ap = ccsPluginListRemove (ap, p, FALSE);
+
int len = ccsPluginListLength (ap);
+
int i, j;
/* TODO: conflict handling */
@@ -1467,7 +1472,7 @@ ccsGetSortedPluginStringList (CCSContext * context)
if (!plugins)
return NULL;
- for (i = 0; i < len; i++, list = list->next)
+ for (i = 0, list = ap; i < len; i++, list = list->next)
{
plugins[i].plugin = list->data;
plugins[i].after = NULL;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
