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-banner.c
diff --git
a/hildon/hildon-banner.c
b/hildon/hildon-banner.c
index
c570e16
..
25151a4
100644
(file)
--- a/
hildon/hildon-banner.c
+++ b/
hildon/hildon-banner.c
@@
-294,8
+294,6
@@
hildon_banner_timeout (gpointer data)
GtkWidget *widget;
gboolean continue_timeout = FALSE;
GtkWidget *widget;
gboolean continue_timeout = FALSE;
- GDK_THREADS_ENTER ();
-
g_assert (HILDON_IS_BANNER (data));
widget = GTK_WIDGET (data);
g_assert (HILDON_IS_BANNER (data));
widget = GTK_WIDGET (data);
@@
-311,8
+309,6
@@
hildon_banner_timeout (gpointer data)
g_object_unref (widget);
g_object_unref (widget);
- GDK_THREADS_LEAVE ();
-
return continue_timeout;
}
return continue_timeout;
}
@@
-338,7
+334,7
@@
hildon_banner_ensure_timeout (HildonBanner *self)
g_assert (priv);
if (priv->timeout_id == 0 && priv->is_timed && priv->timeout > 0)
g_assert (priv);
if (priv->timeout_id == 0 && priv->is_timed && priv->timeout > 0)
- priv->timeout_id = g_timeout_add (priv->timeout,
+ priv->timeout_id = gdk_threads_add_timeout (priv->timeout,
hildon_banner_timeout, self);
}
hildon_banner_timeout, self);
}