From 004ef7509ae2f057316ee8fb1d8d8feeca2688cd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 4 Feb 2010 23:13:08 -0500 Subject: [PATCH 08/22] Introduce Inhibitors This introduces the Inhibitor interface. --- doc/dbus/ConsoleKit.xml.in | 2 ++ doc/dbus/Makefile.am | 3 +++ src/Makefile.am | 6 ++++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/doc/dbus/ConsoleKit.xml.in b/doc/dbus/ConsoleKit.xml.in index 3ce7aec..9cac3e4 100644 --- a/doc/dbus/ConsoleKit.xml.in +++ b/doc/dbus/ConsoleKit.xml.in @@ -3,6 +3,7 @@ + @@ -62,6 +63,7 @@ &dbus-Manager; &dbus-Seat; &dbus-Session; + &dbus-Inhibitor; diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am index 4f8f3e7..6758fb5 100644 --- a/doc/dbus/Makefile.am +++ b/doc/dbus/Makefile.am @@ -8,6 +8,7 @@ SPEC_XML_FILES = \ org.freedesktop.ConsoleKit.Manager.ref.xml \ org.freedesktop.ConsoleKit.Seat.ref.xml \ org.freedesktop.ConsoleKit.Session.ref.xml \ + org.freedesktop.ConsoleKit.Inhibitor.ref.xml \ $(NULL) if DOCBOOK_DOCS_ENABLED @@ -26,6 +27,8 @@ org.freedesktop.ConsoleKit.Seat.ref.xml : $(top_srcdir)/src/org.freedesktop.Cons $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@ org.freedesktop.ConsoleKit.Session.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Session.xml spec-to-docbook.xsl $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@ +org.freedesktop.ConsoleKit.Inhibitor.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Inhibitor.xml spec-to-docbook.xsl + $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@ EXTRA_DIST = \ spec-to-docbook.xsl \ diff --git a/src/Makefile.am b/src/Makefile.am index 6ab05c8..b83b9e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -71,6 +71,7 @@ BUILT_SOURCES = \ ck-manager-glue.h \ ck-seat-glue.h \ ck-session-glue.h \ + ck-inhibitor-glue.h \ ck-marshal.c \ ck-marshal.h \ $(NULL) @@ -80,6 +81,7 @@ dbusif_DATA = \ org.freedesktop.ConsoleKit.Manager.xml \ org.freedesktop.ConsoleKit.Seat.xml \ org.freedesktop.ConsoleKit.Session.xml \ + org.freedesktop.ConsoleKit.Inhibitor.xml \ $(NULL) ck-manager-glue.h: org.freedesktop.ConsoleKit.Manager.xml Makefile.am @@ -88,6 +90,8 @@ ck-seat-glue.h: org.freedesktop.ConsoleKit.Seat.xml Makefile.am dbus-binding-tool --prefix=ck_seat --mode=glib-server --output=ck-seat-glue.h org.freedesktop.ConsoleKit.Seat.xml ck-session-glue.h: org.freedesktop.ConsoleKit.Session.xml Makefile.am dbus-binding-tool --prefix=ck_session --mode=glib-server --output=ck-session-glue.h org.freedesktop.ConsoleKit.Session.xml +ck-inhibitor-glue.h: org.freedesktop.ConsoleKit.Inhibitor.xml Makefile.am + dbus-binding-tool --prefix=ck_inhibitor --mode=glib-server --output=ck-inhibitor-glue.h org.freedesktop.ConsoleKit.Inhibitor.xml ck-marshal.c: ck-marshal.list echo "#include \"ck-marshal.h\"" > $@ && \ @@ -119,6 +123,8 @@ console_kit_daemon_SOURCES = \ ck-run-programs.h \ ck-event-logger.c \ ck-event-logger.h \ + ck-inhibitor.c \ + ck-inhibitor.h \ $(BUILT_SOURCES) \ $(NULL) -- 1.6.6