2009-02-05 Hib Eris <hib@hiberis.nl>
* cut-n-paste/totem-screensaver/totem-scrsaver.c:
Make screensaver code compile for w32. These changes have been
copied from upstream totem. See bug #339172.
svn path=/trunk/; revision=3415
+2009-02-05 Hib Eris <hib@hiberis.nl>
+
+ * cut-n-paste/totem-screensaver/totem-scrsaver.c:
+
+ Make screensaver code compile for w32. These changes have been
+ copied from upstream totem. See bug #339172.
+
2009-02-05 Carlos Garcia Campos <carlosgc@gnome.org>
* configure.ac:
2009-02-05 Carlos Garcia Campos <carlosgc@gnome.org>
* configure.ac:
#include "config.h"
#include <glib/gi18n.h>
#include "config.h"
#include <glib/gi18n.h>
+
+#include <gdk/gdk.h>
+
+#ifdef GDK_WINDOWING_X11
#ifdef HAVE_XTEST
#include <X11/extensions/XTest.h>
#endif /* HAVE_XTEST */
#ifdef HAVE_XTEST
#include <X11/extensions/XTest.h>
#endif /* HAVE_XTEST */
+#endif /* GDK_WINDOWING_X11 */
#include <dbus/dbus-glib.h>
#define GS_SERVICE "org.gnome.ScreenSaver"
#include <dbus/dbus-glib.h>
#define GS_SERVICE "org.gnome.ScreenSaver"
/* For use with XTest */
int keycode1, keycode2;
int *keycode;
/* For use with XTest */
int keycode1, keycode2;
int *keycode;
};
G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT)
};
G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT)
#endif /* ENABLE_DBUS */
}
#endif /* ENABLE_DBUS */
}
+#ifdef GDK_WINDOWING_X11
static void
screensaver_enable_x11 (TotemScrsaver *scr)
{
#ifdef HAVE_XTEST
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;
{
g_source_remove_by_user_data (scr);
return;
- if (scr->priv->have_xtest == True)
+ if (scr->priv->have_xtest != FALSE)
{
XLockDisplay (GDK_DISPLAY());
XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout,
{
XLockDisplay (GDK_DISPLAY());
XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout,
int a, b, c, d;
XLockDisplay (GDK_DISPLAY());
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)
+ scr->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY(), &a, &b, &c, &d) == True);
+ if (scr->priv->have_xtest != FALSE)
{
scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L);
if (scr->priv->keycode1 == 0) {
{
scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L);
if (scr->priv->keycode1 == 0) {
{
g_source_remove_by_user_data (scr);
}
{
g_source_remove_by_user_data (scr);
}
static void
totem_scrsaver_class_init (TotemScrsaverClass *klass)
static void
totem_scrsaver_class_init (TotemScrsaverClass *klass)
scr = TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
screensaver_init_dbus (scr, connection);
scr = TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
screensaver_init_dbus (scr, connection);
+#ifdef GDK_WINDOWING_X11
screensaver_init_x11 (scr);
screensaver_init_x11 (scr);
+#else
+#warning Unimplemented
+#endif
TotemScrsaver * scr;
scr = TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
TotemScrsaver * scr;
scr = TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
+#ifdef GDK_WINDOWING_X11
screensaver_init_x11 (scr);
screensaver_init_x11 (scr);
+#else
+#warning Unimplemented
+#endif
totem_scrsaver_init (TotemScrsaver *scr)
{
scr->priv = g_new0 (TotemScrsaverPrivate, 1);
totem_scrsaver_init (TotemScrsaver *scr)
{
scr->priv = g_new0 (TotemScrsaverPrivate, 1);
}
void
totem_scrsaver_disable (TotemScrsaver *scr)
{
}
void
totem_scrsaver_disable (TotemScrsaver *scr)
{
+ g_return_if_fail (TOTEM_SCRSAVER (scr));
+
if (scr->priv->disabled != FALSE)
return;
if (scr->priv->disabled != FALSE)
return;
if (screensaver_is_running_dbus (scr) != FALSE)
screensaver_disable_dbus (scr);
else
if (screensaver_is_running_dbus (scr) != FALSE)
screensaver_disable_dbus (scr);
else
+#ifdef GDK_WINDOWING_X11
screensaver_disable_x11 (scr);
screensaver_disable_x11 (scr);
+#else
+#warning Unimplemented
+ {}
+#endif
}
void
totem_scrsaver_enable (TotemScrsaver *scr)
{
}
void
totem_scrsaver_enable (TotemScrsaver *scr)
{
+ g_return_if_fail (TOTEM_SCRSAVER (scr));
+
if (scr->priv->disabled == FALSE)
return;
if (scr->priv->disabled == FALSE)
return;
if (screensaver_is_running_dbus (scr) != FALSE)
screensaver_enable_dbus (scr);
else
if (screensaver_is_running_dbus (scr) != FALSE)
screensaver_enable_dbus (scr);
else
+#ifdef GDK_WINDOWING_X11
screensaver_enable_x11 (scr);
screensaver_enable_x11 (scr);
+#else
+#warning Unimplemented
+ {}
+#endif
TotemScrsaver *scr = TOTEM_SCRSAVER (object);
screensaver_finalize_dbus (scr);
TotemScrsaver *scr = TOTEM_SCRSAVER (object);
screensaver_finalize_dbus (scr);
+#ifdef GDK_WINDOWING_X11
screensaver_finalize_x11 (scr);
screensaver_finalize_x11 (scr);
+#else
+#warning Unimplemented
+ {}
+#endif