diff options
| author | fcrozat <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94> | 2005-03-08 16:22:35 +0000 |
|---|---|---|
| committer | fcrozat <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94> | 2005-03-08 16:22:35 +0000 |
| commit | 4493cb7b61b537de1b3ff86d73446d128375e1a0 (patch) | |
| tree | a875456ddbc99a8b779a48873d487f72a6c86bd9 | |
| parent | 9c77b02c0eca1827fa79e46b58732cb38b2572bc (diff) | |
| download | s2u-4493cb7b61b537de1b3ff86d73446d128375e1a0.tar s2u-4493cb7b61b537de1b3ff86d73446d128375e1a0.tar.gz s2u-4493cb7b61b537de1b3ff86d73446d128375e1a0.tar.bz2 s2u-4493cb7b61b537de1b3ff86d73446d128375e1a0.tar.xz s2u-4493cb7b61b537de1b3ff86d73446d128375e1a0.zip | |
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
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | s2u.c | 4 | ||||
| -rw-r--r-- | s2u.spec | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -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) @@ -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; @@ -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) |