diff options
author | Timm Bäder <mail@baedert.org> | 2020-01-02 13:52:14 +0100 |
---|---|---|
committer | Timm Bäder <mail@baedert.org> | 2020-01-07 17:27:18 +0100 |
commit | 726909d735620d45f684b298c4af736b35c3e0db (patch) | |
tree | 6931d4e57432c1353c10ea9c354d648d8cd1cbbb | |
parent | 04899e3707c81e90de3ce35f230718130e05e1ca (diff) | |
download | gtk+-726909d735620d45f684b298c4af736b35c3e0db.tar.gz |
Window: Avoid some redundant assignments
-rw-r--r-- | gtk/gtkwindow.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 10dd3436bb..3901f2bb80 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -1570,21 +1570,22 @@ device_removed_cb (GdkSeat *seat, { GtkWindow *window = user_data; GtkWindowPrivate *priv = gtk_window_get_instance_private (window); - GList *l = priv->foci, *cur; + GList *l = priv->foci; while (l) { + GList *next; GtkPointerFocus *focus = l->data; - cur = l; - focus = cur->data; - l = cur->next; + next = l->next; if (focus->device == device) { - priv->foci = g_list_delete_link (priv->foci, cur); + priv->foci = g_list_delete_link (priv->foci, l); gtk_pointer_focus_unref (focus); } + + l = next; } } @@ -9294,15 +9295,15 @@ gtk_window_update_pointer_focus_on_state_change (GtkWindow *window, GtkWidget *widget) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); - GList *l = priv->foci, *cur; + GList *l = priv->foci; while (l) { + GList *next; + GtkPointerFocus *focus = l->data; - cur = l; - focus = cur->data; - l = cur->next; + next = l->next; gtk_pointer_focus_ref (focus); @@ -9314,9 +9315,9 @@ gtk_window_update_pointer_focus_on_state_change (GtkWindow *window, if (GTK_WIDGET (focus->toplevel) == widget) { /* Unmapping the toplevel, remove pointer focus */ - priv->foci = g_list_remove_link (priv->foci, cur); + priv->foci = g_list_remove_link (priv->foci, l); gtk_pointer_focus_unref (focus); - g_list_free (cur); + g_list_free (l); } else if (focus->target == widget || gtk_widget_is_ancestor (focus->target, widget)) @@ -9325,6 +9326,8 @@ gtk_window_update_pointer_focus_on_state_change (GtkWindow *window, } gtk_pointer_focus_unref (focus); + + l = next; } } @@ -9334,15 +9337,13 @@ gtk_window_maybe_revoke_implicit_grab (GtkWindow *window, GtkWidget *grab_widget) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); - GList *l = priv->foci, *cur; + GList *l = priv->foci; while (l) { GtkPointerFocus *focus = l->data; - cur = l; - focus = cur->data; - l = cur->next; + l = l->next; if (focus->toplevel != window) continue; |