Commit Graph

435 Commits

Author SHA1 Message Date
Philip Withnall ba5dccfde0 Merge branch 'wip/tolerate-no-accountsservice' into 'master'
manager: Return MCT_MANAGER_ERROR_DISABLED if no accountsservice

Closes #27

See merge request pwithnall/malcontent!89
2020-10-15 13:52:45 +00:00
Simon McVittie b5b1ac26a2 manager: Make an error message less specific
Philip Withnall pointed out that if mct_manager_get_session_limits()
fails with G_DBUS_ERROR_ACCESS_DENIED or
org.freedesktop.Accounts.Error.PermissionDenied, the error message
will wrongly refer to app filter data. Make it more generally applicable.

Signed-off-by: Simon McVittie <smcv@debian.org>
2020-10-15 09:05:56 +01:00
Simon McVittie 1abce3eb91 manager: Return MCT_MANAGER_ERROR_DISABLED if no accountsservice
In distributions that package shared libraries and daemons separately,
it's possible to have the shared library (because it's required to run
something like Flatpak) but not the accountsservice daemon or its
malcontent extension (because the administrator of this particular
installation has no interest in parental controls, and their choice of
desktop environment is such that nothing else depends on accountsservice
either). This minimizes the memory and disk space cost of enabling the
libmalcontent feature in Flatpak for those who do not need it, while
keeping it available for those that do.

Treat this the same as if accountsservice is available but the
malcontent extension is not: fail open, by returning
MCT_MANAGER_ERROR_DISABLED.

Resolves: https://gitlab.freedesktop.org/pwithnall/malcontent/-/issues/27
Bug-Debian: https://bugs.debian.org/972145
Signed-off-by: Simon McVittie <smcv@debian.org>
2020-10-15 09:04:13 +01:00
Philip Withnall 5c0a7bf056 Merge branch 's1' into 'master'
Add Danish translation

See merge request pwithnall/malcontent!88
2020-10-12 11:13:39 +00:00
scootergrisen fe5deabdf4 Add Danish translation 2020-10-11 23:00:16 +02:00
Philip Withnall dbe726fb5e Merge branch 'master' into 'master'
l10n-sv

See merge request pwithnall/malcontent!87
2020-09-14 14:28:02 +00:00
Anders Jonsson 2c37e217b4 Add Swedish help translation 2020-09-14 16:10:12 +02:00
Anders Jonsson 40373ee255 Update Swedish translation 2020-09-14 16:00:39 +02:00
Philip Withnall f9d283ac83 Merge branch 'l10n-it' into 'master'
l10n: Update Italian translation

See merge request pwithnall/malcontent!86
2020-09-14 08:29:16 +00:00
Milo Casagrande bda8b88bbc l10n: Update Italian translation
Signed-off-by: Milo Casagrande <milo@milo.name>
2020-09-14 09:56:01 +02:00
Philip Withnall bbe53b521f Merge branch 'uk_update2' into 'master'
Update Ukrainian translation

See merge request pwithnall/malcontent!85
2020-09-10 08:55:31 +00:00
Yuri Chornoivan aca7f0aeab Update Ukrainian translation 2020-09-10 09:35:18 +03:00
Philip Withnall f592d0e36c Merge branch 'appstream-validation' into 'master'
Fix strict appdata validation

Closes #23

See merge request pwithnall/malcontent!84
2020-09-08 12:04:08 +00:00
Philip Withnall 8789d8980b malcontent-control: Add descriptive paragraphs to appdata releases
This fixes strict validation.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Fixes: #23
2020-09-08 12:52:17 +01:00
Philip Withnall b25110beab malcontent-control: Add a screenshot to the appdata
This fixes a problem with strict validation.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #23
2020-09-08 12:51:53 +01:00
Philip Withnall bf9bf5e8ba 0.9.0
Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-09-03 12:03:51 +01:00
Philip Withnall bb427946f9 Merge branch 'master' into 'master'
Update Spanish translation

See merge request pwithnall/malcontent!83
2020-09-01 12:08:35 +00:00
Adolfo Jayme Barrientos 26661fa64b Update Spanish translation 2020-08-22 09:42:06 -05:00
Philip Withnall 61c6becfcd Merge branch 'subproject-depth' into 'master'
subprojects: Limit depth when cloning

See merge request pwithnall/malcontent!82
2020-07-22 13:57:56 +00:00
Philip Withnall a6601a934b subprojects: Limit depth when cloning
This reduces the bandwidth requirements of subprojects a little.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-07-21 12:43:24 +01:00
Philip Withnall 97e6205900 Merge branch 'ci-revamp' into 'master'
ci: Use pre-built Docker images for CI builds

