pidgin/pidgin

Remove unused enums from Pidgin

15 months ago, Elliott Sales de Andrade
e110f2d6dbd3
Parents f05baca349b3
Children 941734e74261
Remove unused enums from Pidgin

None of the listed headers define any public & used enums, so they can be removed from the Meson list.

But actually, none of the headers in Pidgin define any enums, so remove the whole `pidginenums.h`. We can re-add it later if needed.

Testing Done:
Compiled only.

Reviewed at https://reviews.imfreedom.org/r/2208/
5 files changed, 19 insertions(+), 35 deletions(-)
  • +6 -0
    ChangeLog.API
  • +0 -6
    pidgin/gtkblist.h
  • +12 -0
    pidgin/gtkconv.c
  • +0 -12
    pidgin/gtkconv.h
  • +1 -17
    pidgin/meson.build
    • --- a/ChangeLog.API Mon Jan 23 20:51:42 2023 -0600
    +++ b/ChangeLog.API Mon Jan 23 20:55:34 2023 -0600
    @@ -934,6 +934,11 @@
    Removed:
    * account-modified (gtkaccount signal)
    + * CHAT_USERS_ALIAS_COLUMN, CHAT_USERS_ALIAS_KEY_COLUMN,
    + CHAT_USERS_COLOR_COLUMN, CHAT_USERS_COLUMNS,
    + CHAT_USERS_FLAGS_COLUMN, CHAT_USERS_ICON_COLUMN,
    + CHAT_USERS_ICON_NAME_COLUMN, CHAT_USERS_NAME_COLUMN,
    + CHAT_USERS_WEIGHT_COLUMN,
    * conversation-dragging (gtkconv signal)
    * conversation-timestamp (gtkconv signal)
    * conversation-hiding (gtkconv signal)
    @@ -1183,6 +1188,7 @@
    * pidgin_status_box_set_connecting
    * pidgin_status_box_get_message
    * pidgin_status_box_new_with_account
    + * PidginStatusIconSize enum and all values
    * PIDGIN_IS_STATUS_ICON_THEME
    * PIDGIN_IS_STATUS_ICON_THEME_CLASS
    * PIDGIN_STATUS_ICON_THEME
    --- a/pidgin/gtkblist.h Mon Jan 23 20:51:42 2023 -0600
    +++ b/pidgin/gtkblist.h Mon Jan 23 20:55:34 2023 -0600
    @@ -34,12 +34,6 @@
    typedef struct _PidginBuddyList PidginBuddyList;
    -typedef enum {
    - PIDGIN_STATUS_ICON_LARGE,
    - PIDGIN_STATUS_ICON_SMALL
    -
    -} PidginStatusIconSize;
    -
    /**************************************************************************
    * Structures
    **************************************************************************/
    --- a/pidgin/gtkconv.c Mon Jan 23 20:51:42 2023 -0600
    +++ b/pidgin/gtkconv.c Mon Jan 23 20:55:34 2023 -0600
    @@ -54,6 +54,18 @@
    #define ADD_MESSAGE_HISTORY_AT_ONCE 100
    +enum {
    + CHAT_USERS_ICON_COLUMN,
    + CHAT_USERS_ALIAS_COLUMN,
    + CHAT_USERS_ALIAS_KEY_COLUMN,
    + CHAT_USERS_NAME_COLUMN,
    + CHAT_USERS_FLAGS_COLUMN,
    + CHAT_USERS_COLOR_COLUMN,
    + CHAT_USERS_WEIGHT_COLUMN,
    + CHAT_USERS_ICON_NAME_COLUMN,
    + CHAT_USERS_COLUMNS
    +};
    +
    typedef enum
    {
    PIDGIN_CONV_SET_TITLE = 1 << 0,
    --- a/pidgin/gtkconv.h Mon Jan 23 20:51:42 2023 -0600
    +++ b/pidgin/gtkconv.h Mon Jan 23 20:55:34 2023 -0600
    @@ -30,18 +30,6 @@
    typedef struct _PidginConversation PidginConversation;
    -enum {
    - CHAT_USERS_ICON_COLUMN,
    - CHAT_USERS_ALIAS_COLUMN,
    - CHAT_USERS_ALIAS_KEY_COLUMN,
    - CHAT_USERS_NAME_COLUMN,
    - CHAT_USERS_FLAGS_COLUMN,
    - CHAT_USERS_COLOR_COLUMN,
    - CHAT_USERS_WEIGHT_COLUMN,
    - CHAT_USERS_ICON_NAME_COLUMN,
    - CHAT_USERS_COLUMNS
    -};
    -
    #define PIDGIN_CONVERSATION(conv) \
    ((PidginConversation *)g_object_get_data(G_OBJECT(conv), "pidgin"))
    --- a/pidgin/meson.build Mon Jan 23 20:51:42 2023 -0600
    +++ b/pidgin/meson.build Mon Jan 23 20:55:34 2023 -0600
    @@ -140,13 +140,6 @@
    'prefs/pidginvvprefs.h',
    ]
    -libpidgin_enum_headers = [
    - 'gtkaccount.h',
    - 'gtkblist.h',
    - 'gtkconv.h',
    - 'gtkutils.h',
    -]
    -
    pidgin_SOURCES = [
    'pidgin.c'
    ]
    @@ -188,15 +181,8 @@
    ]
    endif
    -libpidgin_enums = gnome.mkenums_simple('pidginenums',
    - sources: libpidgin_enum_headers,
    - install_header: true,
    - install_dir: get_option('includedir') / pidgin_include_base)
    -libpidgin_enums_c = libpidgin_enums[0]
    -libpidgin_enums_h = libpidgin_enums[1]
    -
    PIDGIN_H_INCLUDES = []
    -foreach header : libpidgin_headers + libpidgin_prefs_headers + ['pidginenums.h']
    +foreach header : libpidgin_headers + libpidgin_prefs_headers
    PIDGIN_H_INCLUDES += f'#include <pidgin/@header@>'
    endforeach
    pidgin_h_conf = configuration_data()
    @@ -223,12 +209,10 @@
    ]
    libpidgin_built_sources = [
    - libpidgin_enums_c,
    ]
    libpidgin_built_headers = [
    pidgin_h,
    - libpidgin_enums_h,
    ]
    libpidgin_inc = include_directories('.')