forked from AuroraMiddleware/gtk
display: Drop the device_manager for good
This is now entirely the backends responsibility.
This commit is contained in:
parent
639d93687f
commit
cd3d2badf0
@ -383,15 +383,6 @@ gdk_display_dispose (GObject *object)
|
||||
display->queued_events = NULL;
|
||||
display->queued_tail = NULL;
|
||||
|
||||
if (display->device_manager)
|
||||
{
|
||||
/* this is to make it drop devices which may require using the X
|
||||
* display and therefore can't be cleaned up in finalize.
|
||||
* It will also disconnect device_removed_cb
|
||||
*/
|
||||
g_object_run_dispose (G_OBJECT (display->device_manager));
|
||||
}
|
||||
|
||||
G_OBJECT_CLASS (gdk_display_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
@ -409,9 +400,6 @@ gdk_display_finalize (GObject *object)
|
||||
|
||||
g_list_free_full (display->seats, g_object_unref);
|
||||
|
||||
if (display->device_manager)
|
||||
g_object_unref (display->device_manager);
|
||||
|
||||
G_OBJECT_CLASS (gdk_display_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
@ -1051,14 +1039,6 @@ gdk_display_device_is_grabbed (GdkDisplay *display,
|
||||
return (info && !info->implicit);
|
||||
}
|
||||
|
||||
GdkDeviceManager *
|
||||
gdk_display_get_device_manager (GdkDisplay *display)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
|
||||
|
||||
return display->device_manager;
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_display_get_name:
|
||||
* @display: a #GdkDisplay
|
||||
|
@ -29,7 +29,6 @@
|
||||
#include <gdk/gdkversionmacros.h>
|
||||
#include <gdk/gdktypes.h>
|
||||
#include <gdk/gdkevents.h>
|
||||
#include <gdk/gdkdevicemanager.h>
|
||||
#include <gdk/gdkseat.h>
|
||||
#include <gdk/gdkmonitor.h>
|
||||
|
||||
|
@ -82,7 +82,6 @@ struct _GdkDisplay
|
||||
guint closed : 1; /* Whether this display has been closed */
|
||||
|
||||
GHashTable *device_grabs;
|
||||
GdkDeviceManager *device_manager;
|
||||
|
||||
GHashTable *pointers_info; /* GdkPointerWindowInfo for each device */
|
||||
guint32 last_event_time; /* Last reported event time from server */
|
||||
@ -306,8 +305,6 @@ void gdk_display_emit_opened (GdkDisplay *display
|
||||
void gdk_display_setting_changed (GdkDisplay *display,
|
||||
const char *name);
|
||||
|
||||
GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display);
|
||||
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user