wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

backout 2a782a973a3d for error: unused variable 'container' b=1068964 CLOSED TREE

Browse Source
This commit is contained in:
Karl Tomlinson 2014-09-22 16:00:52 +12:00
parent ba69951554
commit 6c90740212
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
widget/gtk/nsGtkIMModule.cpp
View File

@ -263,7 +263,36 @@ nsGtkIMModule::PrepareToDestroyContext(GtkIMContext *aContext)
GType slaveType = G_TYPE_FROM_INSTANCE(slave); GType slaveType = G_TYPE_FROM_INSTANCE(slave);
const gchar *im_type_name = g_type_name(slaveType); const gchar *im_type_name = g_type_name(slaveType);
if (strcmp(im_type_name, "GtkIMContextIIIM") == 0) { if (strcmp(im_type_name, "GtkIMContextXIM") == 0) {
if (gtk_check_version(2, 12, 1) == nullptr) {
return; // gtk bug has been fixed
}
struct GtkIMContextXIM
{
GtkIMContext parent;
gpointer private_data;
// ... other fields
};
gpointer signal_data =
reinterpret_cast<GtkIMContextXIM*>(slave)->private_data;
if (!signal_data) {
return;
}
g_signal_handlers_disconnect_matched(
gtk_widget_get_display(GTK_WIDGET(container)),
G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, signal_data);
// Add a reference to prevent the XIM module from being unloaded
// and reloaded: each time the module is loaded and used, it
// opens (and doesn't close) new XOpenIM connections.
static gpointer gtk_xim_context_class =
g_type_class_ref(slaveType);
// Mute unused variable warning:
(void)gtk_xim_context_class;
} else if (strcmp(im_type_name, "GtkIMContextIIIM") == 0) {
// Add a reference to prevent the IIIM module from being unloaded // Add a reference to prevent the IIIM module from being unloaded
static gpointer gtk_iiim_context_class = static gpointer gtk_iiim_context_class =
g_type_class_ref(slaveType); g_type_class_ref(slaveType);