See merge request pwithnall/malcontent!81
2020-07-21 11:10:25 +00:00
Philip Withnall e6f82a4a86 ci: Use pre-built Docker images for CI builds
Rather than updating the packages on a generic Debian Unstable image
every time a CI build happens, pre-build the image and pre-download all
the dependencies.

This should speed the CI runs up; they currently take about 4 minutes.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-07-21 11:58:51 +01:00
Philip Withnall 9161baf0cd Merge branch 'patch-1' into 'master'
Update Brazilian Portuguese translation

See merge request pwithnall/malcontent!80
2020-07-21 10:10:26 +00:00
Rafael Fontenelle 9dd477df9e Update Brazilian Portuguese translation 2020-07-18 11:26:19 -03:00
Philip Withnall ab75b35d91 Merge branch 'subprojects-again' into 'master'
build: Re-add libglib-testing subproject

See merge request pwithnall/malcontent!79
2020-07-07 14:32:14 +00:00
Philip Withnall 81964dec1f build: Re-add libglib-testing subproject
This time, add it as a wrap module rather than a git submodule. They’re
easier to manage, and integrate better with Meson.

The subproject has to be re-added so that malcontent can be built on
Debian Stable and Fedora 31 for the gnome-software CI. See
https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/487.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-07-07 15:29:11 +01:00
Philip Withnall 7d9c32aa9a Merge branch 'source_root' into 'master'
build: Use meson.current_source_dir() instead of source_root()

See merge request pwithnall/malcontent!78
2020-07-06 10:02:50 +00:00
Philip Withnall d085c7f585 build: Use meson.current_source_dir() instead of source_root()
The latter doesn’t work well when building as a subproject — it
explicitly refers to the parent project root.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-07-06 10:59:45 +01:00
Philip Withnall c4853f0f02 Merge branch 'codespell' into 'master'
all: Fix various typos and incorrect terminology

See merge request pwithnall/malcontent!77
2020-06-18 16:39:53 +00:00
Philip Withnall 363bd53e7d Merge branch 'privileged_group' into 'master'
Add option to tweak privileged group in polkit rules

Closes #22

See merge request pwithnall/malcontent!76
2020-06-18 13:12:39 +00:00
Philip Withnall 73d7c5e113 all: Fix various typos and incorrect terminology
Done using:
```
codespell \
    --builtin clear,rare,usage \
    --skip './po/*' --skip './help/*/*.po' --skip './.git/*' --skip './NEWS*' \
    --write-changes .
```
and then some manual checking and editing.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-06-18 13:51:35 +01:00
Sergey Shatunov ffb1279301
Use sudo group in debian ci build
Signed-off-by: Sergey Shatunov <me@prok.pw>
2020-06-18 03:39:01 +07:00
Sergey Shatunov 0114e4d965
Add option to tweak privileged group in polkit rules
Signed-off-by: Sergey Shatunov <me@prok.pw>
2020-06-18 03:35:36 +07:00
Philip Withnall ce26ca909c Merge branch 'piotrdrag/pl-update-200614' into 'master'
Update Polish translation 200614

See merge request pwithnall/malcontent!75
2020-06-17 17:42:22 +00:00
Piotr Drąg b200d8a4a8 Update Polish translation 2020-06-14 13:50:00 +02:00
Philip Withnall ae9ea66095 Merge branch 'uk_update' into 'master'
Update Ukrainian translation

See merge request pwithnall/malcontent!74
2020-06-10 18:04:29 +00:00
Yuri Chornoivan 01279055cc Update Ukrainian translation 2020-06-10 20:39:52 +03:00
Philip Withnall 63f59aee71 Merge branch 'translations' into 'master'
po: Update translations from downstream in Endless

See merge request pwithnall/malcontent!73
2020-06-10 11:40:18 +00:00
Philip Withnall 46aaefeffc po: Update translations from downstream in Endless
We’ll drop the Transifex translation machinery downstream after this, so
this is the last time the translations will be synced.

I have not verified any of these translations, but am upstreaming them
on the premise that some strings are better than no strings.

This commit was produced by:
 1. `ninja malcontent-update-po`
 2. Copy in po files from downstream
 3. `ninja malcontent-update-po` again
 4. Manually drop header-only changes
 5. Manually drop changes to `translator-credits`
 6. Manually drop some conflicted strings from `id.po` (prefer the
    upstream versions)
 7. Manually merge headers

