Author: nick
Date: 2008-09-13 09:22:00 +0000 (Sat, 13 Sep 2008)
New Revision: 27854
Modified:
terminal/trunk/ChangeLog
terminal/trunk/terminal/terminal-screen.c
Log:
* terminal/terminal-screen.c: Don't depend on Glib 2.14 (using
g_timeout_add_seconds in the code). Bug #4378.
Modified: terminal/trunk/ChangeLog
===================================================================
--- terminal/trunk/ChangeLog 2008-09-13 09:17:51 UTC (rev 27853)
+++ terminal/trunk/ChangeLog 2008-09-13 09:22:00 UTC (rev 27854)
@@ -1,3 +1,8 @@
+2008-09-13 Nick Schermer <[EMAIL PROTECTED]>
+
+ * terminal/terminal-screen.c: Don't depend on Glib 2.14 (using
+ g_timeout_add_seconds in the code). Bug #4378.
+
2008-09-05 Jannis Pohlmann <[EMAIL PROTECTED]>
* autogen.sh: Add git svn revision versioning support.
Modified: terminal/trunk/terminal/terminal-screen.c
===================================================================
--- terminal/trunk/terminal/terminal-screen.c 2008-09-13 09:17:51 UTC (rev
27853)
+++ terminal/trunk/terminal/terminal-screen.c 2008-09-13 09:22:00 UTC (rev
27854)
@@ -883,8 +883,14 @@
if (screen->reset_activity_cb != 0) {
g_source_remove(screen->reset_activity_cb);
}
+
+#if GLIB_CHECK_VERSION (2,14,0)
screen->reset_activity_cb = g_timeout_add_seconds ((gint)timeout_seconds,
(GSourceFunc)terminal_screen_reset_activity, screen);
+#else
+ screen->reset_activity_cb = g_timeout_add ((gint)timeout_seconds * 1000,
+ (GSourceFunc)terminal_screen_reset_activity, screen);
+#endif
}
static gboolean
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
