From 9fac3c0c5a4767111349101730a520bf921abed1 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 5 Jun 2007 16:55:01 +0000 Subject: [PATCH] Bump glib requirement to 2.13, for the ~second-accurate timers. 2007-06-05 Ross Burton * configure.in: Bump glib requirement to 2.13, for the ~second-accurate timers. 2007-06-05 Ross Burton * drw-monitor.c: * drw-break-window.c: * drwright.c: Use the second-accurate timers instead of the millisecond timers, in an attempt to use less processor time (#443547). svn path=/trunk/; revision=7692 --- ChangeLog | 5 +++++ configure.in | 2 +- typing-break/ChangeLog | 8 ++++++++ typing-break/drw-break-window.c | 6 +++--- typing-break/drw-monitor.c | 2 +- typing-break/drwright.c | 5 ++--- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3768806dc..ff92b3ba4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-05 Ross Burton + + * configure.in: + Bump glib requirement to 2.13, for the ~second-accurate timers. + 2007-06-05 Ross Burton * configure.in: diff --git a/configure.in b/configure.in index a7d52bea9..796da6979 100644 --- a/configure.in +++ b/configure.in @@ -112,7 +112,7 @@ PKG_CHECK_MODULES(SOUND_CAPPLET, esound gstreamer-0.10 gstreamer-plugins-base-0. SOUND_CAPPLET_LIBS="$SOUND_CAPPLET_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10" AC_SUBST(SOUND_CAPPLET_LIBS) PKG_CHECK_MODULES(METACITY, libmetacity-private) -PKG_CHECK_MODULES(TYPING, gconf-2.0 gtk+-2.0) +PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.13 gconf-2.0 gtk+-2.0) dnl dnl Check for Xft version 2; we build in extra functionality to the font capplet diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog index bd0e36add..34d6d91ab 100644 --- a/typing-break/ChangeLog +++ b/typing-break/ChangeLog @@ -1,3 +1,11 @@ +2007-06-05 Ross Burton + + * drw-monitor.c: + * drw-break-window.c: + * drwright.c: + Use the second-accurate timers instead of the millisecond timers, + in an attempt to use less processor time (#443547). + 2007-06-05 Ross Burton * main.c: diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c index f4c438041..d3d631fd2 100644 --- a/typing-break/drw-break-window.c +++ b/typing-break/drw-break-window.c @@ -51,7 +51,7 @@ struct _DrwBreakWindowPrivate { #define DRW_BREAK_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DRW_TYPE_BREAK_WINDOW, DrwBreakWindowPrivate)) -#define POSTPONE_CANCEL 30*1000 +#define POSTPONE_CANCEL 30 /* Signals */ enum { @@ -483,7 +483,7 @@ postpone_entry_key_press_event_cb (GtkEntry *entry, g_source_remove (priv->postpone_timeout_id); - priv->postpone_timeout_id = g_timeout_add (POSTPONE_CANCEL, (GSourceFunc) postpone_cancel_cb, window); + priv->postpone_timeout_id = g_timeout_add_seconds (POSTPONE_CANCEL, (GSourceFunc) postpone_cancel_cb, window); return FALSE; } @@ -513,7 +513,7 @@ postpone_clicked_cb (GtkWidget *button, gtk_widget_show (priv->postpone_entry); - priv->postpone_timeout_id = g_timeout_add (POSTPONE_CANCEL, (GSourceFunc) postpone_cancel_cb, bw); + priv->postpone_timeout_id = g_timeout_add_seconds (POSTPONE_CANCEL, (GSourceFunc) postpone_cancel_cb, bw); grab_on_window (priv->postpone_entry->window, gtk_get_current_event_time ()); diff --git a/typing-break/drw-monitor.c b/typing-break/drw-monitor.c index 19203e261..cd6a7ac73 100644 --- a/typing-break/drw-monitor.c +++ b/typing-break/drw-monitor.c @@ -180,7 +180,7 @@ drw_monitor_setup (DrwMonitor *monitor) priv->last_activity = time (NULL); - priv->timeout_id = g_timeout_add (3000, (GSourceFunc) drw_monitor_timeout, monitor); + priv->timeout_id = g_timeout_add_seconds (3, (GSourceFunc) drw_monitor_timeout, monitor); return TRUE; } diff --git a/typing-break/drwright.c b/typing-break/drwright.c index 74e9cc4bd..95177eb43 100644 --- a/typing-break/drwright.c +++ b/typing-break/drwright.c @@ -823,13 +823,12 @@ drwright_new (void) init_tray_icon (dr); - g_timeout_add (10*1000, + g_timeout_add_seconds (12, (GSourceFunc) update_tooltip, dr); - g_timeout_add (500, + g_timeout_add_seconds (1, (GSourceFunc) maybe_change_state, dr); return dr; } -