From c10dd01891ee7b7ddd811fb6f1ccee480f6ad531 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 3 Jul 2004 06:12:38 +0000 Subject: [PATCH] Reset current_width and current_height to 0 when ending the embedding. Sat Jul 3 02:09:51 2004 Matthias Clasen * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width and current_height to 0 when ending the embedding. (#143675, Nickolay V. Shmyrev) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtksocket.c | 2 ++ 5 files changed, 26 insertions(+) diff --git a/ChangeLog b/ChangeLog index b3c8c6fe1d..f39afb49df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jul 3 02:09:51 2004 Matthias Clasen + + * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width + and current_height to 0 when ending the embedding. (#143675, + Nickolay V. Shmyrev) + Sat Jul 3 01:48:19 2004 Matthias Clasen * gtk/gtkentry.c (gtk_entry_move_visually): Let the cursor move diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b3c8c6fe1d..f39afb49df 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Jul 3 02:09:51 2004 Matthias Clasen + + * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width + and current_height to 0 when ending the embedding. (#143675, + Nickolay V. Shmyrev) + Sat Jul 3 01:48:19 2004 Matthias Clasen * gtk/gtkentry.c (gtk_entry_move_visually): Let the cursor move diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b3c8c6fe1d..f39afb49df 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Jul 3 02:09:51 2004 Matthias Clasen + + * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width + and current_height to 0 when ending the embedding. (#143675, + Nickolay V. Shmyrev) + Sat Jul 3 01:48:19 2004 Matthias Clasen * gtk/gtkentry.c (gtk_entry_move_visually): Let the cursor move diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b3c8c6fe1d..f39afb49df 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Jul 3 02:09:51 2004 Matthias Clasen + + * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width + and current_height to 0 when ending the embedding. (#143675, + Nickolay V. Shmyrev) + Sat Jul 3 01:48:19 2004 Matthias Clasen * gtk/gtkentry.c (gtk_entry_move_visually): Let the cursor move diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index ebeaeb99c5..edc06c3005 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -401,6 +401,8 @@ gtk_socket_end_embedding (GtkSocket *socket) g_object_unref (socket->plug_window); socket->plug_window = NULL; + socket->current_width = 0; + socket->current_height = 0; private->resize_count = 0; /* Remove from end to avoid indexes shifting. This is evil */