callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new internal function which destroys the display's event source. Also

Browse Source 
2005-11-16  Michael Natterer  <mitch@imendio.com>

	* gdk/x11/gdkevents-x11.c (_gdk_events_uninit): new internal
	function which destroys the display's event source. Also removes
	the source from the global display_sources list and unrefs it.

	* gdk/x11/gdkprivate-x11.h: declare the function.

	* gdk/x11/gdkdisplay-x11.c (gdk_display_x11_dispose): call it
	instead of half-destroying the source here.
This commit is contained in:
Michael Natterer
2005-11-16 12:36:22 +00:00
committed by Michael Natterer
parent a77fd024a0
commit 6e802acd48
5 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2005-11-16 Michael Natterer <mitch@imendio.com>
* gdk/x11/gdkevents-x11.c (_gdk_events_uninit): new internal
function which destroys the display's event source. Also removes
the source from the global display_sources list and unrefs it.
* gdk/x11/gdkprivate-x11.h: declare the function.
* gdk/x11/gdkdisplay-x11.c (gdk_display_x11_dispose): call it
instead of half-destroying the source here.
2005-11-15 Matthias Clasen <mclasen@redhat.com> 2005-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_move): Fix a memory * gtk/gtktreestore.c (gtk_tree_store_move): Fix a memory

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
2005-11-16 Michael Natterer <mitch@imendio.com>
* gdk/x11/gdkevents-x11.c (_gdk_events_uninit): new internal
function which destroys the display's event source. Also removes
the source from the global display_sources list and unrefs it.
* gdk/x11/gdkprivate-x11.h: declare the function.
* gdk/x11/gdkdisplay-x11.c (gdk_display_x11_dispose): call it
instead of half-destroying the source here.
2005-11-15 Matthias Clasen <mclasen@redhat.com> 2005-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_move): Fix a memory * gtk/gtktreestore.c (gtk_tree_store_move): Fix a memory

6
gdk/x11/gdkdisplay-x11.c
View File

@ -726,11 +726,7 @@ gdk_display_x11_dispose (GObject *object)
for (i = 0; i < n_screens; i++) for (i = 0; i < n_screens; i++)
_gdk_screen_close (display_x11->screens[i]); _gdk_screen_close (display_x11->screens[i]);
if (display_x11->event_source) _gdk_events_uninit (GDK_DISPLAY_OBJECT (object));
{
g_source_destroy (display_x11->event_source);
display_x11->event_source = NULL;
}
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->dispose (object);
} }

14
gdk/x11/gdkevents-x11.c
View File

@ -230,6 +230,20 @@ _gdk_events_init (GdkDisplay *display)
NULL); NULL);
} }
void
_gdk_events_uninit (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
if (display_x11->event_source)
{
display_sources = g_list_remove (display_sources,
display_x11->event_source);
g_source_destroy (display_x11->event_source);
g_source_unref (display_x11->event_source);
display_x11->event_source = NULL;
}
}
/** /**
* gdk_events_pending: * gdk_events_pending:

1
gdk/x11/gdkprivate-x11.h
View File

@ -170,6 +170,7 @@ void _gdk_x11_events_init_screen (GdkScreen *screen);
void _gdk_x11_events_uninit_screen (GdkScreen *screen); void _gdk_x11_events_uninit_screen (GdkScreen *screen);
void _gdk_events_init (GdkDisplay *display); void _gdk_events_init (GdkDisplay *display);
void _gdk_events_uninit (GdkDisplay *display);
void _gdk_windowing_window_init (GdkScreen *screen); void _gdk_windowing_window_init (GdkScreen *screen);
void _gdk_visual_init (GdkScreen *screen); void _gdk_visual_init (GdkScreen *screen);
void _gdk_dnd_init (GdkDisplay *display); void _gdk_dnd_init (GdkDisplay *display);