Merge branch 'fix/6345' into 'gtk-3-24'
Fix for #6345 and #6345 See merge request GNOME/gtk!6786
This commit is contained in:
commit
f9a844ab85
@ -851,7 +851,7 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
|
|||||||
monitor = g_object_new (gdk_x11_monitor_get_type (),
|
monitor = g_object_new (gdk_x11_monitor_get_type (),
|
||||||
"display", display,
|
"display", display,
|
||||||
NULL);
|
NULL);
|
||||||
monitor->name = g_steal_pointer (&name);
|
monitor->name = g_strdup (name);
|
||||||
monitor->output = output;
|
monitor->output = output;
|
||||||
monitor->add = TRUE;
|
monitor->add = TRUE;
|
||||||
g_ptr_array_add (x11_display->monitors, monitor);
|
g_ptr_array_add (x11_display->monitors, monitor);
|
||||||
@ -922,7 +922,6 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
|
|||||||
g_object_ref (monitor);
|
g_object_ref (monitor);
|
||||||
g_ptr_array_remove (x11_display->monitors, monitor);
|
g_ptr_array_remove (x11_display->monitors, monitor);
|
||||||
gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
|
gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
|
||||||
free (monitor->name);
|
|
||||||
g_object_unref (monitor);
|
g_object_unref (monitor);
|
||||||
*changed = TRUE;
|
*changed = TRUE;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user