From 3bd851259f3284c8ea92ca9253a4adfe93e1ecb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
Date: Sat, 3 Feb 2024 11:28:57 +0100
Subject: [PATCH] Use %lu or %lX to print or scan X11 window ID
This is the right format, previous commits have already changed some of
it.
---
src/gs-window-x11.c | 26 +++++++++++++-------------
src/xfce4-screensaver-dialog.c | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 740bd91..b0bbd80 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -965,7 +965,7 @@ lock_socket_destroyed (GtkWidget *widget,
static void
create_keyboard_socket (GSWindow *window,
- guint32 id) {
+ gulong id) {
GdkDisplay *display;
GdkMonitor *monitor;
GdkWindow *g_window;
@@ -1083,10 +1083,10 @@ keyboard_process_watch (GIOChannel *source,
switch (status) {
case G_IO_STATUS_NORMAL:
{
- guint32 id;
- char c;
+ gulong id;
+ char c;
gs_debug ("Keyboard command output: %s", line);
- if (1 == sscanf (line, " %" G_GUINT32_FORMAT " %c", &id, &c)) {
+ if (1 == sscanf (line, " %lu %c", &id, &c)) {
create_keyboard_socket (window, id);
}
}
@@ -1145,7 +1145,7 @@ embed_keyboard (GSWindow *window) {
static void
create_lock_socket (GSWindow *window,
- guint32 id) {
+ gulong id) {
window->priv->lock_socket = gtk_socket_new ();
window->priv->lock_box = gtk_grid_new ();
gtk_widget_set_halign (GTK_WIDGET (window->priv->lock_box),
@@ -1268,9 +1268,9 @@ dialog_process_watch (GIOChannel *source,
gs_debug ("Command output: %s", line);
if (strstr (line, "WINDOW ID=") != NULL) {
- guint32 id;
- char c;
- if (1 == sscanf (line, " WINDOW ID= %" G_GUINT32_FORMAT " %c", &id, &c)) {
+ gulong id;
+ char c;
+ if (1 == sscanf (line, " WINDOW ID= %lu %c", &id, &c)) {
create_lock_socket (window, id);
}
} else if (strstr (line, "NOTICE=") != NULL) {
@@ -1778,13 +1778,13 @@ static gboolean
gs_window_real_grab_broken (GtkWidget *widget,
GdkEventGrabBroken *event) {
if (event->grab_window != NULL) {
- gs_debug ("Grab broken on window %X %s, new grab on window %X",
- (guint32) GDK_WINDOW_XID (event->window),
+ gs_debug ("Grab broken on window %lX %s, new grab on window %lX",
+ GDK_WINDOW_XID (event->window),
event->keyboard ? "keyboard" : "pointer",
- (guint32) GDK_WINDOW_XID (event->grab_window));
+ GDK_WINDOW_XID (event->grab_window));
} else {
- gs_debug ("Grab broken on window %X %s, new grab is outside application",
- (guint32) GDK_WINDOW_XID (event->window),
+ gs_debug ("Grab broken on window %lX %s, new grab is outside application",
+ GDK_WINDOW_XID (event->window),
event->keyboard ? "keyboard" : "pointer");
}
diff --git a/src/xfce4-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c
index 0b5f3df..467134b 100644
--- a/src/xfce4-screensaver-dialog.c
+++ b/src/xfce4-screensaver-dialog.c
@@ -87,7 +87,7 @@ static char* get_id_string(GtkWidget* widget) {
g_return_val_if_fail(widget != NULL, NULL);
g_return_val_if_fail(GTK_IS_WIDGET(widget), NULL);
- id = g_strdup_printf("%" G_GUINT32_FORMAT, (guint32) GDK_WINDOW_XID(gtk_widget_get_window(widget)));
+ id = g_strdup_printf ("%lu", gtk_plug_get_id (GTK_PLUG (widget)));
return id;
}
--
GitLab