pidgin/pidgin

909e3433f935
Parents 95578eb5e9f8
Children 49bd421d0c8f
Register Finch enums in the GObject type system.

Testing Done:
Built locally and verified that `finchenums.[ch]` looked correct.

Bugs closed: PIDGIN-17475

Reviewed at https://reviews.imfreedom.org/r/442/
--- a/finch/meson.build Fri Jan 22 00:13:52 2021 -0600
+++ b/finch/meson.build Fri Jan 22 00:14:40 2021 -0600
@@ -144,6 +144,14 @@
'libfinch.h'
]
+libfinch_enum_headers = [
+ 'gntconv.h',
+]
+
+# the built lists are append to below
+libfinch_built_sources = []
+libfinch_built_headers = []
+
finch_SOURCES = [
'finch.c'
]
@@ -166,8 +174,13 @@
endif
if enable_consoleui
+ libfinch_enums = gnome.mkenums_simple('finchenums',
+ sources: libfinch_enum_headers)
+ libfinch_built_sources += libfinch_enums[0]
+ libfinch_built_headers += libfinch_enums[1]
+
FINCH_H_INCLUDES = []
- foreach header : libfinch_headers
+ foreach header : libfinch_headers + ['finchenums.h']
FINCH_H_INCLUDES += '#include <finch/@0@>'.format(header)
endforeach
finch_h_conf = configuration_data()
@@ -178,12 +191,13 @@
configuration : finch_h_conf,
install : true,
install_dir : get_option('includedir') / 'finch-3')
+ libfinch_built_headers += finch_h
install_headers(libfinch_headers, subdir : 'finch-3')
libfinch_inc = include_directories('.')
libfinch = shared_library('finch3',
- libfinch_SOURCES,
+ libfinch_SOURCES + libfinch_built_headers + libfinch_built_sources,
c_args : ['-DSTANDALONE', '-DGNTSEAL_ENABLE', '-DFINCH_COMPILATION', ncurses_header],
include_directories : [toplevel_inc],
version : PURPLE_LIB_VERSION,
--- a/libpurple/request.h Fri Jan 22 00:13:52 2021 -0600
+++ b/libpurple/request.h Fri Jan 22 00:14:40 2021 -0600
@@ -219,7 +219,7 @@
PurpleRequestCancelCb cancel_cb,
PurpleRequestCommonParameters *cpar, void *user_data);
- void (*request_wait_update)(void *ui_handle, gboolean pulse,
+ void (*request_wait_update)(void *ui_handle, gboolean animate,
gfloat fraction);
void *(*request_fields)(const char *title, const char *primary,