[glib] (7 commits) Non-fast-forward update to branch settings-portal

[Matthias Clasen <matthiasc src gnome org>]

The branch 'settings-portal' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  97c64c1... settings: Make the keyfile backend parameterless
  875fb22... settings: Register the keyfile backend as extension
  556d3db... settings: Add support for defaults to keyfile backend
  6c1150a... settings: Prefer the keyfile backend when sandboxed

Commits added to the branch:

  4a0ce6b... Add separate definitions of g_assert_[non]null() for C++ (*)
  193cc66... Merge branch 'mcatanzaro/g_assert_cpp' into 'master' (*)
  5b57860... settings: Make the keyfile backend parameterless
  a577af1... settings: Register the keyfile backend as extension
  b35c414... settings: Add support for defaults to keyfile backend
  0429ef7... settings: Prefer the keyfile backend when sandboxed
  b676c6b... Cosmetic review fixes

(*) This commit already existed in another branch; no separate mail sent