Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from trunk:

Browse Source 
2008-01-10  Cody Russell  <bratsche@gnome.org>

	Merge from trunk:

	* gdk/win32/gdkwindow-win32.c: (gdk_window_set_transient_for),
	Properly ref/unref windows and parents.  (#506769)


svn path=/branches/gtk-2-12/; revision=19345
This commit is contained in:
Cody Russell
2008-01-10 21:03:02 +00:00
committed by Cody Russell
parent 5d99b24899
commit c1928d9215
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2008-01-10 Cody Russell <bratsche@gnome.org>
Merge from trunk:
* gdk/win32/gdkwindow-win32.c: (gdk_window_set_transient_for),
Properly ref/unref windows and parents. (#506769)
2008-01-10 Richard Hult <richard@imendio.com>
Merged from trunk:

4
gdk/win32/gdkwindow-win32.c
View File

@@ -1985,6 +1985,8 @@ gdk_window_set_transient_for (GdkWindow *window,
trans_impl->transient_children = NULL;
}
}
g_object_unref (G_OBJECT (window_impl->transient_owner));
g_object_unref (G_OBJECT (window));
window_impl->transient_owner = NULL;
}
@@ -1993,8 +1995,10 @@ gdk_window_set_transient_for (GdkWindow *window,
parent_impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (parent)->impl);
parent_impl->transient_children = g_slist_append (parent_impl->transient_children, window);
g_object_ref (G_OBJECT (window));
parent_impl->num_transients++;
window_impl->transient_owner = parent;
g_object_ref (G_OBJECT (parent));
}
/* This changes the *owner* of the window, despite the misleading