DeforaOS/libDesktop
DeforaOS/libDesktop
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DesktopMessage: avoid a couple compilation warnings

Browse Source 
This applies to Gtk+ >= 3.8.
This commit is contained in:
Pierre Pronchery 2024-02-28 04:01:10 +01:00
parent e5b205bc11
commit e637b8c995
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/message.c
View File

@ -140,8 +140,10 @@ int desktop_message_register(GtkWidget * window, char const * destination,
gdk_add_client_message_filter(atom, _desktop_message_on_callback, mc); gdk_add_client_message_filter(atom, _desktop_message_on_callback, mc);
# endif # endif
#else #else
GdkDisplay * display;
struct sockaddr_un addr; struct sockaddr_un addr;
display = gdk_display_get_default();
if((p = realloc(_callbacks, sizeof(*p) * (_callbacks_cnt + 1))) == NULL) if((p = realloc(_callbacks, sizeof(*p) * (_callbacks_cnt + 1))) == NULL)
return -error_set_code(1, "%s", strerror(errno)); return -error_set_code(1, "%s", strerror(errno));
_callbacks = p; _callbacks = p;
@ -153,7 +155,8 @@ int desktop_message_register(GtkWidget * window, char const * destination,
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s-%s", snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s-%s",
g_get_tmp_dir(), gdk_get_display(), destination); g_get_tmp_dir(), gdk_display_get_name(display),
destination);
addr.sun_len = sizeof(addr) - sizeof(addr.sun_path) addr.sun_len = sizeof(addr) - sizeof(addr.sun_path)
+ strlen(addr.sun_path) + 1; + strlen(addr.sun_path) + 1;
if((mc->socket = socket(addr.sun_family, SOCK_STREAM, 0)) < 0) if((mc->socket = socket(addr.sun_family, SOCK_STREAM, 0)) < 0)
@ -235,14 +238,17 @@ int desktop_message_send(char const * destination, uint32_t value1,
return 0; return 0;
# endif # endif
#else #else
GdkDisplay * display;
int fd; int fd;
struct sockaddr_un addr; struct sockaddr_un addr;
char buf[33]; char buf[33];
display = gdk_display_get_default();
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s-%s", snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s-%s",
g_get_tmp_dir(), gdk_get_display(), destination); g_get_tmp_dir(), gdk_display_get_name(display),
destination);
addr.sun_len = sizeof(addr) - sizeof(addr.sun_path) addr.sun_len = sizeof(addr) - sizeof(addr.sun_path)
+ strlen(addr.sun_path) + 1; + strlen(addr.sun_path) + 1;
if((fd = socket(addr.sun_family, SOCK_STREAM, 0)) < 0) if((fd = socket(addr.sun_family, SOCK_STREAM, 0)) < 0)