]> www.fi.muni.cz Git - evince.git/blobdiff - cut-n-paste/totem-screensaver/totem-scrsaver.c
totem-screensaver: Update from totem sources
[evince.git] / cut-n-paste / totem-screensaver / totem-scrsaver.c
index 18c94317c79ac6dd0da59bc0c3dd4a934bb169ad..aaa74bd9cf41ff80cf47a688936a88362e12f749 100644 (file)
@@ -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
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   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>
+
+#include <gtk/gtk.h>
+
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#include <X11/keysym.h>
 
 #ifdef HAVE_XTEST
 #include <X11/extensions/XTest.h>
 #endif /* HAVE_XTEST */
-#include <X11/keysym.h>
-
-#ifdef ENABLE_DBUS
-#include <dbus/dbus-glib.h>
-
-#define GS_SERVICE   "org.gnome.ScreenSaver"
-#define GS_PATH      "/org/gnome/ScreenSaver"
-#define GS_INTERFACE "org.gnome.ScreenSaver"
-#endif /* ENABLE_DBUS */
+#endif /* GDK_WINDOWING_X11 */
 
 #include "totem-scrsaver.h"
 
+#define GS_SERVICE   "org.gnome.SessionManager"
+#define GS_PATH      "/org/gnome/SessionManager"
+#define GS_INTERFACE "org.gnome.SessionManager"
+/* From org.gnome.SessionManager.xml */
+#define GS_NO_IDLE_FLAG 8
+
 #define XSCREENSAVER_MIN_TIMEOUT 60
 
-static GObjectClass *parent_class = NULL;
-static void totem_scrsaver_class_init (TotemScrsaverClass *class);
-static void totem_scrsaver_init       (TotemScrsaver      *parser);
-static void totem_scrsaver_finalize   (GObject *object);
+enum {
+       PROP_0,
+       PROP_REASON,
+       PROP_WINDOW
+};
 
+static void totem_scrsaver_finalize   (GObject *object);
 
 struct TotemScrsaverPrivate {
        /* Whether the screensaver is disabled */
        gboolean disabled;
+       /* The reason for the inhibition */
+       char *reason;
 
-#ifdef ENABLE_DBUS
-       DBusGConnection *connection;
-       DBusGProxy *gs_proxy;
+       GDBusProxy *gs_proxy;
+        gboolean have_session_dbus;
        guint32 cookie;
-#endif /* ENABLE_DBUS */
+       GtkWindow *window;
 
        /* To save the screensaver info */
        int timeout;
@@ -68,7 +77,7 @@ struct TotemScrsaverPrivate {
        /* For use with XTest */
        int keycode1, keycode2;
        int *keycode;
-       Bool have_xtest;
+       gboolean have_xtest;
 };
 
 G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT)
@@ -76,92 +85,113 @@ G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT)
 static gboolean
 screensaver_is_running_dbus (TotemScrsaver *scr)
 {
-#ifdef ENABLE_DBUS
-       if (! scr->priv->connection)
-               return FALSE;
+        return scr->priv->have_session_dbus;
+}
 
-       if (! scr->priv->gs_proxy)
-               return FALSE;
+static void
+on_inhibit_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;
 
