diff options
| author | Jasmine Hassan <[email protected]> | 2012-12-05 03:18:49 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-12-06 18:48:25 +0200 |
| commit | 6e61d207a2088479f5bb12ce4edb1d2886c40b53 (patch) | |
| tree | 5b71387df7bf817dd5d0dff60ecc09d8291dba0d | |
| parent | 1606c1d6ae28b8425b56758ce0fc27c7fcbcc0e6 (diff) | |
| download | mate-settings-daemon-6e61d207a2088479f5bb12ce4edb1d2886c40b53.tar.bz2 mate-settings-daemon-6e61d207a2088479f5bb12ce4edb1d2886c40b53.tar.xz | |
[general] Use g_timeout_add_seconds() where appropriate
instead of g_timeout_add().
daemon: Use g_timeout_add_seconds (30 seconds)
http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=61c8ca9ad8add09830e72d0c10b97f59e80dd0f5
smartcard: Use g_timeout_add_seconds() (2 seconds)
http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=5e85aa9cdf6624effea5a890a2516f11d25a8bf3
| -rw-r--r-- | mate-settings-daemon/main.c | 2 | ||||
| -rw-r--r-- | plugins/smartcard/msd-smartcard-manager.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mate-settings-daemon/main.c b/mate-settings-daemon/main.c index fadf69a..b17e1a3 100644 --- a/mate-settings-daemon/main.c +++ b/mate-settings-daemon/main.c @@ -493,7 +493,7 @@ main (int argc, char *argv[]) daemon_terminate_parent (); if (do_timed_exit) { - g_timeout_add (1000 * 30, (GSourceFunc) timed_exit_cb, NULL); + g_timeout_add_seconds (30, (GSourceFunc) timed_exit_cb, NULL); } gtk_main (); diff --git a/plugins/smartcard/msd-smartcard-manager.c b/plugins/smartcard/msd-smartcard-manager.c index 8207613..503123a 100644 --- a/plugins/smartcard/msd-smartcard-manager.c +++ b/plugins/smartcard/msd-smartcard-manager.c @@ -1321,7 +1321,7 @@ on_device_removed (MsdSmartcardManager *manager, } else { g_print ("disabling manager for 2 seconds\n"); msd_smartcard_manager_stop (manager); - g_timeout_add (2000, (GSourceFunc) on_timeout, manager); + g_timeout_add_seconds (2, (GSourceFunc) on_timeout, manager); } } |