AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 14:31:10 +00:00
Code Issues Projects Releases Wiki Activity

gtkimcontextxim: fix gtk_im_context_xim_set_client_widget not handling widget=NULL

Browse Source 
gtk_im_context_set_client_widget() allows passing NULL as widget to signal that
the widget no longer exists. The xim implementation didn't handle that
case which led to the test suite on gitlab-ci failing.
This commit is contained in:
Christoph Reiter 2018-03-04 18:40:12 +01:00
parent 331c4b5954
commit 8c2c748c11
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkimcontextxim.c
View File

@ -575,9 +575,12 @@ gtk_im_context_xim_set_client_widget (GtkIMContext *context,
GtkWidget *widget)
{
GtkIMContextXIM *context_xim = GTK_IM_CONTEXT_XIM (context);
GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
GdkWindow *window = NULL;
set_ic_client_window (context_xim, gtk_widget_get_window (toplevel));
if (widget != NULL)
window = gtk_widget_get_window (gtk_widget_get_toplevel (widget));
set_ic_client_window (context_xim, window);
}
GtkIMContext *