-       return TRUE;
-#else
-       return FALSE;
-#endif /* ENABLE_DBUS */
+       value = g_dbus_proxy_call_finish (proxy, res, &error);
+       if (!value) {
+               g_warning ("Problem inhibiting the screensaver: %s", error->message);
+               g_object_unref (scr);
+               g_error_free (error);
+
+               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);
+
+       g_object_unref (scr);
+}
+
+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) {
+               g_warning ("Problem uninhibiting the screensaver: %s", error->message);
+               g_object_unref (scr);
+               g_error_free (error);
+
+               return;
+       }
+
+       /* clear the cookie */
+       scr->priv->cookie = 0;
+       g_variant_unref (value);
+
+       g_object_unref (scr);
 }
 
 static void
 screensaver_inhibit_dbus (TotemScrsaver *scr,
                          gboolean       inhibit)
 {
-#ifdef ENABLE_DBUS
-       GError *error;
-       gboolean res;
+        TotemScrsaverPrivate *priv = scr->priv;
+        GdkWindow *window;
+
+        if (!priv->have_session_dbus)
+                return;
 
-       g_return_if_fail (scr != NULL);
-       g_return_if_fail (scr->priv->connection != NULL);
-       g_return_if_fail (scr->priv->gs_proxy != NULL);
+       g_object_ref (scr);
 
-       error = NULL;
        if (inhibit) {
-               char   *application;
-               char   *reason;
-               guint32 cookie;
-
-               application = g_strdup ("Evince");
-               reason = g_strdup (_("Running in presentation mode"));
-
-               res = dbus_g_proxy_call (scr->priv->gs_proxy,
-                                        "Inhibit",
-                                        &error,
-                                        G_TYPE_STRING, application,
-                                        G_TYPE_STRING, reason,
-                                        G_TYPE_INVALID,
-                                        G_TYPE_UINT, &cookie,
-                                        G_TYPE_INVALID);
-
-               if (res) {
-                       /* save the cookie */
-                       scr->priv->cookie = cookie;
-               } else {
-                       /* try the old API */
-                       res = dbus_g_proxy_call (scr->priv->gs_proxy,
-                                                "InhibitActivation",
-                                                &error,
-                                                G_TYPE_STRING, reason,
-                                                G_TYPE_INVALID,
-                                                G_TYPE_INVALID);
-               }
+               guint xid;
 
-               g_free (reason);
-               g_free (application);
+               g_return_if_fail (scr->priv->reason != NULL);
 
-       } else {
-               res = dbus_g_proxy_call (scr->priv->gs_proxy,
-                                        "UnInhibit",
-                                        &error,
-                                        G_TYPE_UINT, scr->priv->cookie,
-                                        G_TYPE_INVALID,
-                                        G_TYPE_INVALID);
-               if (res) {
-                       /* clear the cookie */
-                       scr->priv->cookie = 0;
-               } else {
-                       /* try the old API */
-                       res = dbus_g_proxy_call (scr->priv->gs_proxy,
-                                                "AllowActivation",
-                                                &error,
-                                                G_TYPE_INVALID,
-                                                G_TYPE_INVALID);
+               xid = 0;
+               if (scr->priv->window != NULL) {
+                       window = gtk_widget_get_window (GTK_WIDGET (scr->priv->window));
+                       if (window != NULL)
+                               xid = gdk_x11_window_get_xid (window);
                }
-       }
 
-       if (! res) {
-               if (error) {
-                       g_warning ("Problem inhibiting the screensaver: %s", error->message);
-                       g_error_free (error);
+
+               g_dbus_proxy_call (priv->gs_proxy,
+                                  "Inhibit",
+                                  g_variant_new ("(susu)",
+                                                 g_get_application_name (),
+                                                 xid,
+                                                 scr->priv->reason,
+                                                 GS_NO_IDLE_FLAG),
+                                  G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                                  -1,
+                                  NULL,
+                                  on_inhibit_cb,
+                                  scr);
+       } else {
+               if (priv->cookie > 0) {
+                       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 /* ENABLE_DBUS */
 }
 
 static void
@@ -176,80 +206,65 @@ screensaver_disable_dbus (TotemScrsaver *scr)
        screensaver_inhibit_dbus (scr, TRUE);
 }
 
-#ifdef ENABLE_DBUS
 static void
-gs_proxy_destroy_cb (GObject *proxy,
-                    TotemScrsaver *scr)
+screensaver_dbus_proxy_new_cb (GObject      *source,
+                               GAsyncResult *result,
+                               gpointer      user_data)
 {
-       g_warning ("Detected that GNOME screensaver has left the bus");
+       TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
+       TotemScrsaverPrivate *priv = scr->priv;
+
+       priv->gs_proxy = g_dbus_proxy_new_for_bus_finish (result, NULL);
+       if (!priv->gs_proxy)
+               return;
 
-       /* just invalidate for now */
-       scr->priv->gs_proxy = NULL;
+       priv->have_session_dbus = TRUE;
+       if (priv->reason != NULL && scr->priv->disabled)
+               screensaver_disable_dbus (scr);
 }
-#endif
 
 static void
 screensaver_init_dbus (TotemScrsaver *scr)
 {
-#ifdef ENABLE_DBUS
-       GError *error = NULL;
-
-       scr->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-
-       if (! scr->priv->connection) {
-               if (error) {
-                       g_warning ("Failed to connect to the session bus: %s", error->message);
-                       g_error_free (error);
-               }
-               return;
-       }
-
-       scr->priv->gs_proxy = dbus_g_proxy_new_for_name_owner (scr->priv->connection,
-                                                              GS_SERVICE,
-                                                              GS_PATH,
-                                                              GS_INTERFACE,
-                                                              NULL);
-       if (scr->priv->gs_proxy != NULL) {
-               g_signal_connect_object (scr->priv->gs_proxy,
-                                        "destroy",
-                                        G_CALLBACK (gs_proxy_destroy_cb),
-                                        scr,
-                                        0);
-
-       }
-
-#endif /* ENABLE_DBUS */
+        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                                 G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                                 NULL,
+                                 GS_SERVICE,
+                                 GS_PATH,
+                                 GS_INTERFACE,
+                                 NULL,
+                                 screensaver_dbus_proxy_new_cb,
+                                 scr);
 }
 
 static void
 screensaver_finalize_dbus (TotemScrsaver *scr)
 {
-#ifdef ENABLE_DBUS
        if (scr->priv->gs_proxy) {
                g_object_unref (scr->priv->gs_proxy);
        }
-#endif /* ENABLE_DBUS */
 }
 
+#ifdef GDK_WINDOWING_X11
 static void
 screensaver_enable_x11 (TotemScrsaver *scr)
 {
 
 #ifdef HAVE_XTEST
-       if (scr->priv->have_xtest == True)
+       if (scr->priv->have_xtest != FALSE)
        {
                g_source_remove_by_user_data (scr);
                return;
        }
 #endif /* HAVE_XTEST */
 
-       XLockDisplay (GDK_DISPLAY());
-       XSetScreenSaver (GDK_DISPLAY(),
+       XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+       XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                        scr->priv->timeout,
                        scr->priv->interval,
                        scr->priv->prefer_blanking,
                        scr->priv->allow_exposures);
-       XUnlockDisplay (GDK_DISPLAY());
+       XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 }
 
 #ifdef HAVE_XTEST
@@ -258,12 +273,12 @@ fake_event (TotemScrsaver *scr)
 {
        if (scr->priv->disabled)
        {
-               XLockDisplay (GDK_DISPLAY());
-               XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode,
+               XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+               XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), *scr->priv->keycode,
                                True, CurrentTime);
-               XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode,
+               XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), *scr->priv->keycode,
                                False, CurrentTime);
