summaryrefslogtreecommitdiff
path: root/gtk/gtkpathbar.c
diff options
context:
space:
mode:
authorWilliam Jon McCann <william.jon.mccann@gmail.com>2013-07-09 16:44:04 -0400
committerWilliam Jon McCann <william.jon.mccann@gmail.com>2013-07-11 17:08:15 -0400
commit57fc8763e930911f97b6e9fc9edebafb887db2b3 (patch)
tree34e928277f9b2fa4c5fd3e6e4526967c4e0a66a9 /gtk/gtkpathbar.c
parent0efeb96dab93f93e15137f5b16a0132e7c9f4369 (diff)
downloadgtk+-57fc8763e930911f97b6e9fc9edebafb887db2b3.tar.gz
Deprecate and ignore the timeout-initial and timeout-repeat settings
Diffstat (limited to 'gtk/gtkpathbar.c')
-rw-r--r--gtk/gtkpathbar.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 10767b9098..e8d15b821d 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -85,6 +85,8 @@ typedef enum {
#define BUTTON_DATA(x) ((ButtonData *)(x))
#define SCROLL_DELAY_FACTOR 5
+#define TIMEOUT_INITIAL 500
+#define TIMEOUT_REPEAT 50
static guint path_bar_signals [LAST_SIGNAL] = { 0 };
@@ -1071,14 +1073,9 @@ gtk_path_bar_scroll_timeout (GtkPathBar *path_bar)
if (path_bar->priv->need_timer)
{
- GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (path_bar));
- guint timeout;
-
- g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
-
path_bar->priv->need_timer = FALSE;
- path_bar->priv->timer = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
+ path_bar->priv->timer = gdk_threads_add_timeout (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR,
(GSourceFunc)gtk_path_bar_scroll_timeout,
path_bar);
}
@@ -1181,13 +1178,8 @@ gtk_path_bar_slider_button_press (GtkWidget *widget,
if (!path_bar->priv->timer)
{
- GtkSettings *settings = gtk_widget_get_settings (widget);
- guint timeout;
-
- g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
-
path_bar->priv->need_timer = TRUE;
- path_bar->priv->timer = gdk_threads_add_timeout (timeout,
+ path_bar->priv->timer = gdk_threads_add_timeout (TIMEOUT_INITIAL,
(GSourceFunc)gtk_path_bar_scroll_timeout,
path_bar);
}