deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-05-16 13:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to gdbus.

Browse Source
This commit is contained in:
deepend-tildeclub
2026-04-27 11:04:04 -06:00
parent 8fcec519d0
commit 87018fa7fe
5 changed files with 710 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/misc/meson.build
View File

@@ -22,7 +22,7 @@ if get_option('gtk-frontend')
endif endif
desktop_conf = configuration_data() desktop_conf = configuration_data()
if dbus_glib_dep.found() if dbus_dep.found()
desktop_conf.set('exec_command', 'zoitechat --existing %U') desktop_conf.set('exec_command', 'zoitechat --existing %U')
else else
desktop_conf.set('exec_command', 'zoitechat %U') desktop_conf.set('exec_command', 'zoitechat %U')

6
meson.build
View File

@@ -18,7 +18,7 @@ libgmodule_dep = dependency('gmodule-2.0')
libcanberra_dep = dependency('libcanberra', version: '>= 0.22', libcanberra_dep = dependency('libcanberra', version: '>= 0.22',
required: get_option('libcanberra')) required: get_option('libcanberra'))
dbus_glib_dep = dependency('dbus-glib-1', required: get_option('dbus')) dbus_dep = dependency('gio-2.0', required: get_option('dbus'))
global_deps = [] global_deps = []
if cc.get_id() == 'msvc' if cc.get_id() == 'msvc'
@@ -39,7 +39,7 @@ config_h.set10('ENABLE_NLS', true)
# Optional features # Optional features
config_h.set('USE_OPENSSL', libssl_dep.found()) config_h.set('USE_OPENSSL', libssl_dep.found())
config_h.set('USE_LIBCANBERRA', libcanberra_dep.found()) config_h.set('USE_LIBCANBERRA', libcanberra_dep.found())
config_h.set('USE_DBUS', dbus_glib_dep.found()) config_h.set('USE_DBUS', dbus_dep.found())
config_h.set('USE_PLUGIN', get_option('plugin')) config_h.set('USE_PLUGIN', get_option('plugin'))
config_h.set('USE_GTK_FRONTEND', get_option('gtk-frontend')) config_h.set('USE_GTK_FRONTEND', get_option('gtk-frontend'))
@@ -181,7 +181,7 @@ if meson.version().version_compare('>= 0.55.0')
'GTK Frontend': get_option('gtk-frontend') ? 'enabled (GTK+ 3.22+)' : 'disabled', 'GTK Frontend': get_option('gtk-frontend') ? 'enabled (GTK+ 3.22+)' : 'disabled',
'TLS (openssl)': libssl_dep.found(), 'TLS (openssl)': libssl_dep.found(),
'Plugin Support': get_option('plugin'), 'Plugin Support': get_option('plugin'),
'DBus Support': dbus_glib_dep.found(), 'DBus Support': dbus_dep.found(),
'libcanberra': libcanberra_dep.found(), 'libcanberra': libcanberra_dep.found(),
}, section: 'Features') }, section: 'Features')

1229
src/common/dbus/dbus-plugin.c
View File

File diff suppressed because it is too large Load Diff

14
src/common/dbus/meson.build
View File

@@ -1,6 +1,4 @@
dbus_deps = [ dbus_deps = []
dbus_glib_dep
]
dbus_sources = [ dbus_sources = [
'dbus-plugin.c', 'dbus-plugin.c',
@@ -35,16 +33,8 @@ configure_file(
install_dir: dbus_service_dir install_dir: dbus_service_dir
) )
dbus_binding_tool = find_program('dbus-binding-tool')
dbus_remote_object = custom_target('remote-object-glue',
input: 'remote-object.xml',
output: 'remote-object-glue.h',
command: [dbus_binding_tool, '--prefix=remote_object', '--mode=glib-server',
'--output=@OUTPUT@', '@INPUT@']
)
zoitechat_dbus = static_library('zoitechatdbus', zoitechat_dbus = static_library('zoitechatdbus',
sources: [dbus_remote_object, marshal] + dbus_sources, sources: marshal + dbus_sources,
c_args: dbus_cargs, c_args: dbus_cargs,
dependencies: common_deps + dbus_deps, dependencies: common_deps + dbus_deps,
include_directories: dbus_includes, include_directories: dbus_includes,

2
src/common/meson.build
View File

@@ -115,7 +115,7 @@ if libssl_dep.found()
common_deps += libssl_dep common_deps += libssl_dep
endif endif
if dbus_glib_dep.found() if dbus_dep.found()
subdir('dbus') subdir('dbus')
common_deps += zoitechat_dbus_dep common_deps += zoitechat_dbus_dep
common_includes += include_directories('dbus') common_includes += include_directories('dbus')