There are no more `help/` translations to upstream.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-06-10 12:37:21 +01:00
Philip Withnall 93b5fa3ea2 po: Update po files
This is simply the result of
```
ninja malcontent-update-po
```

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-06-10 12:36:55 +01:00
Philip Withnall f97b9e0c64 Merge branch 'inclusive-terminology' into 'master'
tree-wide: Replace usages of whitelist/blacklist

See merge request pwithnall/malcontent!72
2020-06-10 08:55:23 +00:00
Matthew Leeds 15e8a74b21 tree-wide: Replace usages of whitelist/blacklist
Replace usages of the terms whitelist and blacklist with the more
inclusive and more precise terms allowlist and blocklist, which are
actually also more consistent with parts of the codebase, e.g.
mct_app_filter_is_content_type_allowed().

The only API break here is in libmalcontent/app-filter.h but the
relevant API is not used anywhere else in Endless OS beyond this repo,
nor to my knowledge in any other distribution. Also, per the README,
this project's API is not stable, so now is a good time to make this
change.
2020-06-09 15:35:21 -07:00
Philip Withnall c6fd3c0ad3 Merge branch 'oars-csm-update' into 'master'
gs-content-rating: Backport OARS/CSM mapping changes from appstream-glib

Closes #21

See merge request pwithnall/malcontent!71
2020-06-09 10:10:45 +00:00
Philip Withnall 2d4e8e0012 gs-content-rating: Backport OARS/CSM mapping changes from appstream-glib
This is a backport of commit 01e9ee8113 from appstream-glib:

    as-content-rating: Lower the OARS/CSM mapping of sex-homosexuality/intense

    This rationalises it with the OARS/CSM mapping of
    sex-themes/intense, and with many western societal norms. It is
    against the laws and morals of various western countries to discriminate
    on sexual orientation, so the mappings for sex-homosexuality/intense and
    sex-themes/intense should be the same.

    The mappings for the other values of sex-homosexuality and sex-themes
    remain different, as their descriptions aren’t as comparable (for
    example, for `mild`, the descriptions are “Indirect references to
    homosexuality” vs “Provocative references or descriptions”).

    The sex-homosexuality ratings category does need to continue to exist,
    though, as it’s illegal in some countries to *not* discriminate on
    sexual orientation. Those countries can provide and maintain their own
    OARS/age mappings.

    See https://gitlab.freedesktop.org/pwithnall/malcontent/-/issues/21.
    This issue is now being solved in appstream-glib as the content rating
    code has been moved there so it can be shared between malcontent and
    gnome-software.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Fixes: https://gitlab.freedesktop.org/pwithnall/malcontent/-/issues/21
2020-06-09 11:07:54 +01:00
Philip Withnall 14f0284a60 Merge branch 'content-rating-rationalisation' into 'master'
Use appstream-glib implementation of content rating systems

Closes #7

See merge request pwithnall/malcontent!70
2020-06-09 09:06:22 +00:00
Philip Withnall 52399e8d58 libmalcontent-ui: Use appstream-glib code for content rating systems
If a suitably new version of appstream-glib is available, use its
implementation of content rating systems (see
https://github.com/hughsie/appstream-glib/pull/364), rather than our
forked one.

This adds a dependency on libappstream-glib, but no particular version.

Eventually, our copy of `gs-content-rating.[ch]` can be dropped.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Fixes: #7
2020-05-21 16:25:21 +01:00
Philip Withnall 12c1718782 libmalcontent-ui: Fix inconsistencies in OARS → CSM mappings
This incorporates the following commits from gnome-software:
 • 4db48ef429501d86a45e87eaf8dd97e59dea0d58
 • a62b57a60f886a61c30f17b08277c1b826068a9d
 • 617f0de4f109efe319de36cbc42076e667578eda

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-05-21 16:14:09 +01:00
Philip Withnall 2a87b85fe1 libmalcontent-ui: Add an explicit array length argument to a function
This aligns the copy of the API here with what’s being proposed in
appstream-glib (https://github.com/hughsie/appstream-glib/pull/364). In
a few commits’ time, this copy will be deprecated.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-05-21 16:03:46 +01:00
Philip Withnall 150d303d39 fixup! libmalcontent-ui: Update content rating formatting code 2020-05-21 16:02:40 +01:00
Philip Withnall 9064babe6f fixup! libmalcontent-ui: Update content rating formatting code 2020-05-21 16:01:10 +01:00