arti/wdisplays
1
0
Fork 0
mirror of https://github.com/artizirk/wdisplays.git synced 2026-10-03 12:55:42 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deprecation-fixes'

Browse Source
This commit is contained in:
Mars-Wave
2026-09-01 17:39:10 +02:00
parent 157b8c51e8 686634300c
commit 91b7f668d9
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/meson.build
+1 -1
View File
@@ -5,7 +5,7 @@ wayland_scanner = find_program('wayland-scanner')
wayland_client = dependency('wayland-client')
wayland_protos = dependency('wayland-protocols', version: '>=1.17')
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
wayland_scanner_code = generator(
wayland_scanner,
src/main.c
+5 -1
View File
@@ -8,6 +8,10 @@
#include "glviewport.h"
#include "headform.h"
#if !GLIB_CHECK_VERSION(2, 74, 0)
#define G_APPLICATION_DEFAULT_FLAGS G_APPLICATION_FLAGS_NONE
#endif
__attribute__((noreturn)) void wd_fatal_error(int status, const char *message) {
GtkWindow *parent = gtk_application_get_active_window(GTK_APPLICATION(g_application_get_default()));
GtkWidget *dialog = gtk_message_dialog_new(parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", message);
@@ -1084,7 +1088,7 @@ static void activate(GtkApplication* app, gpointer user_data) {
int main(int argc, char *argv[]) {
g_setenv("GDK_GL", "gles", FALSE);
GtkApplication *app = gtk_application_new(WDISPLAYS_APP_ID, G_APPLICATION_FLAGS_NONE);
GtkApplication *app = gtk_application_new(WDISPLAYS_APP_ID, G_APPLICATION_DEFAULT_FLAGS);
g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
int status = g_application_run(G_APPLICATION(app), argc, argv);
g_object_unref(app);
src/meson.build
+1 -1
View File
@@ -6,7 +6,7 @@ m_dep = cc.find_library('m', required : false)
rt_dep = cc.find_library('rt', required : false)
gdk = dependency('gdk-3.0', version: '>= 3.24')
gtk = dependency('gtk+-3.0', version: '>= 3.24')
assert(gdk.get_pkgconfig_variable('targets').split().contains('wayland'), 'Wayland GDK backend not present')
assert(gdk.get_variable('targets').split().contains('wayland'), 'Wayland GDK backend not present')
epoxy = dependency('epoxy')
configure_file(input: 'config.h.in', output: 'config.h', configuration: conf)
src/outputs.c
-2
View File
@@ -93,10 +93,8 @@ void wd_apply_state(struct wd_state *state, struct wl_list *new_outputs,
zwlr_output_configuration_v1_add_listener(config, &config_listener, pending);
ssize_t i = -1;
struct wd_head_config *output;
wl_list_for_each(output, new_outputs, link) {
i++;
struct wd_head *head = output->head;
if (!output->enabled && output->enabled != head->enabled) {