-               XUnlockDisplay (GDK_DISPLAY());
+               XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
                /* Swap the keycode */
                if (scr->priv->keycode == &scr->priv->keycode1)
                        scr->priv->keycode = &scr->priv->keycode2;
@@ -280,36 +295,35 @@ screensaver_disable_x11 (TotemScrsaver *scr)
 {
 
 #ifdef HAVE_XTEST
-       if (scr->priv->have_xtest == True)
+       if (scr->priv->have_xtest != FALSE)
        {
-               XLockDisplay (GDK_DISPLAY());
-               XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout,
+               XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+               XGetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &scr->priv->timeout,
                                &scr->priv->interval,
                                &scr->priv->prefer_blanking,
                                &scr->priv->allow_exposures);
-               XUnlockDisplay (GDK_DISPLAY());
+               XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 
-               if (scr->priv->timeout != 0)
-               {
-                       g_timeout_add (scr->priv->timeout / 2 * 1000,
-                                       (GSourceFunc) fake_event, scr);
+               if (scr->priv->timeout != 0) {
+                       g_timeout_add_seconds (scr->priv->timeout / 2,
+                                              (GSourceFunc) fake_event, scr);
                } else {
-                       g_timeout_add (XSCREENSAVER_MIN_TIMEOUT / 2 * 1000,
-                                       (GSourceFunc) fake_event, scr);
+                       g_timeout_add_seconds (XSCREENSAVER_MIN_TIMEOUT / 2,
+                                              (GSourceFunc) fake_event, scr);
                }
 
                return;
        }
 #endif /* HAVE_XTEST */
 
-       XLockDisplay (GDK_DISPLAY());
-       XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout,
+       XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+       XGetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &scr->priv->timeout,
                        &scr->priv->interval,
                        &scr->priv->prefer_blanking,
                        &scr->priv->allow_exposures);
