[gtk+/gtk-3-8] window: reset timeout source id before setting property

[Cosimo Cecchi <cosimoc src gnome org>]

commit a101e85931caf10dc9b369e44da21a7a38f43954
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Apr 2 15:54:02 2013 -0400

    window: reset timeout source id before setting property
    
    gtk_window_set_mnemonics_visible() will try to g_source_remove() it
    otherwise, which seems harmless, but conceptually wrong.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=697144

 gtk/gtkwindow.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 99bab05..741fea5 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9664,9 +9664,9 @@ set_auto_mnemonics_visible_cb (gpointer data)
 {
   GtkWindow *window = data;
 
-  gtk_window_set_mnemonics_visible (window, TRUE);
+  window->priv->mnemonics_display_timeout_id = 0;
 
-  window->priv->auto_mnemonics_timeout_id = 0;
+  gtk_window_set_mnemonics_visible (window, TRUE);
 
   return FALSE;
 }