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

Don't use structure fields of GtkAccelMap in GtkSocket

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=599403
This commit is contained in:
Christian Dywan
2009-10-27 21:27:28 +01:00
parent f4d5ed5397
commit 4f0b0d0775
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtksocket.c
View File

@ -372,7 +372,6 @@ _gtk_socket_end_embedding (GtkSocket *socket)
{ {
GtkSocketPrivate *private = _gtk_socket_get_private (socket); GtkSocketPrivate *private = _gtk_socket_get_private (socket);
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket)); GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
gint i;
if (GTK_IS_WINDOW (toplevel)) if (GTK_IS_WINDOW (toplevel))
_gtk_socket_windowing_end_embedding_toplevel (socket); _gtk_socket_windowing_end_embedding_toplevel (socket);
@ -383,12 +382,7 @@ _gtk_socket_end_embedding (GtkSocket *socket)
socket->current_height = 0; socket->current_height = 0;
private->resize_count = 0; private->resize_count = 0;
/* Remove from end to avoid indexes shifting. This is evil */ gtk_accel_group_disconnect (socket->accel_group, NULL);
for (i = socket->accel_group->n_accels - 1; i >= 0; i--)
{
GtkAccelGroupEntry *accel_entry = &socket->accel_group->priv_accels[i];
gtk_accel_group_disconnect (socket->accel_group, accel_entry->closure);
}
} }
static void static void
@ -594,20 +588,7 @@ _gtk_socket_remove_grabbed_key (GtkSocket *socket,
guint keyval, guint keyval,
GdkModifierType modifiers) GdkModifierType modifiers)
{ {
gint i; if (!gtk_accel_group_disconnect_key (socket->accel_group, keyval, modifiers))
for (i = 0; i < socket->accel_group->n_accels; i++)
{
GtkAccelGroupEntry *accel_entry = &socket->accel_group->priv_accels[i];
if (accel_entry->key.accel_key == keyval &&
accel_entry->key.accel_mods == modifiers)
{
gtk_accel_group_disconnect (socket->accel_group,
accel_entry->closure);
return;
}
}
g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n", g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n",
keyval, modifiers); keyval, modifiers);
} }