Fixed wrong translation.

[evince.git] / cut-n-paste / totem-screensaver / totem-scrsaver.c

diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c
index 18c94317c79ac6dd0da59bc0c3dd4a934bb169ad..392443043443c69b23d63ac3226ea26c24631529 100644 (file)
--- a/cut-n-paste/totem-screensaver/totem-scrsaver.c
+++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c
@@ -188,13 +188,16 @@ gs_proxy_destroy_cb (GObject *proxy,
 }
 #endif
 
 }
 #endif
 

+#ifdef ENABLE_DBUS

 static void
 static void

-screensaver_init_dbus (TotemScrsaver *scr)
+screensaver_init_dbus (TotemScrsaver *scr, DBusGConnection *connection)

 {
 {

-#ifdef ENABLE_DBUS

        GError *error = NULL;
 
        GError *error = NULL;
 

-       scr->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+       if (!connection)
+               scr->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+       else
+               scr->priv->connection = connection;

 
        if (! scr->priv->connection) {
                if (error) {
 
        if (! scr->priv->connection) {
                if (error) {


@@ -218,8 +221,8 @@ screensaver_init_dbus (TotemScrsaver *scr)
 
        }
 
 
        }
 

-#endif /* ENABLE_DBUS */

 }
 }

+#endif /* ENABLE_DBUS */

 
 static void
 screensaver_finalize_dbus (TotemScrsaver *scr)
 
 static void
 screensaver_finalize_dbus (TotemScrsaver *scr)


@@ -291,11 +294,21 @@ screensaver_disable_x11 (TotemScrsaver *scr)
 
                if (scr->priv->timeout != 0)
                {
 
                if (scr->priv->timeout != 0)
                {

+#if GLIB_CHECK_VERSION (2, 13, 0)
+                       g_timeout_add_seconds (scr->priv->timeout / 2,
+                                              (GSourceFunc) fake_event, scr);
+#else

                        g_timeout_add (scr->priv->timeout / 2 * 1000,
                        g_timeout_add (scr->priv->timeout / 2 * 1000,

-                                       (GSourceFunc) fake_event, scr);
+                                      (GSourceFunc) fake_event, scr);
+#endif

                } else {
                } else {

-                       g_timeout_add (XSCREENSAVER_MIN_TIMEOUT / 2 * 1000,
+#if GLIB_CHECK_VERSION (2, 13, 0)
+                       g_timeout_add_seconds (XSCREENSAVER_MIN_TIMEOUT / 2,

                                        (GSourceFunc) fake_event, scr);
                                        (GSourceFunc) fake_event, scr);

+#else
+                       g_timeout_add (XSCREENSAVER_MIN_TIMEOUT / 2 * 1000,
+                                      (GSourceFunc) fake_event, scr);
+#endif

                }
 
                return;
                }
 
                return;


@@ -355,19 +368,35 @@ totem_scrsaver_class_init (TotemScrsaverClass *klass)
        object_class->finalize = totem_scrsaver_finalize;
 }
 
        object_class->finalize = totem_scrsaver_finalize;
 }
 

+#ifdef ENABLE_DBUS

 TotemScrsaver *
 TotemScrsaver *

-totem_scrsaver_new (void)
+totem_scrsaver_new     (DBusGConnection *connection)

 {
 {

-       return TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
+       TotemScrsaver * scr;
+       scr = TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
+
+       screensaver_init_dbus (scr, connection);
+       screensaver_init_x11 (scr);
+       
+       return scr;

 }
 }

+#else
+TotemScrsaver *
+totem_scrsaver_new()
+{
+       TotemScrsaver * scr;
+       scr = TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
+
+       screensaver_init_x11 (scr);
+       
+       return scr;
+}
+#endif

 
 static void
 totem_scrsaver_init (TotemScrsaver *scr)
 {
        scr->priv = g_new0 (TotemScrsaverPrivate, 1);
 
 static void
 totem_scrsaver_init (TotemScrsaver *scr)
 {
        scr->priv = g_new0 (TotemScrsaverPrivate, 1);

-
-       screensaver_init_dbus (scr);
-       screensaver_init_x11 (scr);

 }
 
 void
 }
 
 void