Merge branch 'jjardon/fix_warning' into 'master'

Fix some compilations warnings

See merge request GNOME/zenity!7

2 files changed, 7 insertions, 6 deletions

diff --git a/src/msg.c b/src/msg.c
index ca14d867..496fe185 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -206,8 +206,8 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
 		// however, 60 would increase the distance between the icon and the
 		// text,
 		// decreasing to 10 fix it.
-		gtk_label_set_width_chars (text, 10);
-		gtk_label_set_max_width_chars (text, 10);
+		gtk_label_set_width_chars (GTK_LABEL (text), 10);
+		gtk_label_set_max_width_chars (GTK_LABEL (text), 10);
 	}
 
 	if (data->modal)
diff --git a/src/util.c b/src/util.c
index 0c101866..2887fd96 100644
--- a/src/util.c
+++ b/src/util.c
@@ -153,7 +153,7 @@ zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const gchar *filename) {
 		gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf);
 
 		remaining = (buf + remaining + count) - leftover;
-		g_memmove (buf, leftover, remaining);
+		memmove (buf, leftover, remaining);
 
 		if (remaining > 6 || count < to_read)
 			break;
@@ -326,11 +326,12 @@ transient_get_xterm (void) {
 		Window wid = strtoul (wid_str, &wid_str_end, 10);
 		if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0) {
 			XWindowAttributes attrs;
-			gdk_error_trap_push ();
+			GdkDisplay *display;
+			display = gdk_display_get_default ();
+			gdk_x11_display_error_trap_push (display);
 			ret = XGetWindowAttributes (
 				GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wid, &attrs);
-			gdk_flush ();
-			if (gdk_error_trap_pop () != 0 || ret == 0) {
+			if (gdk_x11_display_error_trap_pop (display) != 0 || ret == 0) {
 				return None;
 			}
 			return wid;