diff options
author | Cosimo Cecchi <cosimoc@gnome.org> | 2013-04-02 15:56:31 -0400 |
---|---|---|
committer | Cosimo Cecchi <cosimoc@gnome.org> | 2013-04-02 17:39:42 -0400 |
commit | 58209e1138a0dba479d9b3b04d103977b050e8a7 (patch) | |
tree | 095c8b6d47614338a39b27519d55243859f6632b /gtk | |
parent | 68b437eea21154b1c33882f9cb1f630a6ea03c77 (diff) | |
download | gtk+-58209e1138a0dba479d9b3b04d103977b050e8a7.tar.gz |
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
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtkmain.c | 2 | ||||
-rw-r--r-- | gtk/gtkwindow.c | 28 | ||||
-rw-r--r-- | 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 ff9656e09f..3a6b29ed30 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -105,7 +105,7 @@ * </refsect2> */ -#define AUTO_MNEMONICS_DELAY 300 /* ms */ +#define MNEMONICS_DELAY 300 /* ms */ typedef struct _GtkDeviceGrabInfo GtkDeviceGrabInfo; @@ -139,7 +139,7 @@ struct _GtkWindowPrivate guint16 configure_request_count; - guint auto_mnemonics_timeout_id; + guint mnemonics_display_timeout_id; GtkWidget *title_box; GtkWidget *title_icon; @@ -4962,10 +4962,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 @@ -7152,7 +7152,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; } } @@ -11138,17 +11138,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; @@ -11160,15 +11160,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 1dca8c5dd0..398a220fd5 100644 --- a/gtk/gtkwindowprivate.h +++ b/gtk/gtkwindowprivate.h @@ -86,7 +86,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 |