pidgin/pidgin

Prepare GSettings schemas and a default settings backend

20 months ago, Elliott Sales de Andrade
6a4db60af05b
Parents c6edf4d87185
Children d8a78f5c982d
Prepare GSettings schemas and a default settings backend

This does nothing by itself yet.

Reviewed at https://reviews.imfreedom.org/r/1733/
6 files changed, 62 insertions(+), 15 deletions(-)
  • +16 -0
    libpurple/core.c
  • +16 -0
    libpurple/core.h
  • +5 -0
    libpurple/data/im.pidgin.Purple.gschema.xml
  • +24 -0
    libpurple/data/meson.build
  • +1 -14
    libpurple/meson.build
  • +0 -1
    libpurple/prefs.c
    • --- a/libpurple/core.c Sat Sep 10 23:33:43 2022 -0500
    +++ b/libpurple/core.c Sun Sep 11 00:33:00 2022 -0500
    @@ -20,6 +20,8 @@
    */
    #include <glib/gi18n-lib.h>
    +#define G_SETTINGS_ENABLE_BACKEND
    +#include <gio/gsettingsbackend.h>
    #include "internal.h"
    #include "cmds.h"
    @@ -56,6 +58,7 @@
    static PurpleCoreUiOps *_ops = NULL;
    static PurpleCore *_core = NULL;
    +static GSettingsBackend *settings_backend = NULL;
    static void
    purple_core_print_version(void)
    @@ -90,6 +93,8 @@
    purple_core_init(PurpleUiInfo *ui_info) {
    PurpleCoreUiOps *ops;
    PurpleCore *core;
    + gchar *config_file = NULL;
    + gchar *config = NULL;
    g_return_val_if_fail(PURPLE_IS_UI_INFO(ui_info), FALSE);
    g_return_val_if_fail(purple_get_core() == NULL, FALSE);
    @@ -128,6 +133,11 @@
    /* The prefs subsystem needs to be initialized before static protocols
    * for protocol prefs to work. */
    purple_prefs_init();
    + config_file = g_strdup_printf("%s.ini", purple_ui_info_get_id(ui_info));
    + config = g_build_filename(purple_config_dir(), config_file, NULL);
    + settings_backend = g_keyfile_settings_backend_new(config, "/", NULL);
    + g_free(config_file);
    + g_free(config);
    purple_debug_init();
    @@ -237,6 +247,7 @@
    ops->quit();
    /* Everything after prefs_uninit must not try to read any prefs */
    + g_clear_object(&settings_backend);
    purple_prefs_uninit();
    purple_plugins_uninit();
    @@ -286,6 +297,11 @@
    return _core;
    }
    +gpointer
    +purple_core_get_settings_backend(void) {
    + return settings_backend;
    +}
    +
    void
    purple_core_set_ui_ops(PurpleCoreUiOps *ops)
    {
    --- a/libpurple/core.h Sat Sep 10 23:33:43 2022 -0500
    +++ b/libpurple/core.h Sun Sep 11 00:33:00 2022 -0500
    @@ -96,6 +96,22 @@
    PurpleCore *purple_get_core(void);
    /**
    + * purple_core_get_settings_backend:
    + *
    + * Gets the settings backend to use when saving/loading settings.
    + *
    + * Note, because we do not want to leak `G_SETTINGS_ENABLE_BACKEND` into
    + * libpurple users, this function returns a `gpointer`, and you should cast to
    + * `GSettingsBackend *` after setting `G_SETTINGS_ENABLE_BACKEND` for the files
    + * where you need it.
    + *
    + * Returns: (transfer none): The [class@Gio.SettingsBackend] to use.
    + *
    + * Since: 3.0.0
    + */
    +gpointer purple_core_get_settings_backend(void);
    +
    +/**
    * purple_core_set_ui_ops:
    * @ops: A UI ops structure for the core.
    *
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/libpurple/data/im.pidgin.Purple.gschema.xml Sun Sep 11 00:33:00 2022 -0500
    @@ -0,0 +1,5 @@
    +<?xml version="1.0" encoding="utf-8"?>
    +<schemalist>
    + <schema path="/" id="im.pidgin.Purple">
    + </schema>
    +</schemalist>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/libpurple/data/meson.build Sun Sep 11 00:33:00 2022 -0500
    @@ -0,0 +1,24 @@
    +PURPLE3_URL_HANDLER_DESKTOP = 'purple3-url-handler.desktop'
    +i18n = import('i18n')
    +desktop_file_in = configure_file(
    + input : PURPLE3_URL_HANDLER_DESKTOP + '.in.in',
    + output : PURPLE3_URL_HANDLER_DESKTOP + '.in',
    + configuration : conf)
    +i18n.merge_file(
    + input : desktop_file_in,
    + output : PURPLE3_URL_HANDLER_DESKTOP,
    + po_dir : meson.project_source_root() / 'po',
    + type : 'desktop',
    + install : true,
    + install_dir : get_option('datadir') / 'applications')
    +
    +schemas_dir = get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas'
    +settings_schemas = [
    + 'im.pidgin.Purple.gschema.xml',
    +]
    +
    +install_data(settings_schemas, install_dir: schemas_dir)
    +gnome.post_install(glib_compile_schemas: true)
    +
    +# Compile the schemas in the current directory; this is only useful for testing
    +gnome.compile_schemas(depend_files: files(settings_schemas))
    --- a/libpurple/meson.build Sat Sep 10 23:33:43 2022 -0500
    +++ b/libpurple/meson.build Sun Sep 11 00:33:00 2022 -0500
    @@ -363,20 +363,7 @@
    meson.override_dependency(purple_filebase, libpurple_dep)
    -PURPLE3_URL_HANDLER_DESKTOP = 'purple3-url-handler.desktop'
    -i18n = import('i18n')
    -desktop_file_in = configure_file(
    - input : 'data' / (PURPLE3_URL_HANDLER_DESKTOP + '.in.in'),
    - output : PURPLE3_URL_HANDLER_DESKTOP + '.in',
    - configuration : conf)
    -i18n.merge_file(
    - input : desktop_file_in,
    - output : PURPLE3_URL_HANDLER_DESKTOP,
    - po_dir : meson.project_source_root() / 'po',
    - type : 'desktop',
    - install : true,
    - install_dir : get_option('datadir') / 'applications')
    -
    +subdir('data')
    subdir('tests')
    subdir('example')
    subdir('plugins')
    --- a/libpurple/prefs.c Sat Sep 10 23:33:43 2022 -0500
    +++ b/libpurple/prefs.c Sun Sep 11 00:33:00 2022 -0500
    @@ -1742,7 +1742,6 @@
    purple_prefs_destroy();
    g_hash_table_destroy(prefs_hash);
    prefs_hash = NULL;
    -
    }
    void