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

Plug a leak and add a check that we have a toplevel before accessing it.

Browse Source 
2008-03-25  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c:
	(gdk_window_quartz_process_all_updates): Plug a leak and add a
	check that we have a toplevel before accessing it.

svn path=/trunk/; revision=19933
This commit is contained in:
Richard Hult
2008-03-25 13:35:20 +00:00
committed by Richard Hult
parent 6861b9247f
commit 7279939331
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-25 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkwindow-quartz.c:
(gdk_window_quartz_process_all_updates): Plug a leak and add a
check that we have a toplevel before accessing it.
2008-03-24 Tor Lillqvist <tml@novell.com> 2008-03-24 Tor Lillqvist <tml@novell.com>
Bug 524151 - Dragging of 0-byte files results in an empty filename Bug 524151 - Dragging of 0-byte files results in an empty filename

16
gdk/quartz/gdkwindow-quartz.c
View File

@ -347,11 +347,15 @@ gdk_window_quartz_process_all_updates (void)
{ {
GdkWindow *window = tmp_list->data; GdkWindow *window = tmp_list->data;
GdkWindow *toplevel; GdkWindow *toplevel;
NSWindow *nswindow;
/* Only flush each toplevel at most once. */
toplevel = gdk_window_get_toplevel (window);
if (toplevel)
{
GdkWindowObject *private; GdkWindowObject *private;
GdkWindowImplQuartz *impl; GdkWindowImplQuartz *impl;
NSWindow *nswindow;
toplevel = gdk_window_get_toplevel (window);
private = (GdkWindowObject *) toplevel; private = (GdkWindowObject *) toplevel;
impl = (GdkWindowImplQuartz *) private->impl; impl = (GdkWindowImplQuartz *) private->impl;
nswindow = impl->toplevel; nswindow = impl->toplevel;
@ -361,6 +365,7 @@ gdk_window_quartz_process_all_updates (void)
[nswindow disableFlushWindow]; [nswindow disableFlushWindow];
nswindows = g_slist_prepend (nswindows, nswindow); nswindows = g_slist_prepend (nswindows, nswindow);
} }
}
gdk_window_quartz_process_updates_internal (tmp_list->data); gdk_window_quartz_process_updates_internal (tmp_list->data);
@ -368,14 +373,15 @@ gdk_window_quartz_process_all_updates (void)
tmp_list = tmp_list->next; tmp_list = tmp_list->next;
} }
while (nswindows) tmp_list = nswindows;
while (tmp_list)
{ {
NSWindow *nswindow = nswindows->data; NSWindow *nswindow = tmp_list->data;
[nswindow enableFlushWindow]; [nswindow enableFlushWindow];
[nswindow flushWindow]; [nswindow flushWindow];
nswindows = nswindows->next; tmp_list = tmp_list->next;
} }
GDK_QUARTZ_RELEASE_POOL; GDK_QUARTZ_RELEASE_POOL;