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

destroy display->xid_ht as late as possible (right before XCloseDisplay)

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

	* gdk/x11/gdkdisplay-x11.c (gdk_display_x11_finalize): destroy
	display->xid_ht as late as possible (right before XCloseDisplay)
	because it still needs to be around when the display's screens are
	finalized. (#85715)
This commit is contained in:
Michael Natterer
2005-11-15 14:42:48 +00:00
committed by Michael Natterer
parent c66f47d451
commit 1500848841
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-11-15 Michael Natterer <mitch@imendio.com>
* gdk/x11/gdkdisplay-x11.c (gdk_display_x11_finalize): destroy
display->xid_ht as late as possible (right before XCloseDisplay)
because it still needs to be around when the display's screens are
finalized. (#85715)
2005-11-14 Matthias Clasen <mclasen@redhat.com> 2005-11-14 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkselection.c (gtk_selection_data_set_uris): Don't * gtk/gtkselection.c (gtk_selection_data_set_uris): Don't

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2005-11-15 Michael Natterer <mitch@imendio.com>
* gdk/x11/gdkdisplay-x11.c (gdk_display_x11_finalize): destroy
display->xid_ht as late as possible (right before XCloseDisplay)
because it still needs to be around when the display's screens are
finalized. (#85715)
2005-11-14 Matthias Clasen <mclasen@redhat.com> 2005-11-14 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkselection.c (gtk_selection_data_set_uris): Don't * gtk/gtkselection.c (gtk_selection_data_set_uris): Don't

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

@ -769,9 +769,6 @@ gdk_display_x11_finalize (GObject *object)
g_slist_foreach (display_x11->event_types, (GFunc)g_free, NULL); g_slist_foreach (display_x11->event_types, (GFunc)g_free, NULL);
g_slist_free (display_x11->event_types); g_slist_free (display_x11->event_types);
/* X ID hashtable */
g_hash_table_destroy (display_x11->xid_ht);
/* input GdkDevice list */ /* input GdkDevice list */
/* FIXME need to write finalize fct */ /* FIXME need to write finalize fct */
g_list_foreach (display_x11->input_devices, (GFunc) g_object_unref, NULL); g_list_foreach (display_x11->input_devices, (GFunc) g_object_unref, NULL);
@ -789,6 +786,9 @@ gdk_display_x11_finalize (GObject *object)
g_free (display_x11->startup_notification_id); g_free (display_x11->startup_notification_id);
/* X ID hashtable */
g_hash_table_destroy (display_x11->xid_ht);
XCloseDisplay (display_x11->xdisplay); XCloseDisplay (display_x11->xdisplay);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);