libcompizconfig: Changes to 'upstream-unstable'
AUTHORS | 34 CMakeLists.txt| 16 ChangeLog | 2200 ++ NEWS | 25 VERSION |2 backend/CMakeLists.txt|7 cmake/LibCompizConfigCommon.cmake | 17 7 files changed, 2268 insertions(+), 33 deletions(-) New commits: commit f3918b7127cea9575455d4e85705888add40e54b Author: Janos Guljas Date: Tue Aug 2 04:36:55 2011 +0200 Imported Upstream version 0.9.5.0 diff --git a/AUTHORS b/AUTHORS index 139597f..68e9d7e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,32 @@ - - +Christopher James Halse Rogers +Danny Baumann +Danny Baumann +Danny Baumann +Danny Baumann +Dennis Kasprzyk +Dennis Kasprzyk +Dennis Kasprzyk +Didier Roche +Dominique Leuenberger +Erkin Bahceci +Guillaume Seguin +Guillaume Seguin +Jigish Gohil +Kristian Lyngstol +Live session user +Lubos Lunak +Patrick Niklaus +Quinn Storm +Roland Baer +Roland Bär +Sam Spilsbury +Sam Spilsbury +Sam Spilsbury +Sam Spilsbury +Scott Moreau +Travis Watkins +Treviño - 3v1n0 +maniac +marex +onestone +racarr diff --git a/CMakeLists.txt b/CMakeLists.txt index 0583a53..d2f7f2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,10 @@ project (libcompizconfig) find_package (Compiz REQUIRED) +set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH}) +set (LIBCOMPIZCONFIG_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) +set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LIBCOMPIZCONFIGZ_CMAKE_MODULE_PATH}) + include (CompizCommon) include (CompizPackage) include (CheckLibraryExists) @@ -12,11 +16,10 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) # libcompizconfig package version number # An odd micro number indicates in-progress development. # An even micro number indicates a released version. -set (LIBCOMPIZCONFIG_VERSION_MAJOR 0) -set (LIBCOMPIZCONFIG_VERSION_MINOR 9) -set (LIBCOMPIZCONFIG_VERSION_MICRO 4) -set (LIBCOMPIZCONFIG_VERSION_MACRO 0) -set (VERSION ${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO}.${LIBCOMPIZCONFIG_VERSION_MACRO}) +file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0) +string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION) + +set (VERSION ${COMPIZ_RELEASE_VERSION}) set (_libcompizconfig_package_string "LibCompizConfig ${VERSION}") set (_libcompizconfig_package "LibCompizCompiz") @@ -195,3 +198,6 @@ compiz_ensure_linkage () compiz_package_generation ("CompizConfig Library") add_uninstall () compiz_add_git_dist () +compiz_add_distcheck () +compiz_add_release () +compiz_add_release_signoff () diff --git a/ChangeLog b/ChangeLog index e69de29..b5fe7db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,2200 @@ +Sam Spilsbury 2011-07-13 + +There is no sane reason to have backends always go in the same path as the +detected libcompizconfig, so mandate that they go in CMAKE_INSTALL_PREFIX +for now + +Sam Spilsbury 2011-07-07 + +Support new release commands + +Sam Spilsbury 2011-07-07 + +Bump VERSION + +Scott Moreau 2011-06-30 + +Actually bump version to 0.9.5. + +Scott Moreau 2011-05-13 + +* Bump version to 0.9.5 + +Sam Spilsbury 2011-03-07 + +"Bump VERSION to 0.9.4" + +Sam Spilsbury 2011-03-07 + +"Update CMake Version" + +Sam Spilsbury 2011-03-07 + +"Update news for 0.9.4 release" + +Sam Spilsbury 2010-11-25 + +Revert "Add a COMPIZCONFIG_PROFILE env var so that distributions and" + +This reverts commit e1438fb552487271ebed9894516c74210eb3de81. + +No need for it, we have COMPIZ_CONFIG_PROFILE + +Sam Spilsbury 2010-11-25 + +Ensure that we install the config defaults in SYSCONFDIR and also add a custom target for it + +Merge: e1438fb 9405fc9 +Sam Spilsbury 2010-11-22 + +Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/compizconfig/libcompizconfig + +Sam Spilsbury 2010-11-22 + +Add a COMPIZCONFIG_PROFILE env var so that distributions and +session managers can specify per-session profiles + +Didier Roche 2010-11-18 + +Give a default value to COMPIZ_SYSCONFDIR + +That enables SYSCONFDIR to get one and so, reading the Global configuration +file. + +Sam Spilsbury 2010-11-06 + +Update NEWS for 0.9.2.1 Release + +Sam Spilsbury 2010-11-06 + +Update NEWS for 0.9.2.1 Release + +Sam Spilsbury 2010-11-06 + +Add a LIBCOMPIZCONFIG_VERSION_MACRO and update to 0.9.2.1 + +Sam Spilsbury 2010-10-24 + +Fix warnings when protobuf is disabled + +Sam Spilsbury 2010-10-24 + +Update NEWS for 0.9.2 + +Sam Spilsbury 2010-09-29 + +Update INSTALL file + +Sam Spilsbury 2010-08-20 + +Fix backends not linking against libraries specified in PKGDEPS + +Sam Spilsbury 2010-07-04 + +Update NEWS for 0.9.0 release + +Sam
libcompizconfig: Changes to 'upstream-unstable'
CMakeLists.txt |4 ++-- NEWS |6 ++ VERSION|2 +- 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 367fb8df91a4e094f90cb6678cd217dd71b890aa Author: Sam Spilsbury Date: Mon Mar 7 18:07:43 2011 +0800 "Bump VERSION to 0.9.4" diff --git a/VERSION b/VERSION index f626ec2..a602fc9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.9.0 +0.9.4 commit e1f0133d85bda7d42d95a9d4c60a3c68bdd41d0f Author: Sam Spilsbury Date: Mon Mar 7 18:07:43 2011 +0800 "Update CMake Version" diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f9e686..0583a53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,8 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) # An even micro number indicates a released version. set (LIBCOMPIZCONFIG_VERSION_MAJOR 0) set (LIBCOMPIZCONFIG_VERSION_MINOR 9) -set (LIBCOMPIZCONFIG_VERSION_MICRO 2) -set (LIBCOMPIZCONFIG_VERSION_MACRO 1) +set (LIBCOMPIZCONFIG_VERSION_MICRO 4) +set (LIBCOMPIZCONFIG_VERSION_MACRO 0) set (VERSION ${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO}.${LIBCOMPIZCONFIG_VERSION_MACRO}) set (_libcompizconfig_package_string "LibCompizConfig ${VERSION}") commit fad9572a85341df0b042331b6a58f5642eb19ab3 Author: Sam Spilsbury Date: Mon Mar 7 18:07:34 2011 +0800 "Update news for 0.9.4 release" diff --git a/NEWS b/NEWS index 1846b6c..17eb3c6 100644 --- a/NEWS +++ b/NEWS @@ -15,3 +15,9 @@ Fixed symbol linking issue with backends Release 0.9.2.1 (2010-11-06 Sam Spilsbury ) Bugfix release. + +Release 0.9.4 (2010-02-24 Sam Spilsbury ) + +Development Release. + +Install systemwide profiles correctly -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qgumd-00019o...@alioth.debian.org
libcompizconfig: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor: commit 78a7cc8ca71020dff42dd2731071bfdf548ea2e8 Author: Sam Spilsbury Date: Thu Nov 25 18:22:33 2010 +0800 Revert "Add a COMPIZCONFIG_PROFILE env var so that distributions and" This reverts commit e1438fb552487271ebed9894516c74210eb3de81. No need for it, we have COMPIZ_CONFIG_PROFILE diff --git a/cmake/LibCompizConfigCommon.cmake b/cmake/LibCompizConfigCommon.cmake index a5e154e..de27b71 100644 --- a/cmake/LibCompizConfigCommon.cmake +++ b/cmake/LibCompizConfigCommon.cmake @@ -5,7 +5,7 @@ include (CompizPackage) macro (_get_backend_parameters _prefix) set (_current_var _foo) -set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS FILESADD) +set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS) foreach (_val ${_supported_var}) set (${_prefix}_${_val}) endforeach (_val) @@ -87,8 +87,7 @@ function (compizconfig_backend bname) add_library ( ${bname} SHARED ${_cpp_files} ${_h_files} - ${_c_files} - ${compizconfig_${_BACKEND}_FILESADD}) + ${_c_files}) target_link_libraries ( ${bname} diff --git a/src/main.c b/src/main.c index e052885..4d861f6 100644 --- a/src/main.c +++ b/src/main.c @@ -59,13 +59,7 @@ initGeneralOptions (CCSContext * context) else ccsSetBackend (context, "ini"); -/* The session might ask for a specific profile */ - -if ((val = getenv ("COMPIZCONFIG_PROFILE"))) -{ - ccsSetProfile (context, val); -} -else if (ccsReadConfig (OptionProfile, &val)) +if (ccsReadConfig (OptionProfile, &val)) { ccsSetProfile (context, val); free (val); @@ -566,7 +560,7 @@ openBackend (char *backend) if (home && strlen (home)) { - asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so", + asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so", home, backend); dlerror (); dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL); @@ -578,7 +572,7 @@ openBackend (char *backend) if (dlname) { free (dlname); } - asprintf (&dlname, "%s/compizconfig/backends/lib%s.so", + asprintf (&dlname, "%s/compizconfig/backends/lib%s.so", LIBDIR, backend); dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL); err = dlerror (); @@ -1536,7 +1530,7 @@ ccsGetSortedPluginStringList (CCSContext * context) found = TRUE; l2 = l2->next; } - + if (p && !ccsPluginListFind (plugins[i].after, p) && !found) plugins[i].after = ccsPluginListAppend (plugins[i].after, p); @@ -1774,9 +1768,9 @@ ccsReadSettings (CCSContext * context) { if (!context) return; - + CONTEXT_PRIV (context); - + if (!cPrivate->backend) return; @@ -1842,7 +1836,7 @@ ccsWriteSettings (CCSContext * context) { if (!context) return; - + CONTEXT_PRIV (context); if (!cPrivate->backend) @@ -1882,9 +1876,9 @@ ccsWriteChangedSettings (CCSContext * context) { if (!context) return; - + CONTEXT_PRIV (context); - + if (!cPrivate->backend) return; @@ -2263,7 +2257,7 @@ ccsCanDisablePlugin (CCSContext * context, CCSPlugin * plugin) } pluginList = pluginList->next; } - + } if (conflict) list = ccsPluginConflictListAppend (list, conflict); @@ -2279,9 +2273,9 @@ ccsGetExistingProfiles (CCSContext * context) { if (!context) return NULL; - + CONTEXT_PRIV (context); - + if (!cPrivate->backend) return NULL; @@ -2296,9 +2290,9 @@ ccsDeleteProfile (CCSContext * context, char *name) { if (!context) return; - + CONTEXT_PRIV (context); - + if (!cPrivate->backend) return; @@ -2473,7 +2467,7 @@ ccsExportToFile (CCSContext *context, if (skipDefaults && setting->isDefault) continue; - asprintf (&keyName, "s%d_%s", + asprintf (&keyName, "s%d_%s", context->screenNum, setting->name); switch (setting->type) @@ -2573,7 +2567,7 @@ ccsImportFromFile (CCSContext *context, if (!setting->isDefault && !overwriteNonDefault) continue; - asprintf (&keyName, "s%d_%s", + asprintf (&keyName, "s%d_%s", context->screenNum, setting->name); switch (setting->type) commit f7355bf03c3611e9349661c6cad2865a83d1b134 Author: Sam Spilsbury Date: Thu Nov 25 18:07:13 2010 +0800 Ensure that we install the config defaults in SYSCONFDIR and also add a custom target for it diff --git a/CMakeLists.txt b/CMakeLists.txt index
libcompizconfig: Changes to 'upstream-unstable'
VERSION|2 - backend/ini.c | 11 + configure.ac |2 - src/bindings.c | 14 +-- src/compiz.cpp | 97 + src/compizconfig.proto | 17 src/main.c | 19 - 7 files changed, 98 insertions(+), 64 deletions(-) New commits: commit a728704db3c3b89808aaf79d1d3ff0d62135da28 Author: Guillaume Seguin Date: Wed Oct 14 04:09:05 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 0001e60f79edaeac2ff8ec80bd28aebebfac77ff Author: Erkin Bahceci Date: Thu Sep 24 13:01:56 2009 -0500 Fix compiler warnings. diff --git a/src/compiz.cpp b/src/compiz.cpp index 2755d47..179a43a 100644 --- a/src/compiz.cpp +++ b/src/compiz.cpp @@ -281,8 +281,6 @@ initEdgeValuePB (CCSSettingValue * v, CCSSettingInfo * i, const GenericValueMetadata & value) { -int k, num; - v->value.asEdge = 0; if (value.has_edge_value ()) @@ -516,7 +514,6 @@ addOptionForPluginPB (CCSPlugin * plugin, const StringList & subgroups, const OptionMetadata & option) { -int num = 0; CCSSetting *setting; if (ccsFindSetting (plugin, name, isScreen, screen)) @@ -677,7 +674,6 @@ addOptionFromPB (CCSPlugin * plugin, { const char *name; Bool readonly = FALSE; -int i; name = option.name ().c_str (); @@ -688,7 +684,7 @@ addOptionFromPB (CCSPlugin * plugin, if (isScreen) { - for (i = 0; i < plugin->context->numScreens; i++) + for (unsigned i = 0; i < plugin->context->numScreens; i++) addOptionForPluginPB (plugin, name, TRUE, plugin->context->screens[i], groups, subgroups, option); @@ -1009,9 +1005,7 @@ getOptionType (const char *name) { "match", TypeMatch }, { "list", TypeList } }; -int i; - -for (i = 0; i < sizeof (map) / sizeof (map[0]); i++) +for (unsigned i = 0; i < sizeof (map) / sizeof (map[0]); i++) if (strcasecmp (name, map[i].name) == 0) return map[i].type; @@ -1439,7 +1433,7 @@ initEdgeValue (CCSSettingValue * v, { xmlNode **nodes; char *value; -int j, k, num; +int k, num; v->value.asEdge = 0; @@ -1461,7 +1455,7 @@ initEdgeValue (CCSSettingValue * v, value = getStringFromXPath (node->doc, nodes[k], "@name"); if (value) { - for (j = 0; j < sizeof (edge) / sizeof (edge[0]); j++) + for (unsigned j = 0; j < sizeof (edge) / sizeof (edge[0]); j++) { if (strcasecmp ((char *) value, edge[j]) == 0) v->value.asEdge |= (1 << j); @@ -2170,8 +2164,6 @@ addOptionFromXMLNode (CCSPlugin * plugin, char *type; char *readonly; Bool isReadonly; -Bool screen; -int i; if (!node) return; @@ -2201,7 +2193,7 @@ addOptionFromXMLNode (CCSPlugin * plugin, if (isScreen) { - for (i = 0; i < plugin->context->numScreens; i++) + for (unsigned i = 0; i < plugin->context->numScreens; i++) addOptionForPlugin (plugin, name, type, isReadonly, TRUE, plugin->context->screens[i], node, groupListPBv, subgroupListPBv, optionPBv); @@ -2658,7 +2650,6 @@ checkAndLoadProtoBuf (char *pbPath, struct stat *xmlStat, PluginBriefMetadata *pluginBriefPB) { -Bool needsUpdate = FALSE; const PluginInfoMetadata &pluginInfoPB = pluginBriefPB->info (); if (pbStat->st_mtime < xmlStat->st_mtime || // is .pb older than .xml? @@ -2793,7 +2784,6 @@ loadPluginFromXMLFile (CCSContext * context, char *xmlName, char *xmlDirPath) // Check if the corresponding .pb exists in cache Bool error = TRUE; - int lenXMLName = strlen (xmlName); struct stat pbStat; name = strndup (xmlName, strlen (xmlName) - 4); @@ -2886,7 +2876,6 @@ static void loadPluginsFromXMLFiles (CCSContext * context, char *path) { struct dirent **nameList; -char *metadataPath; int nFile, i; if (!path) commit b4aa1026111293bc1848a20673441142bb3d9ee1 Author: Erkin Bahceci Date: Thu Sep 24 12:59:56 2009 -0500 Fix checking of libprotobuf version >= 2.1. diff --git a/configure.ac b/configure.ac index 0ce5d31..4dde084 100644 --- a/configure.ac +++ b/configure.ac @@ -105,7 +105,7 @@ if test "x$use_protobuf" = "xyes"; then echo -e $protobuf_error_msg; use_protobuf=no else AC_CHECK_LIB(protobuf, _ZN6google8protobuf7MessageD2Ev, [], [ - echo -e $protobuf_error_msg; use_protobuf=no ]) + echo -e $protobuf_error_msg; use_protobuf=no ], -lpthread) if test "x$use_protobuf" = "xyes"; then AC_L
libcompizconfig: Changes to 'upstream-unstable'
Makefile.am| 10 VERSION|2 config/config |5 configure.ac | 28 include/ccs.h | 44 metadata/Makefile.am |7 metadata/global.xml| 416 -- plugin/ccp.c | 99 - src/Makefile.am| 46 src/ccs-private.h |5 src/compiz.c | 1570 src/compiz.cpp | 3137 + src/compizconfig.proto | 164 ++ src/config.c | 13 src/ini.c | 131 -- src/lists.c|6 src/main.c | 65 - 17 files changed, 3609 insertions(+), 2139 deletions(-) New commits: commit cbbdcceea27f671f96ff86902478487f76cd3f12 Author: Guillaume Seguin Date: Mon Mar 9 15:43:46 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 bb0ec725b1f5ed60d719ecb37843150b6713cc1f Author: Guillaume Seguin Date: Thu Mar 5 16:28:32 2009 +0100 Fix compizconfig.proto dist inclusion diff --git a/src/Makefile.am b/src/Makefile.am index 6dfae9c..788bda2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,8 +4,6 @@ PROTOBUF_LIB = -lprotobuf PROTOBUF_DEFINES = \ -DUSE_PROTOBUF=1 -EXTRA_DIST = compizconfig.proto - compizconfig.pb.cc: compizconfig.proto protoc --cpp_out=. compizconfig.proto @@ -21,6 +19,7 @@ clean-local: endif +EXTRA_DIST = compizconfig.proto INCLUDES =\ @COMPIZ_CFLAGS@\ commit 00646fe0c31ccaa81dae69ed74393cf151a3e963 Author: Danny Baumann Date: Tue Dec 2 11:13:47 2008 +0100 Revert accidential change. diff --git a/configure.ac b/configure.ac index 38e8503..0ce5d31 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_SUBST(LIBXML2_REQUIRES) AC_ARG_ENABLE(protobuf, [ --disable-protobuf Disable Protocol Buffers], - [use_protobuf=no], [use_protobuf=yes]) + [use_protobuf=$enableval], [use_protobuf=yes]) if test "x$use_protobuf" = "xyes"; then protobuf_error_msg="\nWARNING: You need to install Protocol Buffers to get faster program startup.\nSources are available at http://code.google.com/p/protobuf/downloads/list\n Package names for Ubuntu/Debian: libprotobuf0, libprotobuf-dev, protobuf-compiler\n Package names for other distributions: protobuf, protobuf-devel\n Disabling protobuf.\n" commit 79c0f14071db762bba256da6c0588115725219a3 Author: Danny Baumann Date: Tue Dec 2 11:03:43 2008 +0100 Mem leak fixes and minor cleanup. diff --git a/configure.ac b/configure.ac index 0ce5d31..38e8503 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_SUBST(LIBXML2_REQUIRES) AC_ARG_ENABLE(protobuf, [ --disable-protobuf Disable Protocol Buffers], - [use_protobuf=$enableval], [use_protobuf=yes]) + [use_protobuf=no], [use_protobuf=yes]) if test "x$use_protobuf" = "xyes"; then protobuf_error_msg="\nWARNING: You need to install Protocol Buffers to get faster program startup.\nSources are available at http://code.google.com/p/protobuf/downloads/list\n Package names for Ubuntu/Debian: libprotobuf0, libprotobuf-dev, protobuf-compiler\n Package names for other distributions: protobuf, protobuf-devel\n Disabling protobuf.\n" diff --git a/src/compiz.cpp b/src/compiz.cpp index ddcb82c..5b36a4d 100644 --- a/src/compiz.cpp +++ b/src/compiz.cpp @@ -2755,6 +2755,9 @@ updatePBFilePath (CCSContext * context, char *name, char *pbFilePath) if (plugin) { PLUGIN_PRIV (plugin); + + if (pPrivate->pbFilePath) + free (pPrivate->pbFilePath); pPrivate->pbFilePath = strdup (pbFilePath); } } @@ -2791,15 +2794,14 @@ loadPluginFromXMLFile (CCSContext * context, char *xmlName, char *xmlDirPath) Bool error = TRUE; int lenXMLName = strlen (xmlName); struct stat pbStat; - name = (char *) malloc (lenXMLName - 4 + 1); + + name = strndup (xmlName, strlen (xmlName) - 4); if (!name) { fprintf (stderr, "[ERROR]: Can't allocate memory\n"); free (xmlFilePath); return; } - strncpy (name, xmlName, lenXMLName - 4); - name[lenXMLName - 4] = '\0'; if (createProtoBufCacheDir () && metadataCacheDir.length () > 0) @@ -2861,12 +2863,13 @@ loadPluginFromXMLFile (CCSContext * context, char *xmlName, char *xmlDirPath) if (usingProtobuf && xmlLoaded) { writePBFile (pbFilePath, NULL, &persistentPluginBriefPB); - updatePBFilePath (context, name, pbFilePath); +} +if (pbFilePath) free (pbFilePath); +if (name) free (name); -} #endif } commit 6202217f3efa974a55aed34bf467f0462f2cf8a0 Author: Danny Baumann Date: Mon Nov 24 09:40:24 2008 +0100 S
libcompizconfig: Changes to 'upstream-unstable'
VERSION |2 +- include/ccs.h | 12 +--- metadata/global.xml |4 src/compiz.c| 25 + src/main.c | 16 +--- 5 files changed, 52 insertions(+), 7 deletions(-) New commits: 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 ( or true) 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; +CCSSettingIntInfoforInt; +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 @@ + + + + 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 = findPluginInL
libcompizconfig: Changes to 'upstream-unstable'
VERSION |2 backend/ini.c| 75 +++- configure.ac |2 include/ccs.h| 464 +- metadata/Makefile.am | 10 metadata/ccp.xml |7 metadata/global.xml | 205 ++- plugin/ccp.c | 881 +-- src/bindings.c | 224 +--- src/compiz.c | 473 +-- src/ini.c| 360 src/lists.c | 68 --- src/main.c | 489 13 files changed, 1702 insertions(+), 1558 deletions(-) New commits: commit 61c1a2db056db506ba4926d0e27377e0b30a5e5e Author: Guillaume Seguin <[EMAIL PROTECTED]> Date: Fri Apr 4 00:17:23 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 ecbea0902a1b2424f49b61c515b4d0912e65db51 Author: Dennis Kasprzyk <[EMAIL PROTECTED]> Date: Tue Apr 1 21:45:11 2008 +0200 Make sure that symbols are only loaded locally. diff --git a/src/main.c b/src/main.c index 18262e8..742a1e8 100644 --- a/src/main.c +++ b/src/main.c @@ -549,7 +549,7 @@ openBackend (char *backend) asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so", home, backend); dlerror (); - dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_GLOBAL); + dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL); err = dlerror (); } @@ -560,7 +560,7 @@ openBackend (char *backend) } asprintf (&dlname, "%s/compizconfig/backends/lib%s.so", LIBDIR, backend); - dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_GLOBAL); + dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL); err = dlerror (); } @@ -2285,7 +2285,7 @@ addBackendInfo (CCSBackendInfoList * bl, char *file) dlerror (); -dlhand = dlopen (file, RTLD_LAZY); +dlhand = dlopen (file, RTLD_LAZY | RTLD_LOCAL); err = dlerror (); if (err || !dlhand) return; commit 97df78b25e32ac427f9d3d1c98d4897c864de572 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Sun Mar 16 13:16:37 2008 +0100 Put focus stealing prevention level to Focus behaviour group. diff --git a/metadata/global.xml b/metadata/global.xml index 8d6a61c..870b56f 100644 --- a/metadata/global.xml +++ b/metadata/global.xml @@ -141,6 +141,7 @@ Focus & Raise Behaviour + commit 9b50e002aa47da25ce110fb5f51d8b8957888561 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Fri Mar 14 09:45:21 2008 +0100 Fix setting context from option changes (e.g. via dbus). diff --git a/plugin/ccp.c b/plugin/ccp.c index de90433..e0f383d 100644 --- a/plugin/ccp.c +++ b/plugin/ccp.c @@ -457,7 +457,7 @@ ccpSetContextFromOption (CompObject *object, int screenNum = 0; /* we currently only support screen and display opton types */ -if (object->type != COMP_OBJECT_TYPE_SCREEN || +if (object->type != COMP_OBJECT_TYPE_SCREEN && object->type != COMP_OBJECT_TYPE_DISPLAY) return; @@ -619,7 +619,7 @@ ccpSetOptionForPlugin (CompObject *object, status = (*core.setOptionForPlugin) (object, plugin, name, value); WRAP (cc, &core, setOptionForPlugin, ccpSetOptionForPlugin); -if (status && !cc->applyingSettings) +if (status && !cc->applyingSettings && !cc->reloadHandle) { CompPlugin *p; commit 3b0d162ec791713ca262ca05cca7b99109986f8f Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Mar 10 07:54:39 2008 +0100 Add overlapping output handling option to display settings group. diff --git a/metadata/global.xml b/metadata/global.xml index 6c083d1..8d6a61c 100644 --- a/metadata/global.xml +++ b/metadata/global.xml @@ -126,6 +126,7 @@ + commit a43386a7c3953be4f7a3b4b20b3412ccc42442d4 Author: Guillaume Seguin <[EMAIL PROTECTED]> Date: Thu Mar 6 22:46:34 2008 +0100 * Bump version to 0.7.3 diff --git a/VERSION b/VERSION index 70d11ae..a48124b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.7.2 +VERSION=0.7.3 commit c7354fb9a7115dd3fa7884556c83b20f99940f1c Author: Guillaume Seguin <[EMAIL PROTECTED]> Date: Thu Mar 6 22:46:33 2008 +0100 * Bump version to 0.7.2 diff --git a/VERSION b/VERSION index 58d3865..70d11ae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.6.99 +VERSION=0.7.2 commit c31723c1ccb0900bd5547376012a670b134547fa Author: Danny Baumann <[EMAIL PROTECTED]> Date: Sat Feb 23 16
libcompizconfig: Changes to 'upstream-unstable'
Makefile.am |3 ++- VERSION |2 +- config/Makefile.am |6 ++ config/config | 16 configure.ac|1 + metadata/global.xml |1 + src/compiz.c| 14 -- src/ini.c | 19 +++ src/iniparser.c |6 +++--- src/main.c |5 - 10 files changed, 65 insertions(+), 8 deletions(-) New commits: commit bc9b09f3c5d1e1667e13b32afa1a12f4cef872a0 Author: Guillaume Seguin <[EMAIL PROTECTED]> Date: Sat Oct 20 22:00:44 2007 +0200 * Bump VERSION to 0.6.1 diff --git a/VERSION b/VERSION index de3b1c2..161c807 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.6.0 +VERSION=0.6.1 commit 5615cac87c48455128cc42f6144bfa3493cb1dd9 Author: Jigish Gohil <[EMAIL PROTECTED](none)> Date: Wed Oct 3 13:29:52 2007 +0530 bump version to 0.6.0 diff --git a/VERSION b/VERSION index 2313ac4..de3b1c2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.5.2 +VERSION=0.6.0 commit 6ab37f581c1322d5a64e97be063e5608e081 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Sep 17 19:06:43 2007 +0200 Prevent binding key combinations with invalid key names. XStringToKeysym fails for those, leading to the unwanted effect that the binding was grabbed as modifier-only binding. diff --git a/src/compiz.c b/src/compiz.c index b71e015..fcb0702 100644 --- a/src/compiz.c +++ b/src/compiz.c @@ -607,7 +607,14 @@ stringToKey (const char *binding, int *keysym, unsigned int *mods) while (*binding && !isalnum (*binding)) binding++; -*keysym = XStringToKeysym (binding); +if (*binding) +{ + *keysym = XStringToKeysym (binding); + if (!*keysym) + *mods = 0; +} +else + *keysym = NoSymbol; } commit 9c6ad85017253a9415f02b532a2107e19a0af1cb Author: Dennis Kasprzyk <[EMAIL PROTECTED]> Date: Sun Sep 2 22:22:18 2007 +0200 Allow empty lists. diff --git a/src/ini.c b/src/ini.c index 1ae59a3..ea25362 100644 --- a/src/ini.c +++ b/src/ini.c @@ -352,6 +352,19 @@ ccsIniGetAction (IniDictionary *dictionary, return FALSE; } +static Bool +isEmptyString (char *value) +{ +int i = 0; + +for (i = 0; i < strlen(value); i++) +{ + if (!isblank(value[i])) + return FALSE; +} +return TRUE; +} + Bool ccsIniGetList (IniDictionary *dictionary, const char *section, @@ -368,6 +381,12 @@ ccsIniGetList (IniDictionary *dictionary, if (!valString) return FALSE; +if (strlen(valString) == 0 || isEmptyString(valString)) +{ + *value = NULL; + return TRUE; +} + valueString = strdup (valString); valueStart = valueString; commit c699e529dc456d415709f3eb5007de9515cf14b0 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Sun Sep 2 13:52:28 2007 +0200 Make wobbly provide the feature "edgeresistance". diff --git a/metadata/global.xml b/metadata/global.xml index ef81454..73a408b 100644 --- a/metadata/global.xml +++ b/metadata/global.xml @@ -260,6 +260,7 @@ Effects + edgeresistance commit 52dba67492c3ae322e709c4dd11c3052f9514ac4 Author: Roland Bär <[EMAIL PROTECTED](none)> Date: Fri Aug 31 12:29:30 2007 +0200 Plug minor memleak. diff --git a/src/compiz.c b/src/compiz.c index b5c8c19..b71e015 100644 --- a/src/compiz.c +++ b/src/compiz.c @@ -295,7 +295,10 @@ getNodesFromPath (xmlDoc * doc, xmlNode * base, char *path, int *num) char *bPath = getGenericNodePath (base); if (!bPath) + { + free (rv); return NULL; + } asprintf (&gPath, "%s/%s", bPath, path); if (gPath) commit 1f56a23dd771dd438dd833fab65f3a662a13dc37 Author: Dennis Kasprzyk <[EMAIL PROTECTED]> Date: Thu Aug 30 01:20:24 2007 +0200 Do not create dir/file during import. Save settings after import. diff --git a/src/main.c b/src/main.c index c275a2d..77d94fb 100644 --- a/src/main.c +++ b/src/main.c @@ -36,6 +36,7 @@ #include #include "ccs-private.h" +#include "iniparser.h" Bool basicMetadata = FALSE; @@ -2468,7 +2469,7 @@ ccsImportFromFile (CCSContext * context, const char * fileName, Bool overwrite) CCSSetting *setting; char *keyName; -importFile = ccsIniOpen (fileName); +importFile = iniparser_new ((char *) fileName); if (!importFile) return FALSE; @@ -2566,6 +2567,8 @@ ccsImportFromFile (CCSContext * context, const char * fileName, Bool overwrite) } } +ccsWriteSettings (context); + ccsIniClose (importFile); return TRUE; commit b05ff08bc9f2bc42e7e483af6ca9d2a3718b0211 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Fri Aug 24 15:03:28 2007 +0200 Another attempt at properly fixing file locking. diff --git a/src/iniparser.c b/src/iniparser.c index 359a0fd..35b526b 100644 --- a/src/iniparser.c +++ b/src/inipars
libcompizconfig: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 166ee89384507ae64ac40b49f764413927b7eb5a Author: Dennis Kasprzyk <[EMAIL PROTECTED]> Date: Sun Aug 12 21:53:16 2007 +0200 Version update. commit d1c2069d56acfc6e59a10fe9ac90491122f880b6 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Thu Aug 9 17:47:43 2007 +0200 Optimization. commit 941549150193d8be2eb1fee3604da05f5be8cfaa Author: Danny Baumann <[EMAIL PROTECTED]> Date: Thu Aug 9 17:46:31 2007 +0200 Remove debug output. commit 0f93be96fd8f18fc996b83f5835384cce9046e31 Merge: 80a50f22ebafe67fabdf6324342dfd3de6a3f49b ba59b3130010e2e128e5f34e1fc72c339fff9409 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Thu Aug 9 09:46:40 2007 +0200 Merge branch 'master' of git+ssh://[EMAIL PROTECTED]/git/fusion/compizconfig/libcompizconfig commit 80a50f22ebafe67fabdf6324342dfd3de6a3f49b Author: Danny Baumann <[EMAIL PROTECTED]> Date: Thu Aug 9 09:46:07 2007 +0200 Properly set file permissions for newly-created files. commit ba59b3130010e2e128e5f34e1fc72c339fff9409 Merge: e1712596055905866b12c839f3add8faf97fc967 3f2a32940b3e4ff19877cfe6bb99a936bdb5f3a6 Author: Dennis Kasprzyk <[EMAIL PROTECTED]> Date: Wed Aug 8 18:17:46 2007 +0200 Merge branch 'master' of git+ssh://git.opencompositing.org/git/fusion/compizconfig/libcompizconfig commit e1712596055905866b12c839f3add8faf97fc967 Author: Dennis Kasprzyk <[EMAIL PROTECTED]> Date: Wed Aug 8 18:17:36 2007 +0200 Added proper debug message handling. commit 3f2a32940b3e4ff19877cfe6bb99a936bdb5f3a6 Merge: 4681b7fd09078ed77003322e0d745b206ab70cda a597b1640f50eb4afb1fcaa6babdb3a4b97bf50d Author: Danny Baumann <[EMAIL PROTECTED]> Date: Wed Aug 8 17:44:38 2007 +0200 Merge branch 'master' of git+ssh://[EMAIL PROTECTED]/git/fusion/compizconfig/libcompizconfig commit a597b1640f50eb4afb1fcaa6babdb3a4b97bf50d Author: Patrick Niklaus <[EMAIL PROTECTED]> Date: Wed Aug 8 17:17:03 2007 +0200 Fixed getExistingProfiles for new config path commit dc5551d28515d44f0e7bc73a9b6b2fb6e273a89f Author: Dennis Kasprzyk <[EMAIL PROTECTED]> Date: Wed Aug 8 16:59:46 2007 +0200 Do not unload symbols because there may be some static variables in glib that could cause errors. commit 4681b7fd09078ed77003322e0d745b206ab70cda Author: Danny Baumann <[EMAIL PROTECTED]> Date: Wed Aug 8 16:30:20 2007 +0200 Correctly reset privData pointer. commit 94c4620126325c37b5b1ab23260345f153b76256 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Wed Aug 8 11:04:19 2007 +0200 Fix profile export. commit d1abafee853d85077c475781b6899365a4788cbc Author: Danny Baumann <[EMAIL PROTECTED]> Date: Wed Aug 8 10:36:54 2007 +0200 Fixed make distcheck. commit d70aaf386b86f1c7375174e3f17d90a6b263fd53 Author: Dennis Kasprzyk <[EMAIL PROTECTED]> Date: Tue Aug 7 18:54:13 2007 +0200 Handle plugin requirement as after rule. commit f2954790e7ea33f7ccb178786a643a8351377f1a Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 19:25:58 2007 +0200 Add missing file. commit 7b47c99b1924ab1c81c4a2045efe2420498494e1 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 19:23:24 2007 +0200 Move screens and numScreens back to CCSContext. They're needed by the backends. commit fcd8fb94f7d5a7e49b7e0cd647faf440e79a580a Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 19:20:54 2007 +0200 Split out backend definitions in separate header file. commit bb1d736f0144b9cb5a2f12bd6f5c4d759c969ea6 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 18:58:08 2007 +0200 Remove internal variables from API and move them into internal struct. commit 43ed7e827c2be7e1d845355f8483b48616f2eeca Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 18:25:20 2007 +0200 Remove unused struct member. commit 77b0ba420670613e369da57d7260c787b86096ce Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 18:04:42 2007 +0200 Read/write autosort setting from/to config. commit b68e6405953952902ab27924a783e332bb62dd94 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 17:40:26 2007 +0200 Added setter / getter for plugin list autosorting setting. If disabled, the settings manager is responsible for properly setting the active_plugins list. commit fc3ee6f01476d8fab8eb67893d9f3ee07e503019 Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 16:56:09 2007 +0200 Use default value for active_plugins setting rather than tag. commit 605b50b8dd2c2bb604ecb5f7c7da33af2e46d68a Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 15:37:54 2007 +0200 Ensure ccp being loaded in plugin instead of sorted plugin list generation. commit 9caecaef74b88d823496f4ea20d570f8c2b47331 Merge: 2938992d73e91d57b221b75985fea15c899fab65 933b83b37f2dd6d8aa94e04e80dbb9a9b7427e3f Author: Danny Baumann <[EMAIL PROTECTED]> Date: Mon Aug 6 15:28:08 2007 +0200 Merge branch 'master' into plugin-load-redesign c