[gnome-screensaver] Remove theme and job support
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-screensaver] Remove theme and job support
- Date: Sun, 6 Mar 2011 05:59:56 +0000 (UTC)
commit 76d2c9ff6acf4a98bfa1569a62fafe14e89f413e
Author: William Jon McCann <jmccann redhat com>
Date: Sat Mar 5 23:31:59 2011 -0500
Remove theme and job support
And all that entails.
configure.ac | 1 -
data/Makefile.am | 11 -
data/gnome-screensaver.directory.in | 8 -
data/gnome-screensavers.menu.in | 20 --
po/POTFILES.in | 1 -
src/Makefile.am | 4 -
src/gnome-screensaver-command.c | 7 -
src/gs-job.c | 522 -----------------------------------
src/gs-job.h | 69 -----
src/gs-listener-dbus.c | 162 +-----------
src/gs-listener-dbus.h | 1 -
src/gs-manager.c | 480 --------------------------------
src/gs-manager.h | 8 -
src/gs-monitor.c | 24 --
src/gs-prefs.c | 85 +------
src/gs-prefs.h | 10 -
src/gs-theme-manager.c | 421 ----------------------------
17 files changed, 2 insertions(+), 1832 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d6a8cfc..6596147 100644
--- a/configure.ac
+++ b/configure.ac
@@ -757,7 +757,6 @@ po/Makefile.in
src/Makefile
src/gnome-screensaver.desktop.in
data/Makefile
-data/gnome-screensavers.menu
data/gnome-screensaver.pc
data/org.gnome.ScreenSaver.service
doc/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index c1db5a7..7cdb6b4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,17 +9,6 @@ man_MANS = \
@INTLTOOL_DIRECTORY_RULE@
-directorydir = $(datadir)/desktop-directories
-directory_in_files = \
- gnome-screensaver.directory.in \
- $(NULL)
-directory_DATA = $(directory_in_files:.directory.in=.directory)
-
-menudir = $(sysconfdir)/xdg/menus
-menu_DATA = \
- gnome-screensavers.menu \
- $(NULL)
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-screensaver.pc
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 81861e2..95dbcc4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
-data/gnome-screensaver.directory.in
src/gnome-screensaver-command.c
src/gnome-screensaver-dialog.c
src/gnome-screensaver.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 5029566..ff5d0c0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,10 +173,6 @@ gnome_screensaver_SOURCES = \
gs-window.h \
gs-prefs.c \
gs-prefs.h \
- gs-theme-manager.c \
- gs-theme-manager.h \
- gs-job.c \
- gs-job.h \
gs-debug.c \
gs-debug.h \
subprocs.c \
diff --git a/src/gnome-screensaver-command.c b/src/gnome-screensaver-command.c
index dfc6a62..92cc880 100644
--- a/src/gnome-screensaver-command.c
+++ b/src/gnome-screensaver-command.c
@@ -44,7 +44,6 @@
static gboolean do_quit = FALSE;
static gboolean do_lock = FALSE;
-static gboolean do_cycle = FALSE;
static gboolean do_activate = FALSE;
static gboolean do_deactivate = FALSE;
static gboolean do_version = FALSE;
@@ -66,8 +65,6 @@ static GOptionEntry entries [] = {
N_("Query the length of time the screensaver has been active"), NULL },
{ "lock", 'l', 0, G_OPTION_ARG_NONE, &do_lock,
N_("Tells the running screensaver process to lock the screen immediately"), NULL },
- { "cycle", 'c', 0, G_OPTION_ARG_NONE, &do_cycle,
- N_("If the screensaver is active then switch to another graphics demo"), NULL },
{ "activate", 'a', 0, G_OPTION_ARG_NONE, &do_activate,
N_("Turn the screensaver on (blank the screen)"), NULL },
{ "deactivate", 'd', 0, G_OPTION_ARG_NONE, &do_deactivate,
@@ -376,10 +373,6 @@ do_command (DBusConnection *connection)
reply = screensaver_send_message_void (connection, "Lock", FALSE);
}
- if (do_cycle) {
- reply = screensaver_send_message_void (connection, "Cycle", FALSE);
- }
-
if (do_poke) {
reply = screensaver_send_message_void (connection, "SimulateUserActivity", FALSE);
}
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index c374550..beea33b 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -80,14 +80,10 @@ struct GSListenerPrivate
guint session_idle : 1;
guint active : 1;
guint activation_enabled : 1;
- guint throttled : 1;
GHashTable *inhibitors;
- GHashTable *throttlers;
time_t active_start;
time_t session_idle_start;
char *session_id;
-
- guint32 ck_throttle_cookie;
};
typedef struct
@@ -103,11 +99,9 @@ typedef struct
enum {
LOCK,
- CYCLE,
QUIT,
SIMULATE_USER_ACTIVITY,
ACTIVE_CHANGED,
- THROTTLE_CHANGED,
SHOW_MESSAGE,
LAST_SIGNAL
};
@@ -121,7 +115,6 @@ enum {
enum {
REF_ENTRY_TYPE_INHIBIT,
- REF_ENTRY_TYPE_THROTTLE
};
static DBusObjectPathVTable
@@ -232,9 +225,6 @@ get_name_for_entry_type (int entry_type)
case REF_ENTRY_TYPE_INHIBIT:
name = "inhibitor";
break;
- case REF_ENTRY_TYPE_THROTTLE:
- name = "throttler";
- break;
default:
g_assert_not_reached ();
break;
@@ -253,9 +243,6 @@ get_hash_for_entry_type (GSListener *listener,
case REF_ENTRY_TYPE_INHIBIT:
hash = listener->priv->inhibitors;
break;
- case REF_ENTRY_TYPE_THROTTLE:
- hash = listener->priv->throttlers;
- break;
default:
g_assert_not_reached ();
break;
@@ -330,37 +317,6 @@ listener_check_activation (GSListener *listener)
return res;
}
-static void
-gs_listener_set_throttle (GSListener *listener,
- gboolean throttled)
-{
- g_return_if_fail (GS_IS_LISTENER (listener));
-
- if (listener->priv->throttled != throttled) {
- gs_debug ("Changing throttle status: %d", throttled);
-
- listener->priv->throttled = throttled;
-
- g_signal_emit (listener, signals [THROTTLE_CHANGED], 0, throttled);
- }
-}
-
-static gboolean
-listener_check_throttle (GSListener *listener)
-{
- gboolean throttled;
-
- gs_debug ("Checking for throttle");
-
- throttled = listener_ref_entry_is_present (listener, REF_ENTRY_TYPE_THROTTLE);
-
- if (throttled != listener->priv->throttled) {
- gs_listener_set_throttle (listener, throttled);
- }
-
- return TRUE;
-}
-
static gboolean
listener_set_session_idle_internal (GSListener *listener,
gboolean idle)
@@ -595,9 +551,6 @@ listener_ref_entry_check (GSListener *listener,
case REF_ENTRY_TYPE_INHIBIT:
listener_check_activation (listener);
break;
- case REF_ENTRY_TYPE_THROTTLE:
- listener_check_throttle (listener);
- break;
default:
g_assert_not_reached ();
break;
@@ -851,39 +804,6 @@ listener_dbus_get_ref_entries (GSListener *listener,
return DBUS_HANDLER_RESULT_HANDLED;
}
-static void
-listener_add_ck_ref_entry (GSListener *listener,
- int entry_type,
- DBusConnection *connection,
- DBusMessage *message,
- guint32 *cookiep)
-{
- GSListenerRefEntry *entry;
-
- entry = g_new0 (GSListenerRefEntry, 1);
- entry->entry_type = entry_type;
- entry->connection = g_strdup (dbus_message_get_sender (message));
- entry->cookie = listener_generate_unique_key (listener, entry_type);
- entry->application = g_strdup ("ConsoleKit");
- entry->reason = g_strdup ("Session is not active");
- g_get_current_time (&entry->since);
-
- /* takes ownership of entry */
- listener_add_ref_entry (listener, entry_type, entry);
-
- if (cookiep != NULL) {
- *cookiep = entry->cookie;
- }
-}
-
-static void
-listener_remove_ck_ref_entry (GSListener *listener,
- int entry_type,
- guint32 cookie)
-{
- listener_remove_ref_entry (listener, entry_type, cookie);
-}
-
static DBusHandlerResult
listener_dbus_add_ref_entry (GSListener *listener,
int entry_type,
@@ -904,8 +824,6 @@ listener_dbus_add_ref_entry (GSListener *listener,
DBUS_TYPE_INVALID)) {
if (entry_type == REF_ENTRY_TYPE_INHIBIT) {
raise_syntax (connection, message, "Inhibit");
- } else if (entry_type == REF_ENTRY_TYPE_THROTTLE) {
- raise_syntax (connection, message, "Throttle");
} else {
g_assert_not_reached ();
}
@@ -957,8 +875,6 @@ listener_dbus_remove_ref_entry (GSListener *listener,
DBUS_TYPE_INVALID)) {
if (entry_type == REF_ENTRY_TYPE_INHIBIT) {
raise_syntax (connection, message, "UnInhibit");
- } else if (entry_type == REF_ENTRY_TYPE_THROTTLE) {
- raise_syntax (connection, message, "UnThrottle");
} else {
g_assert_not_reached ();
}
@@ -1042,11 +958,6 @@ listener_service_deleted (GSListener *listener,
gs_debug ("DBUS service deleted: %s", new_service_name);
- removed = listener_ref_entry_remove_for_connection (listener, REF_ENTRY_TYPE_THROTTLE, new_service_name);
- if (removed) {
- listener_ref_entry_check (listener, REF_ENTRY_TYPE_THROTTLE);
- }
-
removed = listener_ref_entry_remove_for_connection (listener, REF_ENTRY_TYPE_INHIBIT, new_service_name);
if (removed) {
listener_ref_entry_check (listener, REF_ENTRY_TYPE_INHIBIT);
@@ -1286,8 +1197,6 @@ do_introspect (DBusConnection *connection,
" <interface name=\"org.gnome.ScreenSaver\">\n"
" <method name=\"Lock\">\n"
" </method>\n"
- " <method name=\"Cycle\">\n"
- " </method>\n"
" <method name=\"SimulateUserActivity\">\n"
" </method>\n"
" <method name=\"Inhibit\">\n"
@@ -1301,14 +1210,6 @@ do_introspect (DBusConnection *connection,
" <method name=\"GetInhibitors\">\n"
" <arg name=\"list\" direction=\"out\" type=\"as\"/>\n"
" </method>\n"
- " <method name=\"Throttle\">\n"
- " <arg name=\"application_name\" direction=\"in\" type=\"s\"/>\n"
- " <arg name=\"reason\" direction=\"in\" type=\"s\"/>\n"
- " <arg name=\"cookie\" direction=\"out\" type=\"u\"/>\n"
- " </method>\n"
- " <method name=\"UnThrottle\">\n"
- " <arg name=\"cookie\" direction=\"in\" type=\"u\"/>\n"
- " </method>\n"
" <method name=\"GetActive\">\n"
" <arg name=\"value\" direction=\"out\" type=\"b\"/>\n"
" </method>\n"
@@ -1403,10 +1304,6 @@ listener_dbus_handle_session_message (DBusConnection *connection,
g_signal_emit (listener, signals [QUIT], 0);
return send_success_reply (connection, message);
}
- if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Cycle")) {
- g_signal_emit (listener, signals [CYCLE], 0);
- return send_success_reply (connection, message);
- }
if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Inhibit")) {
return listener_dbus_add_ref_entry (listener, REF_ENTRY_TYPE_INHIBIT, connection, message);
}
@@ -1416,12 +1313,6 @@ listener_dbus_handle_session_message (DBusConnection *connection,
if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "GetInhibitors")) {
return listener_dbus_get_ref_entries (listener, REF_ENTRY_TYPE_INHIBIT, connection, message);
}
- if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Throttle")) {
- return listener_dbus_add_ref_entry (listener, REF_ENTRY_TYPE_THROTTLE, connection, message);
- }
- if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "UnThrottle")) {
- return listener_dbus_remove_ref_entry (listener, REF_ENTRY_TYPE_THROTTLE, connection, message);
- }
if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "SetActive")) {
return listener_set_property (listener, connection, message, PROP_ACTIVE);
}
@@ -1538,31 +1429,9 @@ listener_dbus_handle_system_message (DBusConnection *connection,
DBUS_TYPE_INVALID)) {
gs_debug ("ConsoleKit notified ActiveChanged %d", new_active);
- /* when we aren't active add an implicit throttle from CK
- * when we become active remove the throttle and poke the lock */
+ /* when we become active poke the lock */
if (new_active) {
- if (listener->priv->ck_throttle_cookie != 0) {
- listener_remove_ck_ref_entry (listener,
- REF_ENTRY_TYPE_THROTTLE,
- listener->priv->ck_throttle_cookie);
- listener->priv->ck_throttle_cookie = 0;
- }
-
g_signal_emit (listener, signals [SIMULATE_USER_ACTIVITY], 0);
- } else {
- if (listener->priv->ck_throttle_cookie != 0) {
- g_warning ("ConsoleKit throttle already set");
- listener_remove_ck_ref_entry (listener,
- REF_ENTRY_TYPE_THROTTLE,
- listener->priv->ck_throttle_cookie);
- listener->priv->ck_throttle_cookie = 0;
- }
-
- listener_add_ck_ref_entry (listener,
- REF_ENTRY_TYPE_THROTTLE,
- connection,
- message,
- &listener->priv->ck_throttle_cookie);
}
}
@@ -1826,16 +1695,6 @@ gs_listener_class_init (GSListenerClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
- signals [CYCLE] =
- g_signal_new ("cycle",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GSListenerClass, cycle),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
signals [SIMULATE_USER_ACTIVITY] =
g_signal_new ("simulate-user-activity",
G_TYPE_FROM_CLASS (object_class),
@@ -1857,17 +1716,6 @@ gs_listener_class_init (GSListenerClass *klass)
G_TYPE_BOOLEAN,
1,
G_TYPE_BOOLEAN);
- signals [THROTTLE_CHANGED] =
- g_signal_new ("throttle-changed",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GSListenerClass, throttle_changed),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE,
- 1,
- G_TYPE_BOOLEAN);
signals [SHOW_MESSAGE] =
g_signal_new ("show-message",
G_TYPE_FROM_CLASS (object_class),
@@ -2084,10 +1932,6 @@ gs_listener_init (GSListener *listener)
g_int_equal,
NULL,
(GDestroyNotify)gs_listener_ref_entry_free);
- listener->priv->throttlers = g_hash_table_new_full (g_int_hash,
- g_int_equal,
- NULL,
- (GDestroyNotify)gs_listener_ref_entry_free);
}
static void
@@ -2106,10 +1950,6 @@ gs_listener_finalize (GObject *object)
g_hash_table_destroy (listener->priv->inhibitors);
}
- if (listener->priv->throttlers) {
- g_hash_table_destroy (listener->priv->throttlers);
- }
-
g_free (listener->priv->session_id);
G_OBJECT_CLASS (gs_listener_parent_class)->finalize (object);
diff --git a/src/gs-listener-dbus.h b/src/gs-listener-dbus.h
index c57f367..20541f9 100644
--- a/src/gs-listener-dbus.h
+++ b/src/gs-listener-dbus.h
@@ -45,7 +45,6 @@ typedef struct
GObjectClass parent_class;
void (* lock) (GSListener *listener);
- void (* cycle) (GSListener *listener);
void (* quit) (GSListener *listener);
void (* simulate_user_activity) (GSListener *listener);
gboolean (* active_changed) (GSListener *listener,
diff --git a/src/gs-manager.c b/src/gs-manager.c
index 0f0d42c..8789566 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -33,8 +33,6 @@
#include "gs-manager.h"
#include "gs-window.h"
-#include "gs-theme-manager.h"
-#include "gs-job.h"
#include "gs-grab.h"
#include "gs-fade.h"
#include "gs-debug.h"
@@ -48,22 +46,17 @@ static void gs_manager_finalize (GObject *object);
struct GSManagerPrivate
{
GSList *windows;
- GHashTable *jobs;
-
- GSThemeManager *theme_manager;
GSettings *settings;
GnomeBG *bg;
/* Policy */
glong lock_timeout;
- glong cycle_timeout;
glong logout_timeout;
guint lock_enabled : 1;
guint logout_enabled : 1;
guint keyboard_enabled : 1;
guint user_switch_enabled : 1;
- guint throttled : 1;
char *logout_command;
char *keyboard_command;
@@ -80,10 +73,7 @@ struct GSManagerPrivate
time_t activate_time;
guint lock_timeout_id;
- guint cycle_timeout_id;
- GSList *themes;
- GSSaverMode saver_mode;
GSGrab *grab;
GSFade *fade;
guint unfade_idle_id;
@@ -104,13 +94,11 @@ enum {
PROP_USER_SWITCH_ENABLED,
PROP_KEYBOARD_ENABLED,
PROP_LOCK_TIMEOUT,
- PROP_CYCLE_TIMEOUT,
PROP_LOGOUT_TIMEOUT,
PROP_LOGOUT_COMMAND,
PROP_KEYBOARD_COMMAND,
PROP_STATUS_MESSAGE,
PROP_ACTIVE,
- PROP_THROTTLED,
};
#define FADE_TIMEOUT 1000
@@ -119,280 +107,6 @@ static guint signals [LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE (GSManager, gs_manager, G_TYPE_OBJECT)
-static void
-manager_add_job_for_window (GSManager *manager,
- GSWindow *window,
- GSJob *job)
-{
- if (manager->priv->jobs == NULL) {
- return;
- }
-
- g_hash_table_insert (manager->priv->jobs, window, job);
-}
-
-static const char *
-select_theme (GSManager *manager)
-{
- const char *theme = NULL;
-
- g_return_val_if_fail (manager != NULL, NULL);
- g_return_val_if_fail (GS_IS_MANAGER (manager), NULL);
-
- if (manager->priv->saver_mode == GS_MODE_BLANK_ONLY) {
- return NULL;
- }
-
- if (manager->priv->themes) {
- int number = 0;
-
- if (manager->priv->saver_mode == GS_MODE_RANDOM) {
- g_random_set_seed (time (NULL));
- number = g_random_int_range (0, g_slist_length (manager->priv->themes));
- }
- theme = g_slist_nth_data (manager->priv->themes, number);
- }
-
- return theme;
-}
-
-static GSJob *
-lookup_job_for_window (GSManager *manager,
- GSWindow *window)
-{
- GSJob *job;
-
- if (manager->priv->jobs == NULL) {
- return NULL;
- }
-
- job = g_hash_table_lookup (manager->priv->jobs, window);
-
- return job;
-}
-
-static void
-manager_maybe_stop_job_for_window (GSManager *manager,
- GSWindow *window)
-{
- GSJob *job;
-
- job = lookup_job_for_window (manager, window);
-
- if (job == NULL) {
- gs_debug ("Job not found for window");
- return;
- }
-
- gs_job_stop (job);
-}
-
-static void
-manager_maybe_start_job_for_window (GSManager *manager,
- GSWindow *window)
-{
- GSJob *job;
-
- job = lookup_job_for_window (manager, window);
-
- if (job == NULL) {
- gs_debug ("Job not found for window");
- return;
- }
-
- if (! manager->priv->dialog_up) {
- if (! manager->priv->throttled) {
- if (! gs_job_is_running (job)) {
- if (! gs_window_is_obscured (window)) {
- gs_debug ("Starting job for window");
- gs_job_start (job);
- } else {
- gs_debug ("Window is obscured deferring start of job");
- }
- } else {
- gs_debug ("Not starting job because job is running");
- }
- } else {
- gs_debug ("Not starting job because throttled");
- }
- } else {
- gs_debug ("Not starting job because dialog is up");
- }
-}
-
-static void
-manager_select_theme_for_job (GSManager *manager,
- GSJob *job)
-{
- const char *theme;
-
- theme = select_theme (manager);
-
- if (theme != NULL) {
- GSThemeInfo *info;
- const char *command;
-
- command = NULL;
-
- info = gs_theme_manager_lookup_theme_info (manager->priv->theme_manager, theme);
- if (info != NULL) {
- command = gs_theme_info_get_exec (info);
- } else {
- gs_debug ("Could not find information for theme: %s",
- theme);
- }
-
- gs_job_set_command (job, command);
-
-
- if (info != NULL) {
- gs_theme_info_unref (info);
- }
- } else {
- gs_job_set_command (job, NULL);
- }
-}
-
-static void
-cycle_job (GSWindow *window,
- GSJob *job,
- GSManager *manager)
-{
- gs_job_stop (job);
- manager_select_theme_for_job (manager, job);
- manager_maybe_start_job_for_window (manager, window);
-}
-
-static void
-manager_cycle_jobs (GSManager *manager)
-{
- if (manager->priv->jobs != NULL) {
- g_hash_table_foreach (manager->priv->jobs, (GHFunc) cycle_job, manager);
- }
-}
-
-static void
-throttle_job (GSWindow *window,
- GSJob *job,
- GSManager *manager)
-{
- if (manager->priv->throttled) {
- gs_job_stop (job);
- } else {
- manager_maybe_start_job_for_window (manager, window);
- }
-}
-
-static void
-manager_throttle_jobs (GSManager *manager)
-{
- if (manager->priv->jobs != NULL) {
- g_hash_table_foreach (manager->priv->jobs, (GHFunc) throttle_job, manager);
- }
-}
-
-static void
-resume_job (GSWindow *window,
- GSJob *job,
- GSManager *manager)
-{
- if (gs_job_is_running (job)) {
- gs_job_suspend (job, FALSE);
- } else {
- manager_maybe_start_job_for_window (manager, window);
- }
-}
-
-static void
-manager_resume_jobs (GSManager *manager)
-{
- if (manager->priv->jobs != NULL) {
- g_hash_table_foreach (manager->priv->jobs, (GHFunc) resume_job, manager);
- }
-}
-
-static void
-suspend_job (GSWindow *window,
- GSJob *job,
- GSManager *manager)
-{
- gs_job_suspend (job, TRUE);
-}
-
-static void
-manager_suspend_jobs (GSManager *manager)
-{
- if (manager->priv->jobs != NULL) {
- g_hash_table_foreach (manager->priv->jobs, (GHFunc) suspend_job, manager);
- }
-}
-
-static void
-manager_stop_jobs (GSManager *manager)
-{
- if (manager->priv->jobs != NULL) {
- g_hash_table_destroy (manager->priv->jobs);
-
- }
- manager->priv->jobs = NULL;
-}
-
-void
-gs_manager_set_mode (GSManager *manager,
- GSSaverMode mode)
-{
- g_return_if_fail (GS_IS_MANAGER (manager));
-
- manager->priv->saver_mode = mode;
-}
-
-static void
-free_themes (GSManager *manager)
-{
- if (manager->priv->themes) {
- g_slist_foreach (manager->priv->themes, (GFunc)g_free, NULL);
- g_slist_free (manager->priv->themes);
- }
-}
-
-void
-gs_manager_set_themes (GSManager *manager,
- GSList *themes)
-{
- GSList *l;
-
- g_return_if_fail (GS_IS_MANAGER (manager));
-
- free_themes (manager);
- manager->priv->themes = NULL;
-
- for (l = themes; l; l = l->next) {
- manager->priv->themes = g_slist_append (manager->priv->themes, g_strdup (l->data));
- }
-}
-
-void
-gs_manager_set_throttled (GSManager *manager,
- gboolean throttled)
-{
- g_return_if_fail (GS_IS_MANAGER (manager));
-
- if (manager->priv->throttled != throttled) {
- GSList *l;
-
- manager->priv->throttled = throttled;
-
- if (! manager->priv->dialog_up) {
-
- manager_throttle_jobs (manager);
-
- for (l = manager->priv->windows; l; l = l->next) {
- gs_window_clear (l->data);
- }
- }
- }
-}
-
void
gs_manager_get_lock_active (GSManager *manager,
gboolean *lock_active)
@@ -628,90 +342,6 @@ gs_manager_set_status_message (GSManager *manager,
}
}
-gboolean
-gs_manager_cycle (GSManager *manager)
-{
- g_return_val_if_fail (manager != NULL, FALSE);
- g_return_val_if_fail (GS_IS_MANAGER (manager), FALSE);
-
- gs_debug ("cycling jobs");
-
- if (! manager->priv->active) {
- return FALSE;
- }
-
- if (manager->priv->dialog_up) {
- return FALSE;
- }
-
- if (manager->priv->throttled) {
- return FALSE;
- }
-
- manager_cycle_jobs (manager);
-
- return TRUE;
-}
-
-static gboolean
-cycle_timeout (GSManager *manager)
-{
- g_return_val_if_fail (manager != NULL, FALSE);
- g_return_val_if_fail (GS_IS_MANAGER (manager), FALSE);
-
- if (! manager->priv->dialog_up) {
- gs_manager_cycle (manager);
- }
-
- return TRUE;
-}
-
-static void
-remove_cycle_timer (GSManager *manager)
-{
- if (manager->priv->cycle_timeout_id != 0) {
- g_source_remove (manager->priv->cycle_timeout_id);
- manager->priv->cycle_timeout_id = 0;
- }
-}
-
-static void
-add_cycle_timer (GSManager *manager,
- glong timeout)
-{
- manager->priv->cycle_timeout_id = g_timeout_add (timeout,
- (GSourceFunc)cycle_timeout,
- manager);
-}
-
-void
-gs_manager_set_cycle_timeout (GSManager *manager,
- glong cycle_timeout)
-{
- g_return_if_fail (GS_IS_MANAGER (manager));
-
- if (manager->priv->cycle_timeout != cycle_timeout) {
-
- manager->priv->cycle_timeout = cycle_timeout;
-
- if (manager->priv->active && (cycle_timeout >= 0)) {
- glong timeout;
- glong elapsed = (time (NULL) - manager->priv->activate_time) * 1000;
-
- remove_cycle_timer (manager);
-
- if (elapsed >= cycle_timeout) {
- timeout = 0;
- } else {
- timeout = cycle_timeout - elapsed;
- }
-
- add_cycle_timer (manager, timeout);
-
- }
- }
-}
-
static void
gs_manager_set_property (GObject *object,
guint prop_id,
@@ -723,9 +353,6 @@ gs_manager_set_property (GObject *object,
self = GS_MANAGER (object);
switch (prop_id) {
- case PROP_THROTTLED:
- gs_manager_set_throttled (self, g_value_get_boolean (value));
- break;
case PROP_LOCK_ENABLED:
gs_manager_set_lock_enabled (self, g_value_get_boolean (value));
break;
@@ -753,9 +380,6 @@ gs_manager_set_property (GObject *object,
case PROP_STATUS_MESSAGE:
gs_manager_set_status_message (self, g_value_get_string (value));
break;
- case PROP_CYCLE_TIMEOUT:
- gs_manager_set_cycle_timeout (self, g_value_get_long (value));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -773,9 +397,6 @@ gs_manager_get_property (GObject *object,
self = GS_MANAGER (object);
switch (prop_id) {
- case PROP_THROTTLED:
- g_value_set_boolean (value, self->priv->throttled);
- break;
case PROP_LOCK_ENABLED:
g_value_set_boolean (value, self->priv->lock_enabled);
break;
@@ -803,9 +424,6 @@ gs_manager_get_property (GObject *object,
case PROP_STATUS_MESSAGE:
g_value_set_string (value, self->priv->status_message);
break;
- case PROP_CYCLE_TIMEOUT:
- g_value_set_long (value, self->priv->cycle_timeout);
- break;
case PROP_ACTIVE:
g_value_set_boolean (value, self->priv->active);
default:
@@ -918,22 +536,6 @@ gs_manager_class_init (GSManagerClass *klass)
NULL,
NULL,
G_PARAM_READWRITE));
- g_object_class_install_property (object_class,
- PROP_CYCLE_TIMEOUT,
- g_param_spec_long ("cycle-timeout",
- NULL,
- NULL,
- 10000,
- G_MAXLONG,
- 300000,
- G_PARAM_READWRITE));
- g_object_class_install_property (object_class,
- PROP_THROTTLED,
- g_param_spec_boolean ("throttled",
- NULL,
- NULL,
- TRUE,
- G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (GSManagerPrivate));
}
@@ -994,7 +596,6 @@ gs_manager_init (GSManager *manager)
manager->priv->fade = gs_fade_new ();
manager->priv->grab = gs_grab_new ();
- manager->priv->theme_manager = gs_theme_manager_new ();
manager->priv->settings = get_system_settings ();
manager->priv->bg = gnome_bg_new ();
@@ -1016,7 +617,6 @@ static void
remove_timers (GSManager *manager)
{
remove_lock_timer (manager);
- remove_cycle_timer (manager);
}
static void
@@ -1174,8 +774,6 @@ window_map_event_cb (GSWindow *window,
manager_maybe_grab_window (manager, window);
- manager_maybe_start_job_for_window (manager, window);
-
return FALSE;
}
@@ -1224,15 +822,8 @@ static void
manager_show_window (GSManager *manager,
GSWindow *window)
{
- GSJob *job;
-
apply_background_to_window (manager, window);
- job = gs_job_new_for_widget (gs_window_get_drawing_area (window));
-
- manager_select_theme_for_job (manager, job);
- manager_add_job_for_window (manager, window, job);
-
manager->priv->activate_time = time (NULL);
if (manager->priv->lock_timeout >= 0) {
@@ -1240,11 +831,6 @@ manager_show_window (GSManager *manager,
add_lock_timer (manager, manager->priv->lock_timeout);
}
- if (manager->priv->cycle_timeout >= 10000) {
- remove_cycle_timer (manager);
- add_cycle_timer (manager, manager->priv->cycle_timeout);
- }
-
add_unfade_idle (manager);
/* FIXME: only emit signal once */
@@ -1266,35 +852,6 @@ window_show_cb (GSWindow *window,
}
static void
-maybe_set_window_throttle (GSManager *manager,
- GSWindow *window,
- gboolean throttled)
-{
- if (throttled) {
- manager_maybe_stop_job_for_window (manager, window);
- } else {
- manager_maybe_start_job_for_window (manager, window);
- }
-}
-
-static void
-window_obscured_cb (GSWindow *window,
- GParamSpec *pspec,
- GSManager *manager)
-{
- gboolean obscured;
-
- obscured = gs_window_is_obscured (window);
- gs_debug ("Handling window obscured: %s", obscured ? "obscured" : "unobscured");
-
- maybe_set_window_throttle (manager, window, obscured);
-
- if (! obscured) {
- gs_manager_request_unlock (manager);
- }
-}
-
-static void
handle_window_dialog_up (GSManager *manager,
GSWindow *window)
{
@@ -1324,12 +881,6 @@ handle_window_dialog_up (GSManager *manager,
/* Release the pointer grab while dialog is up so that
the dialog can be used. We'll regrab it when the dialog goes down. */
gs_grab_release_mouse (manager->priv->grab);
-
- if (! manager->priv->throttled) {
- gs_debug ("Suspending jobs");
-
- manager_suspend_jobs (manager);
- }
}
static void
@@ -1356,10 +907,6 @@ handle_window_dialog_down (GSManager *manager,
manager->priv->dialog_up = FALSE;
- if (! manager->priv->throttled) {
- manager_resume_jobs (manager);
- }
-
g_signal_emit (manager, signals [AUTH_REQUEST_END], 0);
}
@@ -1399,7 +946,6 @@ disconnect_window_signals (GSManager *manager,
g_signal_handlers_disconnect_by_func (window, window_show_cb, manager);
g_signal_handlers_disconnect_by_func (window, window_map_cb, manager);
g_signal_handlers_disconnect_by_func (window, window_map_event_cb, manager);
- g_signal_handlers_disconnect_by_func (window, window_obscured_cb, manager);
g_signal_handlers_disconnect_by_func (window, window_dialog_up_changed_cb, manager);
g_signal_handlers_disconnect_by_func (window, window_unmap_cb, manager);
g_signal_handlers_disconnect_by_func (window, window_grab_broken_cb, manager);
@@ -1428,8 +974,6 @@ connect_window_signals (GSManager *manager,
G_CALLBACK (window_map_cb), manager, G_CONNECT_AFTER);
g_signal_connect_object (window, "map_event",
G_CALLBACK (window_map_event_cb), manager, G_CONNECT_AFTER);
- g_signal_connect_object (window, "notify::obscured",
- G_CALLBACK (window_obscured_cb), manager, G_CONNECT_AFTER);
g_signal_connect_object (window, "notify::dialog-up",
G_CALLBACK (window_dialog_up_changed_cb), manager, 0);
g_signal_connect_object (window, "unmap",
@@ -1519,8 +1063,6 @@ on_screen_monitors_changed (GdkScreen *screen,
this_screen = gs_window_get_screen (GS_WINDOW (l->data));
this_monitor = gs_window_get_monitor (GS_WINDOW (l->data));
if (this_screen == screen && this_monitor >= n_monitors) {
- manager_maybe_stop_job_for_window (manager, GS_WINDOW (l->data));
- g_hash_table_remove (manager->priv->jobs, l->data);
gs_window_destroy (GS_WINDOW (l->data));
manager->priv->windows = g_slist_delete_link (manager->priv->windows, l);
}
@@ -1591,7 +1133,6 @@ gs_manager_finalize (GObject *object)
g_object_unref (manager->priv->settings);
}
- free_themes (manager);
g_free (manager->priv->logout_command);
g_free (manager->priv->keyboard_command);
g_free (manager->priv->status_message);
@@ -1601,8 +1142,6 @@ gs_manager_finalize (GObject *object)
gs_grab_release (manager->priv->grab);
- manager_stop_jobs (manager);
-
gs_manager_destroy_windows (manager);
manager->priv->active = FALSE;
@@ -1611,7 +1150,6 @@ gs_manager_finalize (GObject *object)
g_object_unref (manager->priv->fade);
g_object_unref (manager->priv->grab);
- g_object_unref (manager->priv->theme_manager);
G_OBJECT_CLASS (gs_manager_parent_class)->finalize (object);
}
@@ -1688,17 +1226,6 @@ show_windows (GSList *windows)
}
static void
-remove_job (GSJob *job)
-{
- if (job == NULL) {
- return;
- }
-
- gs_job_stop (job);
- g_object_unref (job);
-}
-
-static void
fade_done_cb (GSFade *fade,
GSManager *manager)
{
@@ -1730,11 +1257,6 @@ gs_manager_activate (GSManager *manager)
gs_manager_create_windows (GS_MANAGER (manager));
}
- manager->priv->jobs = g_hash_table_new_full (g_direct_hash,
- g_direct_equal,
- NULL,
- (GDestroyNotify)remove_job);
-
manager->priv->active = TRUE;
/* fade to black and show windows */
@@ -1774,8 +1296,6 @@ gs_manager_deactivate (GSManager *manager)
gs_grab_release (manager->priv->grab);
- manager_stop_jobs (manager);
-
gs_manager_destroy_windows (manager);
/* reset state */
diff --git a/src/gs-manager.h b/src/gs-manager.h
index 3a3e349..8086a58 100644
--- a/src/gs-manager.h
+++ b/src/gs-manager.h
@@ -61,8 +61,6 @@ gboolean gs_manager_set_active (GSManager *manager,
gboolean active);
gboolean gs_manager_get_active (GSManager *manager);
-gboolean gs_manager_cycle (GSManager *manager);
-
void gs_manager_get_lock_active (GSManager *manager,
gboolean *lock_active);
void gs_manager_set_lock_active (GSManager *manager,
@@ -87,14 +85,8 @@ void gs_manager_set_logout_timeout (GSManager *manager,
glong logout_timeout);
void gs_manager_set_logout_command (GSManager *manager,
const char *command);
-void gs_manager_set_throttled (GSManager *manager,
- gboolean lock_enabled);
-void gs_manager_set_cycle_timeout (GSManager *manager,
- glong cycle_timeout);
void gs_manager_set_themes (GSManager *manager,
GSList *themes);
-void gs_manager_set_mode (GSManager *manager,
- GSSaverMode mode);
void gs_manager_show_message (GSManager *manager,
const char *summary,
const char *body,
diff --git a/src/gs-monitor.c b/src/gs-monitor.c
index 640ee74..cd1d093 100644
--- a/src/gs-monitor.c
+++ b/src/gs-monitor.c
@@ -214,13 +214,6 @@ listener_quit_cb (GSListener *listener,
}
static void
-listener_cycle_cb (GSListener *listener,
- GSMonitor *monitor)
-{
- gs_manager_cycle (monitor->priv->manager);
-}
-
-static void
listener_show_message_cb (GSListener *listener,
const char *summary,
const char *body,
@@ -265,14 +258,6 @@ listener_active_changed_cb (GSListener *listener,
}
static void
-listener_throttle_changed_cb (GSListener *listener,
- gboolean throttled,
- GSMonitor *monitor)
-{
- gs_manager_set_throttled (monitor->priv->manager, throttled);
-}
-
-static void
listener_simulate_user_activity_cb (GSListener *listener,
GSMonitor *monitor)
{
@@ -301,9 +286,6 @@ _gs_monitor_update_from_prefs (GSMonitor *monitor,
gs_manager_set_logout_timeout (monitor->priv->manager, monitor->priv->prefs->logout_timeout);
gs_manager_set_logout_command (monitor->priv->manager, monitor->priv->prefs->logout_command);
gs_manager_set_keyboard_command (monitor->priv->manager, monitor->priv->prefs->keyboard_command);
- gs_manager_set_cycle_timeout (monitor->priv->manager, monitor->priv->prefs->cycle);
- gs_manager_set_mode (monitor->priv->manager, monitor->priv->prefs->mode);
- gs_manager_set_themes (monitor->priv->manager, monitor->priv->prefs->themes);
/* enable activation when allowed */
gs_listener_set_activation_enabled (monitor->priv->listener,
@@ -343,9 +325,7 @@ disconnect_listener_signals (GSMonitor *monitor)
{
g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_lock_cb, monitor);
g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_quit_cb, monitor);
- g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_cycle_cb, monitor);
g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_active_changed_cb, monitor);
- g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_throttle_changed_cb, monitor);
g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_simulate_user_activity_cb, monitor);
g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_show_message_cb, monitor);
}
@@ -357,12 +337,8 @@ connect_listener_signals (GSMonitor *monitor)
G_CALLBACK (listener_lock_cb), monitor);
g_signal_connect (monitor->priv->listener, "quit",
G_CALLBACK (listener_quit_cb), monitor);
- g_signal_connect (monitor->priv->listener, "cycle",
- G_CALLBACK (listener_cycle_cb), monitor);
g_signal_connect (monitor->priv->listener, "active-changed",
G_CALLBACK (listener_active_changed_cb), monitor);
- g_signal_connect (monitor->priv->listener, "throttle-changed",
- G_CALLBACK (listener_throttle_changed_cb), monitor);
g_signal_connect (monitor->priv->listener, "simulate-user-activity",
G_CALLBACK (listener_simulate_user_activity_cb), monitor);
g_signal_connect (monitor->priv->listener, "show-message",
diff --git a/src/gs-prefs.c b/src/gs-prefs.c
index 78700f9..6e05c1f 100644
--- a/src/gs-prefs.c
+++ b/src/gs-prefs.c
@@ -45,11 +45,8 @@ static void gs_prefs_finalize (GObject *object);
#define GS_SETTINGS_SCHEMA "org.gnome.desktop.screensaver"
#define KEY_IDLE_ACTIVATION_ENABLED "idle-activation-enabled"
#define KEY_LOCK_ENABLED "lock-enabled"
-#define KEY_MODE "mode"
#define KEY_POWER_DELAY "power-management-delay"
#define KEY_LOCK_DELAY "lock-delay"
-#define KEY_CYCLE_DELAY "cycle-delay"
-#define KEY_THEMES "themes"
#define KEY_USER_SWITCH_ENABLED "user-switch-enabled"
#define KEY_LOGOUT_ENABLED "logout-enabled"
#define KEY_LOGOUT_DELAY "logout-delay"
@@ -175,45 +172,6 @@ _gs_prefs_set_lock_timeout (GSPrefs *prefs,
}
static void
-_gs_prefs_set_cycle_timeout (GSPrefs *prefs,
- guint value)
-{
- if (value < 1)
- value = 1;
-
- /* pick a reasonable large number for the
- upper bound */
- if (value > 480)
- value = 480;
-
- prefs->cycle = value * 60000;
-}
-
-static void
-_gs_prefs_set_mode (GSPrefs *prefs,
- GDesktopScreensaverMode mode)
-{
- prefs->mode = mode;
-}
-
-static void
-_gs_prefs_set_themes (GSPrefs *prefs,
- gchar **values)
-{
- guint i;
-
- if (prefs->themes) {
- g_slist_foreach (prefs->themes, (GFunc)g_free, NULL);
- g_slist_free (prefs->themes);
- }
-
- /* take ownership of the list */
- prefs->themes = NULL;
- for (i=0; values[i] != NULL; i++)
- prefs->themes = g_slist_append (prefs->themes, g_strdup (values[i]));
-}
-
-static void
_gs_prefs_set_idle_activation_enabled (GSPrefs *prefs,
gboolean value)
{
@@ -325,8 +283,6 @@ gs_prefs_load_from_settings (GSPrefs *prefs)
guint uvalue;
gboolean bvalue;
char *string;
- gchar **strv;
- GDesktopScreensaverMode mode;
bvalue = g_settings_get_boolean (prefs->priv->settings, KEY_IDLE_ACTIVATION_ENABLED);
_gs_prefs_set_idle_activation_enabled (prefs, bvalue);
@@ -349,16 +305,6 @@ gs_prefs_load_from_settings (GSPrefs *prefs)
uvalue = _gs_settings_get_uint (prefs->priv->settings, KEY_LOCK_DELAY);
_gs_prefs_set_lock_timeout (prefs, uvalue);
- uvalue = _gs_settings_get_uint (prefs->priv->settings, KEY_CYCLE_DELAY);
- _gs_prefs_set_cycle_timeout (prefs, uvalue);
-
- mode = g_settings_get_enum (prefs->priv->settings, KEY_MODE);
- _gs_prefs_set_mode (prefs, mode);
-
- strv = g_settings_get_strv (prefs->priv->settings, KEY_THEMES);
- _gs_prefs_set_themes (prefs, strv);
- g_strfreev (strv);
-
/* Embedded keyboard options */
bvalue = g_settings_get_boolean (prefs->priv->settings, KEY_KEYBOARD_ENABLED);
@@ -394,21 +340,7 @@ key_changed_cb (GSettings *settings,
const gchar *key,
GSPrefs *prefs)
{
- if (strcmp (key, KEY_MODE) == 0) {
-
- gint mode;
-
- mode = g_settings_get_enum (settings, key);
- _gs_prefs_set_mode (prefs, mode);
-
- } else if (strcmp (key, KEY_THEMES) == 0) {
- gchar **strv = NULL;
-
- strv = g_settings_get_strv (settings, key);
- _gs_prefs_set_themes (prefs, strv);
- g_strfreev (strv);
-
- } else if (strcmp (key, KEY_ACTIVATE_DELAY) == 0) {
+ if (strcmp (key, KEY_ACTIVATE_DELAY) == 0) {
guint delay;
@@ -457,13 +389,6 @@ key_changed_cb (GSettings *settings,
disabled = g_settings_get_boolean (settings, key);
_gs_prefs_set_user_switch_disabled (prefs, disabled);
- } else if (strcmp (key, KEY_CYCLE_DELAY) == 0) {
-
- guint delay;
-
- delay = _gs_settings_get_uint (settings, key);
- _gs_prefs_set_cycle_timeout (prefs, delay);
-
} else if (strcmp (key, KEY_KEYBOARD_ENABLED) == 0) {
gboolean enabled;
@@ -551,9 +476,6 @@ gs_prefs_init (GSPrefs *prefs)
prefs->power_timeout = 60000;
prefs->lock_timeout = 0;
prefs->logout_timeout = 14400000;
- prefs->cycle = 600000;
-
- prefs->mode = GS_MODE_SINGLE;
gs_prefs_load_from_settings (prefs);
}
@@ -583,11 +505,6 @@ gs_prefs_finalize (GObject *object)
prefs->priv->lockdown = NULL;
}
- if (prefs->themes) {
- g_slist_foreach (prefs->themes, (GFunc)g_free, NULL);
- g_slist_free (prefs->themes);
- }
-
g_free (prefs->logout_command);
g_free (prefs->keyboard_command);
diff --git a/src/gs-prefs.h b/src/gs-prefs.h
index cda64be..647c70f 100644
--- a/src/gs-prefs.h
+++ b/src/gs-prefs.h
@@ -32,12 +32,6 @@ G_BEGIN_DECLS
#define GS_IS_PREFS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_PREFS))
#define GS_PREFS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_PREFS, GSPrefsClass))
-typedef enum {
- GS_MODE_BLANK_ONLY,
- GS_MODE_RANDOM,
- GS_MODE_SINGLE
-} GSSaverMode;
-
typedef struct GSPrefsPrivate GSPrefsPrivate;
typedef struct
@@ -59,13 +53,9 @@ typedef struct
guint timeout; /* how much idle time before activation */
guint lock_timeout; /* how long after activation locking starts */
guint logout_timeout; /* how long until the logout option appears */
- guint cycle; /* how long each theme should run */
char *logout_command; /* command to use to logout */
char *keyboard_command; /* command to use to embed a keyboard */
-
- GSList *themes; /* the screensaver themes to run */
- GSSaverMode mode; /* theme selection mode */
} GSPrefs;
typedef struct
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
