mate-desktop-item: replace deprecated gdk_error_trap_push/pop

raveit65 · raveit65 · commit f791ef8c34fe · 2018-08-15T17:59:32.000+02:00
diff --git a/libmate-desktop/mate-desktop-item.c b/libmate-desktop/mate-desktop-item.c
@@ -1473,14 +1473,20 @@ static void
 sn_error_trap_push (SnDisplay *display,
 		    Display   *xdisplay)
 {
-	gdk_error_trap_push ();
+	GdkDisplay *gdkdisplay;
+
+	gdkdisplay = gdk_display_get_default ();
+	gdk_x11_display_error_trap_push (gdkdisplay);
 }
 
 static void
 sn_error_trap_pop (SnDisplay *display,
 		   Display   *xdisplay)
 {
-	gdk_error_trap_pop_ignored ();
+	GdkDisplay *gdkdisplay;
+
+	gdkdisplay = gdk_display_get_default ();
+	gdk_x11_display_error_trap_pop_ignored (gdkdisplay);
 }
 
 static char **

Original file line number	Diff line number	Diff line change
`@@ -1473,14 +1473,20 @@ static void`
`1473`	`1473`	`sn_error_trap_push (SnDisplay *display,`
`1474`	`1474`	`Display *xdisplay)`
`1475`	`1475`	`{`
`1476`		`- gdk_error_trap_push ();`
	`1476`	`+ GdkDisplay *gdkdisplay;`
	`1477`	`+`
	`1478`	`+ gdkdisplay = gdk_display_get_default ();`
	`1479`	`+ gdk_x11_display_error_trap_push (gdkdisplay);`
`1477`	`1480`	`}`
`1478`	`1481`
`1479`	`1482`	`static void`
`1480`	`1483`	`sn_error_trap_pop (SnDisplay *display,`
`1481`	`1484`	`Display *xdisplay)`
`1482`	`1485`	`{`
`1483`		`- gdk_error_trap_pop_ignored ();`
	`1486`	`+ GdkDisplay *gdkdisplay;`
	`1487`	`+`
	`1488`	`+ gdkdisplay = gdk_display_get_default ();`
	`1489`	`+ gdk_x11_display_error_trap_pop_ignored (gdkdisplay);`
`1484`	`1490`	`}`
`1485`	`1491`
`1486`	`1492`	`static char **`