From 4493cb7b61b537de1b3ff86d73446d128375e1a0 Mon Sep 17 00:00:00 2001
From: fcrozat <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
Date: Tue, 8 Mar 2005 16:22:35 +0000
Subject: Connect to X so s2u exits when X exit

git-svn-id: svn+ssh://svn.mandriva.com/svn/soft/s2u/trunk@179808 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94
---
 Makefile | 4 ++--
 s2u.c    | 4 +++-
 s2u.spec | 6 +++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 951e182..5002c69 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ FILES = Makefile README hostname-post s2u.c s2u.sh s2u.spec \
 DEFS = -DDBUS_API_SUBJECT_TO_CHANGE=1
 CC = gcc
 CFLAGS = -O2 -pipe -Wall -Werror
-INCLUDES = $(shell pkg-config dbus-glib-1 --cflags)
-LDFLAGS =  $(shell pkg-config dbus-glib-1 --libs)
+INCLUDES = $(shell pkg-config dbus-glib-1 gdk-2.0 --cflags)
+LDFLAGS =  $(shell pkg-config dbus-glib-1 gdk-2.0 --libs)
 
 COMPILE = $(CC) $(DEFS) $(CFLAGS)
 
diff --git a/s2u.c b/s2u.c
index 82a0f6c..547b8f9 100644
--- a/s2u.c
+++ b/s2u.c
@@ -50,6 +50,7 @@ static const char compile_id[] = "$Compile: " __FILE__ " " __DATE__ " " __TIME__
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
+#include <gdk/gdk.h>
 
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
@@ -299,7 +300,7 @@ main (int argc, char *argv[])
 
 	}
 
-	g_type_init ();
+	gdk_init(&argc, &argv);
 
 	loop = g_main_loop_new (NULL, FALSE);
 
@@ -307,6 +308,7 @@ main (int argc, char *argv[])
 	service_dbus_init ();
 
 	/* run the main loop and serve clients */
+
 	g_main_loop_run (loop);
 
 	return 0;
diff --git a/s2u.spec b/s2u.spec
index 8b082a2..8f27360 100644
--- a/s2u.spec
+++ b/s2u.spec
@@ -1,13 +1,14 @@
 Summary: System to user tools
 Name: s2u
 Version: 0.5
-Release: 1mdk
+Release: 2mdk
 URL: http://www.mandrakelinux.com/
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: Graphical desktop/Other
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: dbus-devel
+BuildRequires: gtk+2-devel
 Requires: dbus-x11 dbus
 Requires: initscripts >= 7.06-52mdk
 
@@ -38,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 # MAKE THE CHANGES IN CVS: NO PATCH OR SOURCE ALLOWED
 
 %changelog
+* Tue Mar 08 2005 Frederic Crozat <fcrozat@mandrakesoft.com> 0.5-2mdk 
+- connect to X server, so s2u exits when X exits
+
 * Mon Mar 07 2005 Frederic Crozat <fcrozat@mandrakesoft.com> 0.5-1mdk 
 - Release 0.5 :
  no longer use session bus, use system bus instead (fix Mdk bug #13166)
-- 
cgit v1.2.1