projects
/
hildon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace g_idle_add/g_timeout_add with their gdk_threads counterparts
[hildon]
/
hildon
/
hildon-calendar.c
diff --git
a/hildon/hildon-calendar.c
b/hildon/hildon-calendar.c
index
bb4416c
..
b460e50
100644
(file)
--- a/
hildon/hildon-calendar.c
+++ b/
hildon/hildon-calendar.c
@@
-3043,8
+3043,6
@@
calendar_timer (gpointer data)
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
timeout *= 8;
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
timeout *= 8;
- GDK_THREADS_ENTER ();
-
if (private_data->timer)
{
arrow_action (calendar, private_data->click_child);
if (private_data->timer)
{
arrow_action (calendar, private_data->click_child);
@@
-3052,7
+3050,7
@@
calendar_timer (gpointer data)
if (private_data->need_timer)
{
private_data->need_timer = FALSE;
if (private_data->need_timer)
{
private_data->need_timer = FALSE;
- private_data->timer = g_timeout_add (/*CALENDAR_TIMER_DELAY*/timeout,
+ private_data->timer = gdk_threads_add_timeout (/*CALENDAR_TIMER_DELAY*/timeout,
(GSourceFunc) calendar_timer,
(gpointer) calendar);
}
(GSourceFunc) calendar_timer,
(gpointer) calendar);
}
@@
-3060,8
+3058,6
@@
calendar_timer (gpointer data)
retval = TRUE;
}
retval = TRUE;
}
- GDK_THREADS_LEAVE ();
-
return retval;
}
return retval;
}
@@
-3082,7
+3078,7
@@
start_spinning (GtkWidget *widget,
if (!private_data->timer)
{
private_data->need_timer = TRUE;
if (!private_data->timer)
{
private_data->need_timer = TRUE;
- private_data->timer = g_timeout_add (/*CALENDAR_INITIAL_TIMER_DELAY*/timeout,
+ private_data->timer = gdk_threads_add_timeout (/*CALENDAR_INITIAL_TIMER_DELAY*/timeout,
calendar_timer,
(gpointer) widget);
}
calendar_timer,
(gpointer) widget);
}