e16cbd24dc
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org> * gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL when there is an error, not exit(), so that we do proper cleanup. Remove code to register GConf callbacks, that is done in utils.c. (gnome_settings_daemon_get_conf_client, gnome_settings_daemon_register_callback, gnome_settings_daemon_spawn_with_input, gnome_settings_daemon_get_invisible, gnome_settings_daemon_delayed_show_dialog): removed from the GnomeSettingsDaemon interface. * utils.c (gnome_settings_get_config_client, gnome_settings_get_invisible, gnome_settings_register_config_callback, gnome_settings_spawn_with_input, gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon interface. * factory.c (main): check return value from gnome_settings_daemon(). * *.c: adapted to changes in function names. * Makefile.am: put source files in alphabetical order. svn path=/trunk/; revision=7434
103 lines
2.3 KiB
C
103 lines
2.3 KiB
C
#include "gnome-settings-daemon.h"
|
|
#include "gnome-settings-typing-break.h"
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <signal.h>
|
|
#include "reaper.h"
|
|
#include <string.h>
|
|
|
|
static pid_t typing_monitor_pid = 0;
|
|
static guint typing_monitor_idle_id = 0;
|
|
|
|
static gboolean
|
|
typing_break_timeout (gpointer data)
|
|
{
|
|
if (typing_monitor_pid > 0)
|
|
kill (typing_monitor_pid, SIGKILL);
|
|
|
|
typing_monitor_idle_id = 0;
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
setup_typing_break (gboolean enabled)
|
|
{
|
|
if (enabled)
|
|
{
|
|
if (typing_monitor_idle_id != 0)
|
|
g_source_remove (typing_monitor_idle_id);
|
|
if (typing_monitor_pid == 0)
|
|
{
|
|
GError *error = NULL;
|
|
gchar *argv[] = { "gnome-typing-monitor", "-n", NULL };
|
|
|
|
if (! g_spawn_async ("/",
|
|
argv, NULL,
|
|
G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL |
|
|
G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
|
|
NULL, NULL,
|
|
&typing_monitor_pid,
|
|
&error))
|
|
{
|
|
/* FIXME: put up a warning */
|
|
g_print ("failed: %s\n", error->message);
|
|
g_error_free (error);
|
|
typing_monitor_pid = 0;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (typing_monitor_pid != 0)
|
|
{
|
|
typing_monitor_idle_id = g_timeout_add (3000, typing_break_timeout, NULL);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
child_exited_callback (VteReaper *reaper,
|
|
gint pid,
|
|
gint exit_status,
|
|
gpointer user_data)
|
|
{
|
|
if (pid == typing_monitor_pid)
|
|
{
|
|
typing_monitor_pid = 0;
|
|
}
|
|
}
|
|
|
|
static void
|
|
typing_break_callback (GConfEntry *entry)
|
|
{
|
|
if (! strcmp (entry->key, "/desktop/gnome/typing_break/enabled"))
|
|
{
|
|
if (entry->value->type == GCONF_VALUE_BOOL)
|
|
setup_typing_break (gconf_value_get_bool (entry->value));
|
|
}
|
|
}
|
|
|
|
void
|
|
gnome_settings_typing_break_init (GConfClient *client)
|
|
{
|
|
VteReaper *reaper;
|
|
|
|
reaper = vte_reaper_get();
|
|
g_signal_connect (reaper, "child_exited", G_CALLBACK (child_exited_callback), NULL);
|
|
gnome_settings_register_config_callback ("/desktop/gnome/typing_break", typing_break_callback);
|
|
}
|
|
|
|
static gboolean
|
|
really_setup_typing_break (gpointer user_data)
|
|
{
|
|
setup_typing_break (TRUE);
|
|
return FALSE;
|
|
}
|
|
|
|
void
|
|
gnome_settings_typing_break_load (GConfClient *client)
|
|
{
|
|
if (gconf_client_get_bool (client, "/desktop/gnome/typing_break/enabled", NULL))
|
|
g_timeout_add (30000, (GSourceFunc) really_setup_typing_break, NULL);
|
|
}
|