GtkPlugPrivate *priv = plug->priv;
if (priv->grabbed_keys)
- {
- g_hash_table_destroy (priv->grabbed_keys);
- priv->grabbed_keys = NULL;
- }
-
+ g_hash_table_destroy (priv->grabbed_keys);
+
G_OBJECT_CLASS (gtk_plug_parent_class)->finalize (object);
}
break; /* FIXME: shouldn't this unref the plug? i.e. "goto done;" instead */
}
- g_hash_table_iter_init (&iter, priv->grabbed_keys);
-
- while (g_hash_table_iter_next (&iter, &key, NULL))
+ if (priv->grabbed_keys)
{
- GrabbedKey *grabbed_key = key;
-
- _gtk_xembed_send_message (priv->socket_window, XEMBED_GTK_GRAB_KEY, 0,
- grabbed_key->accelerator_key,
- grabbed_key->accelerator_mods);
+ g_hash_table_iter_init (&iter, priv->grabbed_keys);
+ while (g_hash_table_iter_next (&iter, &key, NULL))
+ {
+ GrabbedKey *grabbed_key = key;
+
+ _gtk_xembed_send_message (priv->socket_window, XEMBED_GTK_GRAB_KEY, 0,
+ grabbed_key->accelerator_key,
+ grabbed_key->accelerator_mods);
+ }
}
if (!was_embedded)
if (old_grabbed_keys)
{
if (priv->socket_window)
- g_hash_table_foreach (old_grabbed_keys, remove_grabbed_key, plug);
+ g_hash_table_foreach (old_grabbed_keys, remove_grabbed_key, plug);
g_hash_table_destroy (old_grabbed_keys);
}
}