[totem/gnome-2-32] Fix up screensaver support
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/gnome-2-32] Fix up screensaver support
- Date: Wed, 4 Aug 2010 15:31:06 +0000 (UTC)
commit a4ff5a8c9c727f01c221eaa9dc75c9467e99a615
Author: Bastien Nocera <hadess hadess net>
Date: Sat Jun 12 17:12:51 2010 +0100
Fix up screensaver support
Copy evince screensaver code, and add the ability to
set the reason outside the module itself.
browser-plugin/totem-plugin-viewer.c | 3 +
configure.in | 3 +-
lib/totem-scrsaver.c | 344 +++++++++++++++++----------
lib/totem-scrsaver.h | 16 +-
po/POTFILES.in | 2 +-
src/plugins/screensaver/totem-screensaver.c | 3 +
6 files changed, 241 insertions(+), 130 deletions(-)
---
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index cc816a8..28bf309 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -1959,6 +1959,9 @@ totem_embedded_construct (TotemEmbedded *emb,
if (!emb->hidden) {
gtk_widget_set_size_request (emb->window, width, height);
emb->scrsaver = totem_scrsaver_new ();
+ g_object_set (emb->scrsaver,
+ "reason", _("Playing a movie"),
+ NULL);
}
#ifdef GNOME_ENABLE_DEBUG
diff --git a/configure.in b/configure.in
index 038f8e6..d27b96d 100644
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
# Requirements
-GLIB_REQS=2.25.4
+GLIB_REQS=2.25.8
GTK_REQS=2.19.5
TOTEM_PLPARSER_REQS=2.29.1
GNOMEICON_REQS=2.15.90
@@ -732,6 +732,7 @@ if test "x$with_dbus" != "xno"; then
fi
if test "x$enable_dbus" = xyes; then
AC_DEFINE(WITH_DBUS, 1, [Define if D-BUS is enabled])
+ AC_DEFINE(ENABLE_DBUS, 1, [Define if D-BUS is enabled])
fi
fi
AM_CONDITIONAL(WITH_DBUS, test "x$enable_dbus" = "xyes")
diff --git a/lib/totem-scrsaver.c b/lib/totem-scrsaver.c
index 420cd48..8622079 100644
--- a/lib/totem-scrsaver.c
+++ b/lib/totem-scrsaver.c
@@ -1,6 +1,8 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
Copyright (C) 2004-2006 Bastien Nocera <hadess hadess net>
+ Copyright © 2010 Christian Persch
+ Copyright © 2010 Carlos Garcia Campos
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -17,10 +19,11 @@
write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA.
- Author: Bastien Nocera <hadess hadess net>
+ Authors: Bastien Nocera <hadess hadess net>
+ Christian Persch
+ Carlos Garcia Campos
*/
-
#include "config.h"
#include <glib/gi18n.h>
@@ -36,29 +39,32 @@
#endif /* HAVE_XTEST */
#endif /* GDK_WINDOWING_X11 */
-#ifdef WITH_DBUS
+#include "totem-scrsaver.h"
+
#define GS_SERVICE "org.gnome.ScreenSaver"
#define GS_PATH "/org/gnome/ScreenSaver"
#define GS_INTERFACE "org.gnome.ScreenSaver"
-#endif /* WITH_DBUS */
-
-#include "totem-scrsaver.h"
#define XSCREENSAVER_MIN_TIMEOUT 60
-static GObjectClass *parent_class = NULL;
-static void totem_scrsaver_finalize (GObject *object);
+enum {
+ PROP_0,
+ PROP_REASON
+};
+static void totem_scrsaver_finalize (GObject *object);
struct TotemScrsaverPrivate {
/* Whether the screensaver is disabled */
gboolean disabled;
+ /* The reason for the inhibition */
+ char *reason;
-#ifdef WITH_DBUS
- GDBusConnection *connection;
+ GDBusProxy *gs_proxy;
+ gboolean have_screensaver_dbus;
guint watch_id;
guint32 cookie;
-#endif /* WITH_DBUS */
+ gboolean old_dbus_api;
/* To save the screensaver info */
int timeout;
@@ -77,99 +83,121 @@ G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT)
static gboolean
screensaver_is_running_dbus (TotemScrsaver *scr)
{
-#ifdef WITH_DBUS
- return scr->priv->connection != NULL;
-#else
- return FALSE;
-#endif /* WITH_DBUS */
+ return scr->priv->have_screensaver_dbus;
}
static void
-screensaver_inhibit_dbus (TotemScrsaver *scr,
- gboolean inhibit)
+on_inhibit_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
{
-#ifdef WITH_DBUS
- GError *error = NULL;
- GVariant *value;
-
- if (scr->priv->connection == NULL)
- return;
-
- if (inhibit) {
- value = g_dbus_connection_invoke_method_sync (scr->priv->connection,
- GS_SERVICE,
- GS_PATH,
- GS_INTERFACE,
- "Inhibit",
- g_variant_new ("(ss)",
- "Totem",
- _("Playing a movie")),
- G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
- -1,
- NULL,
- &error);
- if (error && g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
+ GDBusProxy *proxy = G_DBUS_PROXY (source_object);
+ TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
+ GVariant *value;
+ GError *error = NULL;
+
+ value = g_dbus_proxy_call_finish (proxy, res, &error);
+ if (!value) {
+ if (!scr->priv->old_dbus_api &&
+ g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
+ g_return_if_fail (scr->priv->reason != NULL);
/* try the old API */
- g_clear_error (&error);
- value = g_dbus_connection_invoke_method_sync (scr->priv->connection,
- GS_SERVICE,
- GS_PATH,
- GS_INTERFACE,
- "InhibitActivation",
- g_variant_new ("(s)",
- _("Playing a movie")),
- G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
- -1,
- NULL,
- &error);
- }
- if (value != NULL) {
- /* save the cookie */
- if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(u)")))
- g_variant_get (value, "(u)", &scr->priv->cookie);
- else
- scr->priv->cookie = 0;
- g_variant_unref (value);
+ scr->priv->old_dbus_api = TRUE;
+ g_dbus_proxy_call (proxy,
+ "InhibitActivation",
+ g_variant_new ("(s)",
+ scr->priv->reason),
+ G_DBUS_CALL_FLAGS_NO_AUTO_START,
+ -1,
+ NULL,
+ on_inhibit_cb,
+ scr);
} else {
g_warning ("Problem inhibiting the screensaver: %s", error->message);
- g_error_free (error);
}
+ g_error_free (error);
- } else {
- value = g_dbus_connection_invoke_method_sync (scr->priv->connection,
- GS_SERVICE,
- GS_PATH,
- GS_INTERFACE,
- "UnInhibit",
- g_variant_new ("(u)", scr->priv->cookie),
- G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
- -1,
- NULL,
- &error);
- if (error && g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
+ return;
+ }
+
+ /* save the cookie */
+ if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(u)")))
+ g_variant_get (value, "(u)", &scr->priv->cookie);
+ else
+ scr->priv->cookie = 0;
+ g_variant_unref (value);
+}
+
+static void
+on_uninhibit_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GDBusProxy *proxy = G_DBUS_PROXY (source_object);
+ TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
+ GVariant *value;
+ GError *error = NULL;
+
+ value = g_dbus_proxy_call_finish (proxy, res, &error);
+ if (!value) {
+ if (!scr->priv->old_dbus_api &&
+ g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
/* try the old API */
- g_clear_error (&error);
- value = g_dbus_connection_invoke_method_sync (scr->priv->connection,
- GS_SERVICE,
- GS_PATH,
- GS_INTERFACE,
- "AllowActivation",
- g_variant_new ("()"),
- G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
- -1,
- NULL,
- &error);
- }
- if (value != NULL) {
- /* clear the cookie */
- scr->priv->cookie = 0;
- g_variant_unref (value);
+ scr->priv->old_dbus_api = TRUE;
+ g_dbus_proxy_call (proxy,
+ "AllowActivation",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NO_AUTO_START,
+ -1,
+ NULL,
+ on_uninhibit_cb,
+ scr);
} else {
g_warning ("Problem uninhibiting the screensaver: %s", error->message);
- g_error_free (error);
}
+ g_error_free (error);
+
+ return;
+ }
+
+ /* clear the cookie */
+ scr->priv->cookie = 0;
+ g_variant_unref (value);
+}
+
+static void
+screensaver_inhibit_dbus (TotemScrsaver *scr,
+ gboolean inhibit)
+{
+ TotemScrsaverPrivate *priv = scr->priv;
+
+ if (!priv->have_screensaver_dbus)
+ return;
+
+ scr->priv->old_dbus_api = FALSE;
+
+ if (inhibit) {
+ g_return_if_fail (scr->priv->reason != NULL);
+ g_dbus_proxy_call (priv->gs_proxy,
+ "Inhibit",
+ g_variant_new ("(ss)",
+ g_get_application_name (),
+ scr->priv->reason),
+ G_DBUS_CALL_FLAGS_NO_AUTO_START,
+ -1,
+ NULL,
+ on_inhibit_cb,
+ scr);
+ } else {
+ g_dbus_proxy_call (priv->gs_proxy,
+ "UnInhibit",
+ g_variant_new ("(u)", priv->cookie),
+ G_DBUS_CALL_FLAGS_NO_AUTO_START,
+ -1,
+ NULL,
+ on_uninhibit_cb,
+ scr);
}
-#endif /* WITH_DBUS */
}
static void
@@ -184,53 +212,66 @@ screensaver_disable_dbus (TotemScrsaver *scr)
screensaver_inhibit_dbus (scr, TRUE);
}
-#ifdef WITH_DBUS
static void
screensaver_dbus_appeared_cb (GDBusConnection *connection,
- const char *name,
- const char *name_owner,
- gpointer user_data)
+ const gchar *name,
+ const gchar *name_owner,
+ GDBusProxy *proxy,
+ gpointer user_data)
{
TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
+ TotemScrsaverPrivate *priv = scr->priv;
+
+ priv->gs_proxy = g_object_ref (proxy);
- scr->priv->connection = g_object_ref (connection);
+ priv->have_screensaver_dbus = TRUE;
}
static void
screensaver_dbus_disappeared_cb (GDBusConnection *connection,
- const char *name,
- gpointer user_data)
+ const gchar *name,
+ gpointer user_data)
{
TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
+ TotemScrsaverPrivate *priv = scr->priv;
- g_assert (scr->priv->connection == connection);
- g_object_unref (scr->priv->connection);
- scr->priv->connection = NULL;
+ if (priv->gs_proxy) {
+ g_object_unref (priv->gs_proxy);
+ priv->gs_proxy = NULL;
+ }
+
+ priv->have_screensaver_dbus = FALSE;
}
-#endif
static void
screensaver_init_dbus (TotemScrsaver *scr)
{
-#ifdef WITH_DBUS
- scr->priv->watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
- GS_SERVICE,
- G_BUS_NAME_WATCHER_FLAGS_NONE,
- screensaver_dbus_appeared_cb,
- screensaver_dbus_disappeared_cb,
- scr, NULL);
-#endif /* WITH_DBUS */
+ TotemScrsaverPrivate *priv = scr->priv;
+
+ priv->watch_id = g_bus_watch_proxy (G_BUS_TYPE_SESSION,
+ GS_SERVICE,
+ G_BUS_NAME_WATCHER_FLAGS_NONE,
+ GS_PATH,
+ GS_INTERFACE,
+ G_TYPE_DBUS_PROXY,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ screensaver_dbus_appeared_cb,
+ screensaver_dbus_disappeared_cb,
+ scr, NULL);
}
static void
screensaver_finalize_dbus (TotemScrsaver *scr)
{
-#ifdef WITH_DBUS
- g_bus_unwatch_name (scr->priv->watch_id);
+ TotemScrsaverPrivate *priv = scr->priv;
+
+ if (scr->priv->gs_proxy) {
+ g_object_unref (scr->priv->gs_proxy);
+ }
- if (scr->priv->connection != NULL)
- g_object_unref (scr->priv->connection);
-#endif /* WITH_DBUS */
+ if (priv->watch_id > 0)
+ g_bus_unwatch_proxy (priv->watch_id);
}
#ifdef GDK_WINDOWING_X11
@@ -349,15 +390,73 @@ screensaver_finalize_x11 (TotemScrsaver *scr)
#endif
static void
+totem_scrsaver_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ TotemScrsaver *scr;
+
+ scr = TOTEM_SCRSAVER (object);
+
+ switch (property_id)
+ {
+ case PROP_REASON:
+ g_value_set_string (value, scr->priv->reason);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+totem_scrsaver_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ TotemScrsaver *scr;
+
+ scr = TOTEM_SCRSAVER (object);
+
+ switch (property_id)
+ {
+ case PROP_REASON:
+ g_free (scr->priv->reason);
+ scr->priv->reason = g_value_dup_string (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
totem_scrsaver_class_init (TotemScrsaverClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
+ g_type_class_add_private (klass, sizeof (TotemScrsaverPrivate));
+ object_class->set_property = totem_scrsaver_set_property;
+ object_class->get_property = totem_scrsaver_get_property;
object_class->finalize = totem_scrsaver_finalize;
+
+ g_object_class_install_property (object_class, PROP_REASON,
+ g_param_spec_string ("reason", NULL, NULL,
+ NULL, G_PARAM_READWRITE));
+
}
+/**
+ * totem_scrsaver_new:
+ *
+ * Creates a #TotemScrsaver object.
+ * If the GNOME screen saver is running, it uses its DBUS interface to
+ * inhibit the screensaver; otherwise it falls back to using the X
+ * screensaver functionality for this.
+ *
+ * Returns: a newly created #TotemScrsaver
+ */
TotemScrsaver *
totem_scrsaver_new (void)
{
@@ -367,7 +466,9 @@ totem_scrsaver_new (void)
static void
totem_scrsaver_init (TotemScrsaver *scr)
{
- scr->priv = g_new0 (TotemScrsaverPrivate, 1);
+ scr->priv = G_TYPE_INSTANCE_GET_PRIVATE (scr,
+ TOTEM_TYPE_SCRSAVER,
+ TotemScrsaverPrivate);
screensaver_init_dbus (scr);
#ifdef GDK_WINDOWING_X11
@@ -410,7 +511,7 @@ totem_scrsaver_enable (TotemScrsaver *scr)
if (screensaver_is_running_dbus (scr) != FALSE)
screensaver_enable_dbus (scr);
- else
+ else
#ifdef GDK_WINDOWING_X11
screensaver_enable_x11 (scr);
#else
@@ -438,6 +539,8 @@ totem_scrsaver_finalize (GObject *object)
{
TotemScrsaver *scr = TOTEM_SCRSAVER (object);
+ g_free (scr->priv->reason);
+
screensaver_finalize_dbus (scr);
#ifdef GDK_WINDOWING_X11
screensaver_finalize_x11 (scr);
@@ -446,10 +549,5 @@ totem_scrsaver_finalize (GObject *object)
{}
#endif
- g_free (scr->priv);
-
- if (G_OBJECT_CLASS (parent_class)->finalize != NULL) {
- (* G_OBJECT_CLASS (parent_class)->finalize) (object);
- }
+ G_OBJECT_CLASS (totem_scrsaver_parent_class)->finalize (object);
}
-
diff --git a/lib/totem-scrsaver.h b/lib/totem-scrsaver.h
index ba01bc5..f3301c8 100644
--- a/lib/totem-scrsaver.h
+++ b/lib/totem-scrsaver.h
@@ -19,16 +19,19 @@
Author: Bastien Nocera <hadess hadess net>
*/
-#include <glib.h>
+#ifndef TOTEM_SCRSAVER_H
+#define TOTEM_SCRSAVER_H
+
#include <glib-object.h>
+G_BEGIN_DECLS
+
#define TOTEM_TYPE_SCRSAVER (totem_scrsaver_get_type ())
#define TOTEM_SCRSAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_SCRSAVER, TotemScrsaver))
#define TOTEM_SCRSAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_SCRSAVER, TotemScrsaverClass))
#define TOTEM_IS_SCRSAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_SCRSAVER))
#define TOTEM_IS_SCRSAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_SCRSAVER))
-
typedef struct TotemScrsaver TotemScrsaver;
typedef struct TotemScrsaverClass TotemScrsaverClass;
typedef struct TotemScrsaverPrivate TotemScrsaverPrivate;
@@ -39,13 +42,16 @@ struct TotemScrsaver {
};
struct TotemScrsaverClass {
- GObjectClass parent_class;
+ GObjectClass parent_class;
};
-GType totem_scrsaver_get_type (void);
-TotemScrsaver *totem_scrsaver_new (void);
+GType totem_scrsaver_get_type (void) G_GNUC_CONST;
+TotemScrsaver *totem_scrsaver_new (void);
void totem_scrsaver_enable (TotemScrsaver *scr);
void totem_scrsaver_disable (TotemScrsaver *scr);
void totem_scrsaver_set_state (TotemScrsaver *scr,
gboolean enable);
+G_END_DECLS
+
+#endif /* !TOTEM_SCRSAVER_H */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ff22626..2f33f26 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,7 +10,6 @@ data/totem.desktop.in.in.in
[type: gettext/glade]data/totem.ui
data/totem.schemas.in
[type: gettext/glade]data/uri.ui
-lib/totem-scrsaver.c
src/eggdesktopfile.c
src/eggfileformatchooser.c
src/eggsmclient.c
@@ -72,6 +71,7 @@ src/plugins/publish/totem-publish.c
[type: gettext/ini]src/plugins/publish/publish.totem-plugin.in
[type: gettext/glade]src/plugins/publish/publish-plugin.ui
[type: gettext/ini]src/plugins/screensaver/screensaver.totem-plugin.in
+src/plugins/screensaver/totem-screensaver.c
[type: gettext/ini]src/plugins/screenshot/screenshot.totem-plugin.in
[type: gettext/glade]src/plugins/screenshot/gallery.ui
[type: gettext/glade]src/plugins/screenshot/gnome-screenshot.ui
diff --git a/src/plugins/screensaver/totem-screensaver.c b/src/plugins/screensaver/totem-screensaver.c
index e1c24fd..5b4e167 100644
--- a/src/plugins/screensaver/totem-screensaver.c
+++ b/src/plugins/screensaver/totem-screensaver.c
@@ -90,6 +90,9 @@ static void
totem_screensaver_plugin_init (TotemScreensaverPlugin *plugin)
{
plugin->scr = totem_scrsaver_new ();
+ g_object_set (plugin->scr,
+ "reason", _("Playing a movie"),
+ NULL);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
