summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace all hard-coded /etc path with sysconfdirwip/lantw/dont-hard-code-etcTing-Wei Lan2018-08-165-23/+27
| | | | | | | This is useful for JHBuild environments and systems that don't want to use /etc/dconf. https://bugzilla.gnome.org/show_bug.cgi?id=739299
* Merge branch 'style/overflow-int' into 'master'Philip Withnall2018-08-151-2/+2
|\ | | | | | | | | Engine: Change overflow thresholds in subscription counts from GMAXUINT32 to GMAXUINT See merge request GNOME/dconf!20
| * Engine: Change overflow thresholds in subscription counts from GMAXUINT32 to ↵Daniel Playfair Cal2018-08-151-2/+2
|/ | | | GMAXUINT
* Merge branch 'revert-060b9a17' into 'master'Daniel Playfair Cal2018-08-143-5/+5
|\ | | | | | | | | Revert "Merge branch 'fix/build-gtk-doc' into 'master'" See merge request GNOME/dconf!19
| * Revert "Merge branch 'fix/build-gtk-doc' into 'master'"Daniel Playfair Cal2018-08-143-5/+5
|/ | | This reverts merge request !18
* Increment version to 0.29.2Daniel Playfair Cal2018-08-142-1/+4
|
* Merge branch 'prepare-0-29' into 'master'0.29.1Daniel Playfair Cal2018-08-132-3/+38
|\ | | | | | | | | Prepare 0.29.1 See merge request GNOME/dconf!4
| * Prepare 0.29.1Daniel Playfair Cal2018-08-142-3/+38
| |
* | Merge branch 'bug/multi-sub' into 'master'Daniel Playfair Cal2018-08-134-125/+400
|\ \ | | | | | | | | | | | | | | | | | | Engine: account for multiple simultaneous subscriptions to the same path Closes #2 See merge request GNOME/dconf!5
| * | Engine: Add comprehensive unit tests for subscription counting behaviourDaniel Playfair Cal2018-08-141-0/+206
| | | | | | | | | | | | Use g_assert_false instead of g_assert in unit tests
| * | Engine: Add locks around access to subscription counts to ensure that each ↵Daniel Playfair Cal2018-08-141-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | state transition is atomic Update comment about threading, documenting the new lock Add documentation comments for new utility functions
| * | Engine: add g_debug statements in state changing interface functionsDaniel Playfair Cal2018-08-142-1/+10
| | |
| * | Engine: extend subscriptions state to account for multiple client ↵Daniel Playfair Cal2018-08-143-123/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subscriptions to the same path Remove accidental whitespace change Simplify branching in watch_fast and unwatch_fast Indentation fixes Store the subscription counts directly in the hash table pointer instead of mallocing ints Add documentation comments for new utility functions
| * | Engine: add some missing objects to dconf_engine_unrefDaniel Playfair Cal2018-08-141-0/+9
| | |
* | | Merge branch 'fix/build-gtk-doc' into 'master'Daniel Playfair Cal2018-08-133-5/+5
|\ \ \ | |/ / |/| | | | | | | | Build: revert to the old "enable-gtk-doc" flag since there is no reason to change it See merge request GNOME/dconf!18
| * | Build: revert to the old "enable-gtk-doc" flag since there is no reason to ↵Daniel Playfair Cal2018-08-143-5/+5
|/ / | | | | | | change it
* | Merge branch 'gvdb-update' into 'master'Philip Withnall2018-08-137-21/+67
|\ \ | |/ |/| | | | | Update GVDB from gvdb/master See merge request GNOME/dconf!17
| * docs: Update gvdb merge documentationPhilip Withnall2018-08-131-3/+8
| | | | | | | | | | Signed-off-by: Philip Withnall <withnall@endlessm.com> Reviewed-by: nobody
| * Merge remote-tracking branch 'gvdb/master'Philip Withnall2018-08-136-18/+59
| |\ |/ /
| * docs: Clarify error values for empty files when loadingPhilip Withnall2018-08-131-1/+8
| | | | | | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * docs: Use ‘Returns:’ instead of the invalid ‘@returns’Philip Withnall2018-08-131-8/+16
| | | | | | | | | | | | This is based on the commit 59a24ab5a3 in GLib. Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * Update FSF’s addressPhilip Withnall2018-08-135-15/+5
| | | | | | | | | | | | (This is based on commit 892fc2e4 from dconf.) Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * gio/gvdb/: LGPLv2+ -> LGPLv2.1+Sébastien Wilmet2018-08-135-5/+5
| | | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=776504
| * Avoid calling Standard C string/array functions with NULL argumentsPhilip Withnall2018-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glibc string.h declares memcpy() with attribute(nonnull(1,2)), causing calls with NULL arguments to be treated as undefined behaviour. This is consistent with ISO C99 and C11, which state that passing 0 to string functions as an array length does not remove the requirement that the pointer to the array is a valid pointer. gcc -fsanitize=undefined catches this while running OSTree's test suite. Similarly, running the GLib test suite reports similar issues for qsort(), memmove(), memcmp(). (This is a partial cherry-pick of commit e5ed410c8c0fe823883 from GLib.) Signed-off-by: Simon McVittie <smcv@debian.org> Bug: https://bugzilla.gnome.org/show_bug.cgi?id=775510 Reviewed-by: Colin Walters
| * doap: Update maintainers list to synchronise with GLibPhilip Withnall2018-08-131-3/+28
| | | | | | | | | | | | | | | | | | GVDB is essentially part of GLib, so should have the same maintainer list. At least this way, it’s not just maintained by one absentee maintainer. Signed-off-by: Philip Withnall <withnall@endlessm.com>
* | Merge branch 'gdbus-deadlocks' into 'master'Daniel Playfair Cal2018-08-131-1/+20
|\ \ | | | | | | | | | | | | dconf_gdbus_get_worker_context(): improve GObject deadlock workaround See merge request GNOME/dconf!15
| * | dconf_gdbus_get_worker_context(): improve GObject deadlock workaroundOwen W. Taylor2018-08-131-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | The existing workaround for https://bugzilla.gnome.org/show_bug.cgi?id=674885 doesn't go far enough, and deadlocks can occur, for example, with the GSocket type. Extend the workaround logic to all the types from glib/gio/gdbusprivate.c:ensure_required_types().
* | | Also build, test, and generate coverage reports in the deploy stage such ↵Daniel Playfair Cal2018-08-131-2/+6
| | | | | | | | | | | | that the coverage can be reported
* | | Merge branch 'bug/ci-gtk-doc' into 'master'Daniel Playfair Cal2018-08-131-5/+5
|\ \ \ | |/ / |/| | | | | | | | Correct the meson option to build gtk docs, also enable man pages and gtk docs… See merge request GNOME/dconf!16
| * | Correct the meson option to build gtk docs, also enable man pages and gtk ↵Daniel Playfair Cal2018-08-131-5/+5
|/ / | | | | | | docs in the build and test stage to catch errors earlier
* | Avoid use of link_whole in the gsettings backendEmmanuele Bassi2018-08-111-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GSettings backend loadable module should not expose any symbol except for the g_io_module_* ones. By using the internal dependency objects, we end up using `link_whole` on libdconf-common and libdconf-gdbus-thread, which means that we now inherit all the symbols exposed by those static libraries. We still want to use `link_whole` every time we depend on those static libraries, but for the GSettings backend module we make an exception, and use `link_with` with the build targets, instead of the internal dependencies. This fixes the `abicheck` test unit. Reviewed-by: nobody Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
* | Namespace the dependencies variablesEmmanuele Bassi2018-08-116-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | The build currently, unintentionally, depends on side effects, namely: that a variable defined in a meson.build file will be valid for any other included meson.build file, until it gets re-defined. We use the same `deps` variable in many places, and we end up depending on the inclusion order when we get to the client library, which depends on the gsettings backend defining the `deps` variable. Reviewed-by: nobody Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
* | Use the correct Meson argument for linkingEmmanuele Bassi2018-08-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Some of the internal static libraries in dconf implement public symbols. This means that they must be linked using `link_whole`, to prevent the linker from hiding unused symbols in there when building the shared libdconf.so. This fixes the build of projects using the dconf API directly, like dconf-editor, in GNOME Continuous. Reviewed-by: nobody Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
* | Merge branch 'meson' into 'master'Philip Withnall2018-08-1115-251/+164
|\ \ | | | | | | | | | | | | Various meson related improvements See merge request GNOME/dconf!11
| * | tests: Add libdbus-1-dev and bash-completion packagesIñigo Martínez2018-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meson uses `dbus-1.pc` file to check the `session_bus_services_dir` variable and `bash-completion.pc` file to check the `completionsdir` variable. However, the debian packages containing these files are missing from the gitlab CI file. `libdbus-1-dev` and `bash-completion` packages have been added that contain the `dbus-1.pc` and `bash-completion.pc` files.
| * | build: Simplified pkg-config file generationIñigo Martínez2018-08-112-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since meson's 0.46 version, the `pkg-config` file generation has been simplified[0]. This new improvements has been used to generate the same `pkg-config` file by using less parameters. meson version has also been bumped accordingly to 0.46. [0] http://mesonbuild.com/Release-notes-for-0-46-0.html#improvements-to-pkgconfig-module
| * | build: Add trailing commas where necessaryIñigo Martínez2018-08-1112-49/+49
| | | | | | | | | | | | | | | | | | Having trailing commas in place means that if another source file or parameter is added to the end of the list or function, there won't be noise when adding the comma to the line above.
| * | build: Do not make heavy use of project_nameIñigo Martínez2018-08-1110-53/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | The current meson build files make heavy use of meson's `project_name` function. However this makes difficult for any developer to find for given program/library/file names. The project name is also never going to change. Due to this reason these calls have been changed for `dconf` itself.
| * | build: Simplified checking compiler supported argumentsIñigo Martínez2018-08-111-4/+2
| | | | | | | | | | | | | | | An auxiliary variable is used to hold the compiler arguments to be checked. However, this is not necessary, so it has been removed.
| * | build: Use vapi dir from pkg-config fileIñigo Martínez2018-08-112-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The `vapigen` pkg-config file provides a variable with the location of the vapi files. This variable is checked to set the installation directory of the vapi file provided by dconf.
| * | build: Use completions dir from pkg-config fileIñigo Martínez2018-08-113-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `bash-completions` pkg-config file provides a variable with the location of the completion files. This variable is checked to set the installation directory of the completion file provided by dconf. As a side note, the variable in the `bash-completions` pkg-config file is not totally correct, because it provides a directory that is relative to prefix while it should be relative to datadir.
| * | build: Remove duplicated warning parameterIñigo Martínez2018-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | The `dconf` binary uses the `-w` compiler argument which is already added by meson by default. This duplicated parameter has been removed.
| * | build: Fix pkg-config exec_prefix variableIñigo Martínez2018-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | The `exec_prefix` variable in the pkg-config file should point to `prefix` but it is pointing to `libexecdir`. This has been updated to point to `${prefix}`.
| * | build: Fix parameters orderIñigo Martínez2018-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The install parameters should be the last parameters when calling a function. The `configuration` parameter has been moved leaving install parameters at the end.
| * | build: Use gnome's gtkdoc_html_dir functionIñigo Martínez2018-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | meson's `gtkdoc_html_dir` function returns the path where HTML files will be installed for a given module. Instead of hard coding the directory, this function is used to set documentations installation directory.
| * | build: Remove unnecessary variablesIñigo Martínez2018-08-113-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are some defined variables that are not used. Some of these variables are also used as install directories, that are equal to default installation directories. These all unnecessary variables and default installation directories have been removed.
| * | build: Fix internal dependenciesIñigo Martínez2018-08-1111-56/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | meson is able to generate internal dependencies for handling built libraries. These internal dependencies depend on other dependencies as well, based on the includes exposed by their headers. This have been fixed by using proper internal dependencies for these libraries.
| * | build: Avoid building libraries twiceIñigo Martínez2018-08-117-72/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dconf builts a number of internal static libraries which in some cases are duplicated. This duplication comes from autotools that used to built two libraries for each library, one with PIC enabled and the other one without it. This has been changed to build only one library for each library to be built, except `libdconf-common-hidden` which hides some symbols for the GIO module to be built.
| * | build: Remove config.h definitionsIñigo Martínez2018-08-111-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | Although many files include the `config.h` file, no defitions are used at all. Due to this, all the definitions have been removed. However, the `config.h` file is still generated and included in many files, as it may be useful for future global definitions.
| * | build: Retrieve D-Bus and gio paths from pkg-config filesIñigo Martínez2018-08-115-25/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | D-Bus' session bus services' paths and gio's module's paths are hardcoded. However, these directories can be retrieved by checking this information from their pkgconfig files. This patch retrieves the paths for their correspondant pkgconfig files and uses those paths as installation directories. The options to set different directories for these options are not necessary anymore, so they have been removed. Finally, the post install script does not depend anymore on the existence of `gio-querymodules` and is always executed.
View Lorry Controller Status