pidgin/pidgin

Remove PurplePrefsUiOps.

19 months ago, Gary Kramlich
aefc93bef426
Parents bcfc2c9e5213
Children eee8aa10c2a0
Remove PurplePrefsUiOps.

These were added for Instantbird which is no longer maintained and we're moving
to GSettings anyways. So this just makes the code easier to understand in the
meantime.

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1815/
3 files changed, 11 insertions(+), 360 deletions(-)
  • +3 -0
    ChangeLog.API
  • +8 -256
    libpurple/prefs.c
  • +0 -104
    libpurple/prefs.h
    • --- a/ChangeLog.API Tue Sep 20 02:44:44 2022 -0500
    +++ b/ChangeLog.API Tue Sep 20 02:55:07 2022 -0500
    @@ -575,12 +575,15 @@
    * PurplePounceCb
    * PurplePounceEvent
    * PurplePounceOption
    + * PurplePrefsUiOps
    * PurpleProxyConnectData
    * PurpleProxyConnectFunction
    * purple_proxy_connect
    * purple_proxy_connect_cancel
    * purple_proxy_connect_cancel_with_handle
    + * purple_prefs_get_ui_ops
    * purple_prefs_set_generic
    + * purple_prefs_set_ui_ops
    * purple_prefs_update_old
    * purple_presence_add_status
    * purple_presence_add_list
    --- a/libpurple/prefs.c Tue Sep 20 02:44:44 2022 -0500
    +++ b/libpurple/prefs.c Tue Sep 20 02:55:07 2022 -0500
    @@ -37,8 +37,6 @@
    #include "purplepath.h"
    #include "util.h"
    -static PurplePrefsUiOps *prefs_ui_ops = NULL;
    -
    struct _PurplePrefCallbackData {
    PurplePrefCallback func;
    gpointer data;
    @@ -93,25 +91,6 @@
    static GHashTable *prefs_hash = NULL;
    static guint save_timer = 0;
    static gboolean prefs_loaded = FALSE;
    -static GSList *ui_callbacks = NULL;
    -
    -#define PURPLE_PREFS_UI_OP_CALL(member, ...) \
    - { \
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops(); \
    - if (uiop && uiop->member) { \
    - uiop->member(__VA_ARGS__); \
    - return; \
    - } \
    - }
    -
    -#define PURPLE_PREFS_UI_OP_CALL_RETURN(member, ...) \
    - { \
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops(); \
    - if (uiop && uiop->member) { \
    - return uiop->member(__VA_ARGS__); \
    - } \
    - }
    -
    /*********************************************************************
    * Private utility functions *
    @@ -240,8 +219,6 @@
    return;
    }
    - PURPLE_PREFS_UI_OP_CALL(save);
    -
    node = prefs_to_xmlnode();
    data = purple_xmlnode_to_formatted_str(node, NULL);
    purple_util_write_data_to_config_file("prefs.xml", data, -1);
    @@ -260,8 +237,6 @@
    static void
    schedule_prefs_save(void)
    {
    - PURPLE_PREFS_UI_OP_CALL(schedule_save);
    -
    if (save_timer == 0)
    save_timer = g_timeout_add_seconds(5, save_cb, NULL);
    }
    @@ -419,13 +394,6 @@
    GMarkupParseContext *context;
    GError *error = NULL;
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops();
    -
    - if (uiop && uiop->load) {
    - prefs_loaded = TRUE;
    - return uiop->load();
    - }
    -
    filename = g_build_filename(purple_config_dir(), "prefs.xml", NULL);
    if (!filename) {
    @@ -644,8 +612,6 @@
    void
    purple_prefs_add_none(const char *name)
    {
    - PURPLE_PREFS_UI_OP_CALL(add_none, name);
    -
    add_pref(PURPLE_PREF_NONE, name);
    }
    @@ -654,8 +620,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL(add_bool, name, value);
    -
    pref = add_pref(PURPLE_PREF_BOOLEAN, name);
    if(!pref)
    @@ -669,8 +633,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL(add_int, name, value);
    -
    pref = add_pref(PURPLE_PREF_INT, name);
    if(!pref)
    @@ -689,8 +651,6 @@
    return;
    }
    - PURPLE_PREFS_UI_OP_CALL(add_string, name, value);
    -
    pref = add_pref(PURPLE_PREF_STRING, name);
    if(!pref)
    @@ -705,8 +665,6 @@
    struct purple_pref *pref;
    GList *tmp;
    - PURPLE_PREFS_UI_OP_CALL(add_string_list, name, value);
    -
    pref = add_pref(PURPLE_PREF_STRING_LIST, name);
    if(!pref)
    @@ -727,9 +685,6 @@
    {
    struct purple_pref *pref;
    - /* re-use the string UI OP */
    - PURPLE_PREFS_UI_OP_CALL(add_string, name, value);
    -
    pref = add_pref(PURPLE_PREF_PATH, name);
    if(!pref)
    @@ -743,9 +698,6 @@
    {
    struct purple_pref *pref;
    - /* re-use the string list UI OP */
    - PURPLE_PREFS_UI_OP_CALL(add_string_list, name, value);
    -
    pref = add_pref(PURPLE_PREF_PATH_LIST, name);
    if(!pref)
    @@ -831,8 +783,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL(remove, name);
    -
    pref = find_pref(name);
    if(!pref)
    @@ -860,43 +810,10 @@
    }
    }
    -static void
    -do_ui_callbacks(const char *name)
    -{
    - GSList *cbs;
    -
    - purple_debug_misc("prefs", "trigger callback %s\n", name);
    -
    - for (cbs = ui_callbacks; cbs; cbs = cbs->next) {
    - PurplePrefCallbackData *cb = cbs->data;
    - const char *cb_name = cb->name;
    - size_t len = strlen(cb_name);
    - if (!strncmp(cb_name, name, len) &&
    - (name[len] == 0 || name[len] == '/' ||
    - (len && name[len - 1] == '/'))) {
    - /* This test should behave like this:
    - * name = /toto/tata
    - * cb_name = /toto/tata --> true
    - * cb_name = /toto/tatatiti --> false
    - * cb_name = / --> true
    - * cb_name = /toto --> true
    - * cb_name = /toto/ --> true
    - */
    - purple_prefs_trigger_callback_object(cbs->data);
    - }
    - }
    -}
    -
    void
    purple_prefs_trigger_callback(const char *name)
    {
    struct purple_pref *pref;
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops();
    -
    - if (uiop && uiop->connect_callback) {
    - do_ui_callbacks(name);
    - return;
    - }
    pref = find_pref(name);
    @@ -915,8 +832,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL(set_bool, name, value);
    -
    pref = find_pref(name);
    if(pref) {
    @@ -940,8 +855,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL(set_int, name, value);
    -
    pref = find_pref(name);
    if(pref) {
    @@ -970,8 +883,6 @@
    return;
    }
    - PURPLE_PREFS_UI_OP_CALL(set_string, name, value);
    -
    pref = find_pref(name);
    if(pref) {
    @@ -996,8 +907,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL(set_string_list, name, value);
    -
    pref = find_pref(name);
    if(pref) {
    @@ -1035,8 +944,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL(set_string, name, value);
    -
    pref = find_pref(name);
    if(pref) {
    @@ -1061,8 +968,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL(set_string_list, name, value);
    -
    pref = find_pref(name);
    if(pref) {
    @@ -1089,8 +994,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(exists, name);
    -
    pref = find_pref(name);
    if (pref != NULL)
    @@ -1104,8 +1007,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(get_type, name);
    -
    pref = find_pref(name);
    if (pref == NULL)
    @@ -1119,8 +1020,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(get_bool, name);
    -
    pref = find_pref(name);
    if(!pref) {
    @@ -1141,8 +1040,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(get_int, name);
    -
    pref = find_pref(name);
    if(!pref) {
    @@ -1163,8 +1060,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(get_string, name);
    -
    pref = find_pref(name);
    if(!pref) {
    @@ -1185,8 +1080,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(get_string_list, name);
    -
    pref = find_pref(name);
    if(!pref) {
    @@ -1207,8 +1100,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(get_string, name);
    -
    pref = find_pref(name);
    if(!pref) {
    @@ -1229,8 +1120,6 @@
    {
    struct purple_pref *pref;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(get_string_list, name);
    -
    pref = find_pref(name);
    if(!pref) {
    @@ -1319,8 +1208,6 @@
    {
    struct purple_pref *oldpref, *newpref;
    - PURPLE_PREFS_UI_OP_CALL(rename, oldname, newname);
    -
    oldpref = find_pref(oldname);
    /* it's already been renamed, call off the dogs */
    @@ -1343,8 +1230,6 @@
    {
    struct purple_pref *oldpref, *newpref;
    - PURPLE_PREFS_UI_OP_CALL(rename_boolean_toggle, oldname, newname);
    -
    oldpref = find_pref(oldname);
    /* it's already been renamed, call off the cats */
    @@ -1390,19 +1275,13 @@
    struct purple_pref *pref = NULL;
    PurplePrefCallbackData *cb;
    static guint cb_id = 0;
    - PurplePrefsUiOps *uiop = NULL;
    -
    g_return_val_if_fail(name != NULL, 0);
    g_return_val_if_fail(func != NULL, 0);
    - uiop = purple_prefs_get_ui_ops();
    -
    - if (!(uiop && uiop->connect_callback)) {
    - pref = find_pref(name);
    - if (pref == NULL) {
    - purple_debug_error("prefs", "purple_prefs_connect_callback: Unknown pref %s\n", name);
    - return 0;
    - }
    + pref = find_pref(name);
    + if (pref == NULL) {
    + purple_debug_error("prefs", "purple_prefs_connect_callback: Unknown pref %s\n", name);
    + return 0;
    }
    cb = g_new0(PurplePrefCallbackData, 1);
    @@ -1413,75 +1292,15 @@
    cb->handle = handle;
    cb->name = g_strdup(name);
    - if (uiop && uiop->connect_callback) {
    - cb->ui_data = uiop->connect_callback(name, cb);
    -
    - if (cb->ui_data == NULL) {
    - purple_debug_error("prefs", "purple_prefs_connect_callback: connect failed for %s\n", name);
    - g_free(cb->name);
    - g_free(cb);
    - return 0;
    - }
    -
    - ui_callbacks = g_slist_append(ui_callbacks, cb);
    - } else {
    - pref->callbacks = g_slist_append(pref->callbacks, cb);
    - }
    + pref->callbacks = g_slist_append(pref->callbacks, cb);
    return cb->id;
    }
    -static void
    -purple_prefs_trigger_ui_callback_object(PurplePrefCallbackData *cb)
    -{
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops();
    - gconstpointer value = NULL;
    - PurplePrefType type = PURPLE_PREF_NONE;
    -
    - type = uiop->get_type(cb->name);
    -
    - switch (type) {
    - case PURPLE_PREF_INT:
    - if (uiop->get_int) {
    - value = GINT_TO_POINTER(uiop->get_int(cb->name));
    - }
    - break;
    - case PURPLE_PREF_BOOLEAN:
    - if (uiop->get_bool) {
    - value = GINT_TO_POINTER(uiop->get_bool(cb->name));
    - }
    - break;
    - case PURPLE_PREF_STRING:
    - case PURPLE_PREF_PATH:
    - if (uiop->get_string) {
    - value = uiop->get_string(cb->name);
    - }
    - break;
    - case PURPLE_PREF_STRING_LIST:
    - case PURPLE_PREF_PATH_LIST:
    - if (uiop->get_string_list) {
    - value = uiop->get_string_list(cb->name);
    - }
    - break;
    - case PURPLE_PREF_NONE:
    - break;
    - default:
    - purple_debug_error("prefs", "Unexpected type = %i\n", type);
    - }
    -
    - cb->func(cb->name, type, value, cb->data);
    -}
    -
    void
    purple_prefs_trigger_callback_object(PurplePrefCallbackData *cb)
    {
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops();
    -
    - if (uiop && uiop->connect_callback && uiop->get_type) {
    - purple_prefs_trigger_ui_callback_object(cb);
    - } else {
    - purple_prefs_trigger_callback(cb->name);
    - }
    + purple_prefs_trigger_callback(cb->name);
    }
    static gboolean
    @@ -1511,35 +1330,10 @@
    return FALSE;
    }
    -static void
    -disco_ui_callback_helper(guint callback_id)
    -{
    - GSList *cbs;
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops();
    -
    - for (cbs = ui_callbacks; cbs; cbs = cbs->next) {
    - PurplePrefCallbackData *cb = cbs->data;
    - if (cb->id == callback_id) {
    - uiop->disconnect_callback(cb->name, cb->ui_data);
    -
    - ui_callbacks = g_slist_delete_link(ui_callbacks, cbs);
    - g_free(cb->name);
    - g_free(cb);
    - return;
    - }
    - }
    -}
    -
    void
    purple_prefs_disconnect_callback(guint callback_id)
    {
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops();
    -
    - if (uiop && uiop->disconnect_callback) {
    - disco_ui_callback_helper(callback_id);
    - } else {
    - disco_callback_helper(&prefs, callback_id);
    - }
    + disco_callback_helper(&prefs, callback_id);
    }
    static void
    @@ -1567,40 +1361,12 @@
    disco_callback_helper_handle(child, handle);
    }
    -static void
    -disco_ui_callback_helper_handle(void *handle)
    -{
    - GSList *cbs;
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops();
    -
    - for (cbs = ui_callbacks; cbs; cbs = cbs->next) {
    - PurplePrefCallbackData *cb = cbs->data;
    - if (cb->handle != handle) {
    - cbs = cbs->next;
    - continue;
    - }
    -
    - uiop->disconnect_callback(cb->name, cb->ui_data);
    -
    - ui_callbacks = g_slist_delete_link(ui_callbacks, cbs);
    - g_free(cb->name);
    - g_free(cb);
    - cbs = ui_callbacks;
    - }
    -}
    -
    void
    purple_prefs_disconnect_by_handle(void *handle)
    {
    - PurplePrefsUiOps *uiop = purple_prefs_get_ui_ops();
    -
    g_return_if_fail(handle != NULL);
    - if (uiop && uiop->disconnect_callback) {
    - disco_ui_callback_helper_handle(handle);
    - } else {
    - disco_callback_helper_handle(&prefs, handle);
    - }
    + disco_callback_helper_handle(&prefs, handle);
    }
    GList *
    @@ -1610,8 +1376,6 @@
    struct purple_pref *pref, *child;
    char sep[2] = "\0\0";;
    - PURPLE_PREFS_UI_OP_CALL_RETURN(get_children_names, name);
    -
    pref = find_pref(name);
    if (pref == NULL)
    @@ -1745,15 +1509,3 @@
    g_hash_table_destroy(prefs_hash);
    prefs_hash = NULL;
    }
    -
    -void
    -purple_prefs_set_ui_ops(PurplePrefsUiOps *ops)
    -{
    - prefs_ui_ops = ops;
    -}
    -
    -PurplePrefsUiOps *
    -purple_prefs_get_ui_ops(void)
    -{
    - return prefs_ui_ops;
    -}
    --- a/libpurple/prefs.h Tue Sep 20 02:44:44 2022 -0500
    +++ b/libpurple/prefs.h Tue Sep 20 02:55:07 2022 -0500
    @@ -81,112 +81,8 @@
    */
    typedef struct _PurplePrefCallbackData PurplePrefCallbackData;
    -typedef struct _PurplePrefsUiOps PurplePrefsUiOps;
    -
    -/**
    - * PurplePrefsUiOps:
    - * @add_none: see #purple_prefs_add_none.
    - * @add_bool: see #purple_prefs_add_bool.
    - * @add_int: see #purple_prefs_add_int.
    - * @add_string: see #purple_prefs_add_string.
    - * @add_string_list: see #purple_prefs_add_string_list.
    - * @set_bool: see #purple_prefs_set_bool.
    - * @set_int: see #purple_prefs_set_int.
    - * @set_string: see #purple_prefs_set_string.
    - * @set_string_list: see #purple_prefs_set_string_list.
    - * @get_bool: see #purple_prefs_get_bool.
    - * @get_int: see #purple_prefs_get_int.
    - * @get_string: see #purple_prefs_get_string.
    - * @get_string_list: see #purple_prefs_get_string_list.
    - * @get_type: see #purple_prefs_get_type.
    - * @get_children_names: see #purple_prefs_get_children_names.
    - * @exists: see #purple_prefs_exists.
    - * @remove: see #purple_prefs_remove.
    - * @rename: see #purple_prefs_rename.
    - * @rename_boolean_toggle: see #purple_prefs_rename_boolean_toggle.
    - * @load: see #purple_prefs_load.
    - * @save: see #purple_prefs_save.
    - * @schedule_save: see #purple_prefs_schedule_save.
    - * @connect_callback: see #purple_prefs_connect_callback.
    - * @disconnect_callback: see #purple_prefs_disconnect_callback.
    - *
    - * Prefs UI operations. This allows overriding the prefs.xml storage with
    - * anything else.
    - *
    - * Unless specified otherwise, each entry provides an implementation for the
    - * corresponding purple_prefs_* method, and disables the prefs.xml code for it.
    - * This means that to do anything useful, all the methods must be implemented.
    - *
    - * Since: 2.11.0
    - */
    -struct _PurplePrefsUiOps
    -{
    - void (*add_none)(const char *name);
    - void (*add_bool)(const char *name, gboolean value);
    - void (*add_int)(const char *name, int value);
    - void (*add_string)(const char *name, const char *value);
    - void (*add_string_list)(const char *name, GList *value);
    -
    - void (*set_bool)(const char *name, gboolean value);
    - void (*set_int)(const char *name, int value);
    - void (*set_string)(const char *name, const char *value);
    - void (*set_string_list)(const char *name, GList *value);
    -
    - gboolean (*get_bool)(const char *name);
    - int (*get_int)(const char *name);
    - const char *(*get_string)(const char *name);
    - GList *(*get_string_list)(const char *name);
    -
    - PurplePrefType (*get_type)(const char *name);
    - GList *(*get_children_names)(const char *name);
    -
    - gboolean (*exists)(const char *name);
    - void (*remove)(const char *name);
    -
    - void (*rename)(const char *oldname, const char *newname);
    - void (*rename_boolean_toggle)(const char *oldname, const char *newname);
    -
    - gboolean (*load)(void);
    - void (*save)(void);
    - void (*schedule_save)(void);
    -
    - void *(*connect_callback)(const char *name, PurplePrefCallbackData *data);
    - void (*disconnect_callback)(const char *name, void *ui_data);
    -
    - /*< private >*/
    - void (*_purple_reserved1)(void);
    - void (*_purple_reserved2)(void);
    - void (*_purple_reserved3)(void);
    - void (*_purple_reserved4)(void);
    -};
    -
    G_BEGIN_DECLS
    -/******************************************************************************
    - * UI Registration Functions
    - *****************************************************************************/
    -
    -/**
    - * purple_prefs_set_ui_ops:
    - * @ops: The UI operations structure.
    - *
    - * Sets the UI operations structure to be used for preferences.
    - *
    - * Since: 2.11.0
    - */
    -void purple_prefs_set_ui_ops(PurplePrefsUiOps *ops);
    -
    -/**
    - * purple_prefs_get_ui_ops:
    - *
    - * Returns the UI operations structure used for preferences.
    - *
    - * Returns: (transfer none): The UI operations structure in use.
    - *
    - * Since: 2.11.0
    - */
    -PurplePrefsUiOps *purple_prefs_get_ui_ops(void);
    -
    /**************************************************************************/
    /* Prefs API
    Preferences are named according to a directory-like structure.