-       XSetScreenSaver(GDK_DISPLAY(), 0, 0,
+       XSetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0,
                        DontPreferBlanking, DontAllowExposures);
-       XUnlockDisplay (GDK_DISPLAY());
+       XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 }
 
 static void
@@ -318,24 +332,24 @@ screensaver_init_x11 (TotemScrsaver *scr)
 #ifdef HAVE_XTEST
        int a, b, c, d;
 
-       XLockDisplay (GDK_DISPLAY());
-       scr->priv->have_xtest = XTestQueryExtension (GDK_DISPLAY(), &a, &b, &c, &d);
-       if(scr->priv->have_xtest == True)
+       XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+       scr->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &a, &b, &c, &d) == True);
+       if (scr->priv->have_xtest != FALSE)
        {
-               scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L);
+               scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_L);
                if (scr->priv->keycode1 == 0) {
                        g_warning ("scr->priv->keycode1 not existant");
                }
-               scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_R);
+               scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_R);
                if (scr->priv->keycode2 == 0) {
-                       scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L);
+                       scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_L);
                        if (scr->priv->keycode2 == 0) {
                                g_warning ("scr->priv->keycode2 not existant");
                        }
                }
                scr->priv->keycode = &scr->priv->keycode1;
        }
-       XUnlockDisplay (GDK_DISPLAY());
+       XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 #endif /* HAVE_XTEST */
 }
 
@@ -344,17 +358,86 @@ screensaver_finalize_x11 (TotemScrsaver *scr)
 {
        g_source_remove_by_user_data (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;
+       case PROP_WINDOW:
+               g_value_set_object (value, scr->priv->window);
+               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;
+       case PROP_WINDOW:
+               if (scr->priv->window)
+                       g_object_unref (scr->priv->window);
+               scr->priv->window = g_value_dup_object (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));
+       g_object_class_install_property (object_class, PROP_WINDOW,
+                                        g_param_spec_object ("window", NULL, NULL,
+                                                             GTK_TYPE_WINDOW, 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)
 {
@@ -364,15 +447,23 @@ 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
        screensaver_init_x11 (scr);
+#else
+#warning Unimplemented
+#endif
 }
 
 void
 totem_scrsaver_disable (TotemScrsaver *scr)
 {
+       g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
+
        if (scr->priv->disabled != FALSE)
                return;
 
@@ -380,13 +471,20 @@ totem_scrsaver_disable (TotemScrsaver *scr)
 
        if (screensaver_is_running_dbus (scr) != FALSE)
                screensaver_disable_dbus (scr);
-       else 
+       else
+#ifdef GDK_WINDOWING_X11
                screensaver_disable_x11 (scr);
+#else
+#warning Unimplemented
+       {}
+#endif
 }
 
 void
 totem_scrsaver_enable (TotemScrsaver *scr)
 {
+       g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
+
        if (scr->priv->disabled == FALSE)
                return;
 
@@ -394,8 +492,27 @@ 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
+#warning Unimplemented
+       {}
+#endif
+}
+
+void
+totem_scrsaver_set_state (TotemScrsaver *scr, gboolean enable)
+{
+       g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
+
+       if (scr->priv->disabled == !enable)
+               return;
+
+       if (enable == FALSE)
+               totem_scrsaver_disable (scr);
+       else
+               totem_scrsaver_enable (scr);
 }
 
 static void
@@ -403,13 +520,17 @@ totem_scrsaver_finalize (GObject *object)
 {
        TotemScrsaver *scr = TOTEM_SCRSAVER (object);
 
+       g_free (scr->priv->reason);
+       if (scr->priv->window != NULL)
+               g_object_unref (scr->priv->window);
+
        screensaver_finalize_dbus (scr);
+#ifdef GDK_WINDOWING_X11
        screensaver_finalize_x11 (scr);
+#else
+#warning Unimplemented
+       {}
+#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);
 }
-