From 1b3f5d39a239854e8a29def5010f567ec8636fe7 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Tue, 2 Apr 2013 15:56:31 -0400
Subject: [PATCH] window: rename functions dealing with mnemonic delayed
 display

Don't mention "auto mnemonics", since those methods are purely about
scheduling a delayed display, and that makes understanding the code a
bit harder.

https://bugzilla.gnome.org/show_bug.cgi?id=697144
---
 gtk/gtkmain.c          |  2 +-
 gtk/gtkwindow.c        | 28 ++++++++++++++--------------
 gtk/gtkwindowprivate.h |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index fbf829387a..18f2171898 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1698,7 +1698,7 @@ gtk_main_do_event (GdkEvent *event)
               if (GTK_IS_WINDOW (window))
                 {
                   if (mnemonics_visible)
-                    _gtk_window_set_auto_mnemonics_visible (GTK_WINDOW (window));
+                    _gtk_window_schedule_mnemonics_visible (GTK_WINDOW (window));
                   else
                     gtk_window_set_mnemonics_visible (GTK_WINDOW (window), FALSE);
                 }
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 741fea5ee3..46535f2f55 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -98,7 +98,7 @@
  * </refsect2>
  */
 
-#define AUTO_MNEMONICS_DELAY 300 /* ms */
+#define MNEMONICS_DELAY 300 /* ms */
 
 typedef struct _GtkDeviceGrabInfo GtkDeviceGrabInfo;
 
@@ -132,7 +132,7 @@ struct _GtkWindowPrivate
 
   guint16  configure_request_count;
 
-  guint    auto_mnemonics_timeout_id;
+  guint    mnemonics_display_timeout_id;
 
   /* The following flags are initially TRUE (before a window is mapped).
    * They cause us to compute a configure request that involves
@@ -4740,10 +4740,10 @@ gtk_window_finalize (GObject *object)
 
   g_free (priv->startup_id);
 
-  if (priv->auto_mnemonics_timeout_id)
+  if (priv->mnemonics_display_timeout_id)
     {
-      g_source_remove (priv->auto_mnemonics_timeout_id);
-      priv->auto_mnemonics_timeout_id = 0;
+      g_source_remove (priv->mnemonics_display_timeout_id);
+      priv->mnemonics_display_timeout_id = 0;
     }
 
 #ifdef GDK_WINDOWING_X11
@@ -6183,7 +6183,7 @@ maybe_set_mnemonics_visible (GtkWindow *window)
                                 NULL, &mask);
           if (window->priv->mnemonic_modifier == (mask & gtk_accelerator_get_default_mod_mask ()))
             {
-              _gtk_window_set_auto_mnemonics_visible (window);
+              _gtk_window_schedule_mnemonics_visible (window);
               break;
             }
         }
@@ -9650,17 +9650,17 @@ gtk_window_set_mnemonics_visible (GtkWindow *window,
       g_object_notify (G_OBJECT (window), "mnemonics-visible");
     }
 
-  if (priv->auto_mnemonics_timeout_id)
+  if (priv->mnemonics_display_timeout_id)
     {
-      g_source_remove (priv->auto_mnemonics_timeout_id);
-      priv->auto_mnemonics_timeout_id = 0;
+      g_source_remove (priv->mnemonics_display_timeout_id);
+      priv->mnemonics_display_timeout_id = 0;
     }
 
   priv->mnemonics_visible_set = TRUE;
 }
 
 static gboolean
-set_auto_mnemonics_visible_cb (gpointer data)
+schedule_mnemonics_visible_cb (gpointer data)
 {
   GtkWindow *window = data;
 
@@ -9672,15 +9672,15 @@ set_auto_mnemonics_visible_cb (gpointer data)
 }
 
 void
-_gtk_window_set_auto_mnemonics_visible (GtkWindow *window)
+_gtk_window_schedule_mnemonics_visible (GtkWindow *window)
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  if (window->priv->auto_mnemonics_timeout_id)
+  if (window->priv->mnemonics_display_timeout_id)
     return;
 
-  window->priv->auto_mnemonics_timeout_id =
-    gdk_threads_add_timeout (AUTO_MNEMONICS_DELAY, set_auto_mnemonics_visible_cb, window);
+  window->priv->mnemonics_display_timeout_id =
+    gdk_threads_add_timeout (MNEMONICS_DELAY, schedule_mnemonics_visible_cb, window);
 }
 
 /**
diff --git a/gtk/gtkwindowprivate.h b/gtk/gtkwindowprivate.h
index 22f8d57705..4bfeca7a46 100644
--- a/gtk/gtkwindowprivate.h
+++ b/gtk/gtkwindowprivate.h
@@ -84,7 +84,7 @@ gboolean        _gtk_window_query_nonaccels     (GtkWindow      *window,
                                                  guint           accel_key,
                                                  GdkModifierType accel_mods);
 
-void            _gtk_window_set_auto_mnemonics_visible (GtkWindow *window);
+void            _gtk_window_schedule_mnemonics_visible (GtkWindow *window);
 
 G_END_DECLS