From 8ac50cf59cc976bd26bcb5575a4443d0319463ba Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Date: Sun, 03 Dec 2006 20:54:44 +0000
Subject: Move screensaver handling to application. No more message on startup.

2006-12-03  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>

	* cut-n-paste/totem-screensaver/totem-scrsaver.c:
	(screensaver_init_dbus), (totem_scrsaver_new),
	(totem_scrsaver_init):
	* cut-n-paste/totem-screensaver/totem-scrsaver.h:
	* shell/ev-application.c: (ev_application_register_service),
	(ev_application_screensaver_enable),
	(ev_application_screensaver_disable):
	* shell/ev-application.h:
	* shell/ev-window.c: (ev_window_run_presentation),
	(ev_window_stop_presentation), (build_comments_string),
	(ev_window_init):

	Move screensaver handling to application. No more
	message on startup.
---
(limited to 'cut-n-paste')

diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c
index 18c9431..1990b0c 100644
--- 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
 
+#ifdef ENABLE_DBUS
 static void
-screensaver_init_dbus (TotemScrsaver *scr)
+screensaver_init_dbus (TotemScrsaver *scr, DBusGConnection *connection)
 {
-#ifdef ENABLE_DBUS
 	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) {
@@ -218,8 +221,8 @@ screensaver_init_dbus (TotemScrsaver *scr)
 
 	}
 
-#endif /* ENABLE_DBUS */
 }
+#endif /* ENABLE_DBUS */
 
 static void
 screensaver_finalize_dbus (TotemScrsaver *scr)
@@ -355,19 +358,35 @@ totem_scrsaver_class_init (TotemScrsaverClass *klass)
 	object_class->finalize = totem_scrsaver_finalize;
 }
 
+#ifdef ENABLE_DBUS
+TotemScrsaver *
+totem_scrsaver_new	(DBusGConnection *connection)
+{
+	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 (void)
+totem_scrsaver_new()
 {
-	return TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
+	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);
-
-	screensaver_init_dbus (scr);
-	screensaver_init_x11 (scr);
 }
 
 void
diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.h b/cut-n-paste/totem-screensaver/totem-scrsaver.h
index f34fb15..e84299a 100644
--- a/cut-n-paste/totem-screensaver/totem-scrsaver.h
+++ b/cut-n-paste/totem-screensaver/totem-scrsaver.h
@@ -22,6 +22,10 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#ifdef ENABLE_DBUS
+#include <dbus/dbus-glib.h>
+#endif
+
 #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))
@@ -43,7 +47,11 @@ struct TotemScrsaverClass {
 };
 
 GType totem_scrsaver_get_type		(void);
-TotemScrsaver *totem_scrsaver_new	(void);
+#ifdef ENABLE_DBUS
+TotemScrsaver *totem_scrsaver_new	(DBusGConnection *connection);
+#else
+TotemScrsaver *totem_scrsaver_new	();
+#endif
 void totem_scrsaver_enable		(TotemScrsaver *scr);
 void totem_scrsaver_disable		(TotemScrsaver *scr);
 
--
cgit v0.9.1