diff options
Diffstat (limited to 'cut-n-paste/totem-screensaver')
| -rw-r--r-- | cut-n-paste/totem-screensaver/totem-scrsaver.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c index e08b6a86..969b426c 100644 --- a/cut-n-paste/totem-screensaver/totem-scrsaver.c +++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c @@ -61,7 +61,7 @@ struct TotemScrsaverPrivate { char *reason; GDBusProxy *gs_proxy; - gboolean have_screensaver_dbus; + gboolean have_screensaver_dbus; guint32 cookie; gboolean old_dbus_api; @@ -82,7 +82,7 @@ G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT) static gboolean screensaver_is_running_dbus (TotemScrsaver *scr) { - return scr->priv->have_screensaver_dbus; + return scr->priv->have_screensaver_dbus; } static void @@ -168,10 +168,10 @@ static void screensaver_inhibit_dbus (TotemScrsaver *scr, gboolean inhibit) { - TotemScrsaverPrivate *priv = scr->priv; + TotemScrsaverPrivate *priv = scr->priv; - if (!priv->have_screensaver_dbus) - return; + if (!priv->have_screensaver_dbus) + return; scr->priv->old_dbus_api = FALSE; @@ -214,7 +214,7 @@ screensaver_disable_dbus (TotemScrsaver *scr) static void screensaver_update_dbus_presence (TotemScrsaver *scr) { - TotemScrsaverPrivate *priv = scr->priv; + TotemScrsaverPrivate *priv = scr->priv; gchar *name_owner; name_owner = g_dbus_proxy_get_name_owner (priv->gs_proxy); @@ -231,7 +231,7 @@ screensaver_dbus_owner_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data) { - TotemScrsaver *scr = TOTEM_SCRSAVER (user_data); + TotemScrsaver *scr = TOTEM_SCRSAVER (user_data); screensaver_update_dbus_presence (scr); } @@ -258,7 +258,7 @@ screensaver_dbus_proxy_new_cb (GObject *source, static void screensaver_init_dbus (TotemScrsaver *scr) { - g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, + g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, GS_SERVICE, @@ -282,6 +282,7 @@ static void screensaver_enable_x11 (TotemScrsaver *scr) { Display *display; + #ifdef HAVE_XTEST if (scr->priv->have_xtest != FALSE) { @@ -290,7 +291,7 @@ screensaver_enable_x11 (TotemScrsaver *scr) } #endif /* HAVE_XTEST */ - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default()); + display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); XLockDisplay (display); XSetScreenSaver (display, scr->priv->timeout, @@ -308,7 +309,7 @@ fake_event (TotemScrsaver *scr) { Display *display; - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default()); + display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); XLockDisplay (display); XTestFakeKeyEvent (display, *scr->priv->keycode, True, CurrentTime); @@ -331,7 +332,7 @@ screensaver_disable_x11 (TotemScrsaver *scr) { Display *display; - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default()); + display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); #ifdef HAVE_XTEST if (scr->priv->have_xtest != FALSE) @@ -372,7 +373,7 @@ screensaver_init_x11 (TotemScrsaver *scr) int a, b, c, d; Display *display; - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default()); + display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); XLockDisplay (display); scr->priv->have_xtest = (XTestQueryExtension (display, &a, &b, &c, &d) == True); @@ -380,13 +381,13 @@ screensaver_init_x11 (TotemScrsaver *scr) { scr->priv->keycode1 = XKeysymToKeycode (display, XK_Alt_L); if (scr->priv->keycode1 == 0) { - g_warning ("scr->priv->keycode1 not existant"); + g_warning ("scr->priv->keycode1 not existent"); } scr->priv->keycode2 = XKeysymToKeycode (display, XK_Alt_R); if (scr->priv->keycode2 == 0) { scr->priv->keycode2 = XKeysymToKeycode (display, XK_Alt_L); if (scr->priv->keycode2 == 0) { - g_warning ("scr->priv->keycode2 not existant"); + g_warning ("scr->priv->keycode2 not existent"); } } scr->priv->keycode = &scr->priv->keycode1; @@ -562,5 +563,5 @@ totem_scrsaver_finalize (GObject *object) {} #endif - G_OBJECT_CLASS (totem_scrsaver_parent_class)->finalize (object); + G_OBJECT_CLASS (totem_scrsaver_parent_class)->finalize (object); } |