Move the tlm dbus interface under org.01 86/35586/1 accepted/tizen_3.0.2014.q4_common tizen_3.0.2014.q4_common accepted/tizen/3.0.2014.q4/common/20150224.150704 accepted/tizen/common/20150219.145143 accepted/tizen/mobile/20150220.131617 accepted/tizen/tv/20150220.125522 accepted/tizen/wearable/20150220.130102 submit/tizen/20150219.115409 submit/tizen_3.0.2014.q4_common/20150224.000000
authorImran Zaman <imran.zaman@intel.com>
Wed, 18 Feb 2015 14:54:10 +0000 (16:54 +0200)
committerImran Zaman <imran.zaman@intel.com>
Wed, 18 Feb 2015 14:55:10 +0000 (16:55 +0200)
tlm-launcher is used to launch session scripts

Change-Id: If8c165b3d1a3e5b08288deb532cb6905325c33c0
Signed-off-by: Imran Zaman <imran.zaman@intel.com>
88 files changed:
data/tizen-ivi/etc/session.d/user-session
data/tizen-ivi/etc/session.d/user-session-ico
data/tizen-ivi/etc/session.d/user-session-ico-launch-script [new file with mode: 0644]
data/tizen-ivi/etc/session.d/user-session-ico-weston [new file with mode: 0644]
data/tizen-ivi/etc/session.d/user-session-launch-script [new file with mode: 0644]
data/tizen-ivi/etc/session.d/user-session-modello
data/tizen-ivi/etc/session.d/user-session-modello-launch-script [new file with mode: 0644]
data/tizen-ivi/etc/session.d/user-session-modello-weston [new file with mode: 0644]
data/tizen-ivi/etc/session.d/user-session-weston [new file with mode: 0644]
data/tlm.conf.in
data/tlm.service
dists/rpm/tizen/packaging/tlm.changes
dists/rpm/tizen/packaging/tlm.spec
docs/Makefile.am
docs/Makefile.in
docs/html/TlmAccountPlugin.html
docs/html/TlmAccountPluginDefault.html
docs/html/TlmAccountPluginGumd.html
docs/html/TlmAuthPlugin.html
docs/html/TlmAuthPluginDefault.html
docs/html/TlmConfig.html
docs/html/api-index-full.html
docs/html/ch01.html
docs/html/ch02.html
docs/html/ch03.html
docs/html/ch05.html
docs/html/deprecated-api-index.html
docs/html/gdbus-org.O1.Tlm.Login.html [moved from docs/html/gdbus-org.tizen.Tlm.Login.html with 76% similarity]
docs/html/index.html
docs/html/index.sgml
docs/html/object-tree.html
docs/html/tlm-Errors.html
docs/html/tlm-General-configuration.html
docs/html/tlm-Seat-configuration.html
docs/html/tlm-intro.html
docs/html/tlm-tlm-log.html
docs/html/tlm.devhelp2
docs/introduction.xml
docs/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml [moved from docs/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml with 71% similarity]
docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml [new file with mode: 0644]
docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml [deleted file]
docs/tlm-docs.sgml
packaging/tlm.changes
packaging/tlm.spec
src/common/dbus/Makefile.am
src/common/dbus/Makefile.in
src/common/dbus/interfaces/org.O1.Tlm.Login.xml [moved from src/common/dbus/interfaces/org.tizen.Tlm.Login.xml with 96% similarity]
src/common/dbus/interfaces/org.O1.Tlm.Session.xml [moved from src/common/dbus/interfaces/org.tizen.Tlm.Session.xml with 95% similarity]
src/common/dbus/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml [moved from src/common/dbus/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml with 71% similarity]
src/common/dbus/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml [new file with mode: 0644]
src/common/dbus/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml [deleted file]
src/common/dbus/tlm-dbus-utils.c
src/common/dbus/tlm-dbus-utils.h
src/common/dbus/tlm-dbus.h
src/common/tlm-account-plugin.c
src/common/tlm-account-plugin.h
src/common/tlm-auth-plugin.c
src/common/tlm-auth-plugin.h
src/common/tlm-error.c
src/common/tlm-error.h
src/common/tlm-log.c
src/common/tlm-log.h
src/common/tlm-utils.c
src/common/tlm-utils.h
src/daemon/tlm-dbus-observer.c
src/daemon/tlm-dbus-observer.h
src/daemon/tlm-main.c
src/daemon/tlm-manager.c
src/daemon/tlm-manager.h
src/daemon/tlm-seat.c
src/daemon/tlm-seat.h
src/daemon/tlm-types.h
src/daemon/tlm.pc.in
src/plugins/default/tlm-account-plugin-default.c
src/plugins/default/tlm-account-plugin-default.h
src/plugins/default/tlm-auth-plugin-default.c
src/plugins/default/tlm-auth-plugin-default.h
src/plugins/gumd/tlm-plugin-gumd.c
src/plugins/gumd/tlm-plugin-gumd.h
src/plugins/nfc/tlm-auth-plugin-nfc.c
src/plugins/nfc/tlm-auth-plugin-nfc.h
src/sessiond/tlm-auth-session.c
src/sessiond/tlm-auth-session.h
src/sessiond/tlm-session.c
src/sessiond/tlm-session.h
src/utils/tlm-client.c
src/utils/tlm-launcher.c
tests/daemon/daemon-test.c

index 0ee5761..6550e0b 100755 (executable)
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
 export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
-export WAYLAND_CLIENT_DIR=/tmp
-export WESTON_CONFIG=/etc/xdg/weston/weston-user.ini
-weston -i0 --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so
+tlm-launcher -f /etc/session.d/user-session-launch-script
+
index 3232ff4..e461b98 100755 (executable)
@@ -1,6 +1,4 @@
 #!/bin/sh
 #
 export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
-export WAYLAND_CLIENT_DIR=/tmp
-export WESTON_CONFIG=/etc/xdg/weston/weston.ini
-weston -i0 --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so
+tlm-launcher -f /etc/session.d/user-session-ico-launch-script
diff --git a/data/tizen-ivi/etc/session.d/user-session-ico-launch-script b/data/tizen-ivi/etc/session.d/user-session-ico-launch-script
new file mode 100644 (file)
index 0000000..2c2a00c
--- /dev/null
@@ -0,0 +1,3 @@
+M:/etc/session.d/user-session-ico-weston
+W:$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY.lock
+#L:app_launcher -s Modello005.Homescreen
diff --git a/data/tizen-ivi/etc/session.d/user-session-ico-weston b/data/tizen-ivi/etc/session.d/user-session-ico-weston
new file mode 100644 (file)
index 0000000..c181524
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+export WAYLAND_CLIENT_DIR=/tmp
+export WESTON_CONFIG=/etc/xdg/weston/weston.ini
+weston -i0 --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so
diff --git a/data/tizen-ivi/etc/session.d/user-session-launch-script b/data/tizen-ivi/etc/session.d/user-session-launch-script
new file mode 100644 (file)
index 0000000..5b71085
--- /dev/null
@@ -0,0 +1,3 @@
+M:/etc/session.d/user-session-weston
+#W:$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY.lock
+#L:app_launcher -s Modello005.Homescreen
index 8ca4b71..b6df51b 100755 (executable)
@@ -1,8 +1,4 @@
 #!/bin/sh
 #
 export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
-export WAYLAND_CLIENT_DIR=/tmp
-export WESTON_CONFIG=/etc/xdg/weston/weston-user-modello.ini
-#weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so --width=720 --height=1080 &
-weston -i0 --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so &
-xwalk-launcher Modello005.Homescreen
+tlm-launcher -f /etc/session.d/user-session-modello-launch-script
diff --git a/data/tizen-ivi/etc/session.d/user-session-modello-launch-script b/data/tizen-ivi/etc/session.d/user-session-modello-launch-script
new file mode 100644 (file)
index 0000000..40ee283
--- /dev/null
@@ -0,0 +1,3 @@
+M:/etc/session.d/user-session-modello-weston
+W:$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY.lock
+L:app_launcher -s Modello005.Homescreen
diff --git a/data/tizen-ivi/etc/session.d/user-session-modello-weston b/data/tizen-ivi/etc/session.d/user-session-modello-weston
new file mode 100644 (file)
index 0000000..8be7e6a
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+export WAYLAND_CLIENT_DIR=/tmp
+export WESTON_CONFIG=/etc/xdg/weston/weston-user-modello.ini
+weston -i0 --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so
diff --git a/data/tizen-ivi/etc/session.d/user-session-weston b/data/tizen-ivi/etc/session.d/user-session-weston
new file mode 100644 (file)
index 0000000..7529568
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+export WAYLAND_CLIENT_DIR=/tmp
+export WESTON_CONFIG=/etc/xdg/weston/weston-user.ini
+weston -i0 --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so
index b33e0e4..65fd1ed 100644 (file)
@@ -64,7 +64,6 @@ SESSION_TYPE=wayland
 # Seat specific settings where the group name is seat id
 [seat0]
 DEFAULT_USER=app
-#DEFAULT_USER=tizen
 #SETUP_TERMINAL=1
 #VTNR=7
 #SESSION_CMD=weston-launch
index 2193437..2a08f59 100644 (file)
@@ -1,5 +1,5 @@
 [Unit]
-Description=Tizen Login Manager
+Description=Tiny Login Manager
 After=systemd-user-sessions.service systemd-logind.service
 Requires=dbus.socket
 
index 165a00c..6e920ee 100644 (file)
@@ -1,3 +1,7 @@
+* Tue Feb 18 2015 Imran Zaman <imran.zaman@intel.com>
+- Move the tlm dbus interface under org.01
+- tlm-launcher is used to launch session scripts
+
 * Tue Dec 23 2014 Imran Zaman <imran.zaman@intel.com>
 - Added config package for modello
 
index a2e4fad..ea4318b 100644 (file)
@@ -73,7 +73,7 @@ Requires:   %{name} = %{version}-%{release}
 Provides:   %{name}-config
 
 %description config-common
-Tizen Login Manager configuration files for common-profile.
+Tiny Login Manager configuration files for common-profile.
 
 %else
 
@@ -88,7 +88,7 @@ Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
 Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-singleseat
-Generic Tizen Login Manager configuration files for ivi-profile with
+Generic Tiny Login Manager configuration files for ivi-profile with
 single seat.
 
 
@@ -104,7 +104,7 @@ Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
 Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-singleseat-modello
-Generic Tizen Login Manager configuration files for ivi-profile with
+Generic Tiny Login Manager configuration files for ivi-profile with
 single seat for modello.
 
 
@@ -118,7 +118,7 @@ Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
 Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
 
 %description config-ivi-singleseat-ico
-Generic Tizen Login Manager configuration files for ivi-profile with
+Generic Tiny Login Manager configuration files for ivi-profile with
 single seat for ico.
 
 
@@ -133,7 +133,7 @@ Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-vtc1010
 Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-multiseat
-Generic Tizen Login Manager configuration files for ivi-profile with
+Generic Tiny Login Manager configuration files for ivi-profile with
 multi seat.
 
 
@@ -148,7 +148,7 @@ Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-multiseat
 Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-vtc1010
-Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.
+Tiny Login Manager configuration files for ivi-profile on VTC-1010 hardware.
 
 %endif
 
@@ -365,6 +365,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-singleseat.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
@@ -376,6 +378,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-singleseat-modello.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-modello
 %config(noreplace) %{_sysconfdir}/session.d/user-session-modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-modello.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user-modello.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
@@ -387,6 +391,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-singleseat-ico.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
@@ -398,6 +404,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-multiseat.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-multiseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
@@ -409,6 +417,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-vtc1010.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-vtc1010
 %config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
index 82aa0f8..c643d6b 100644 (file)
@@ -77,8 +77,8 @@ HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files=introduction.xml \
-tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml \
-tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
+tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml \
+tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
index e6a06ad..6004480 100644 (file)
@@ -540,8 +540,8 @@ HTML_IMAGES =
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files = introduction.xml \
-tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml \
-tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
+tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml \
+tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
 
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
index 725a30e..49dc2af 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: TlmAccountPlugin</title>
+<title>Tiny Login Manager Reference Manual: TlmAccountPlugin</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch02.html" title="Tlm plugins reference">
 <link rel="prev" href="ch02.html" title="Tlm plugins reference">
 <link rel="next" href="TlmAccountPluginDefault.html" title="TlmAccountPluginDefault">
index ddb9530..e9bcaa2 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: TlmAccountPluginDefault</title>
+<title>Tiny Login Manager Reference Manual: TlmAccountPluginDefault</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch02.html" title="Tlm plugins reference">
 <link rel="prev" href="TlmAccountPlugin.html" title="TlmAccountPlugin">
 <link rel="next" href="TlmAccountPluginGumd.html" title="TlmAccountPluginGumd">
index db18f99..a31a062 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: TlmAccountPluginGumd</title>
+<title>Tiny Login Manager Reference Manual: TlmAccountPluginGumd</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch02.html" title="Tlm plugins reference">
 <link rel="prev" href="TlmAccountPluginDefault.html" title="TlmAccountPluginDefault">
 <link rel="next" href="TlmAuthPlugin.html" title="TlmAuthPlugin">
index 73df050..e6b73ae 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: TlmAuthPlugin</title>
+<title>Tiny Login Manager Reference Manual: TlmAuthPlugin</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch02.html" title="Tlm plugins reference">
 <link rel="prev" href="TlmAccountPluginGumd.html" title="TlmAccountPluginGumd">
 <link rel="next" href="TlmAuthPluginDefault.html" title="TlmAuthPluginDefault">
index da16f6d..70044b5 100644 (file)
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: TlmAuthPluginDefault</title>
+<title>Tiny Login Manager Reference Manual: TlmAuthPluginDefault</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch02.html" title="Tlm plugins reference">
 <link rel="prev" href="TlmAuthPlugin.html" title="TlmAuthPlugin">
-<link rel="next" href="tlm-Seat-configuration.html" title="Seat configuration">
+<link rel="next" href="ch03.html" title="Tlm miscellaneous">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,7 +21,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="TlmAuthPlugin.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="tlm-Seat-configuration.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="ch03.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="TlmAuthPluginDefault"></a><div class="titlepage"></div>
index 1ce8aa7..63a6c14 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: TlmConfig</title>
+<title>Tiny Login Manager Reference Manual: TlmConfig</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch01.html" title="Introduction">
 <link rel="prev" href="tlm-intro.html" title="Introduction">
 <link rel="next" href="tlm-General-configuration.html" title="General configuration">
index dd1983b..1b89ed1 100644 (file)
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: API Index</title>
+<title>Tiny Login Manager Reference Manual: API Index</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="up" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="up" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="prev" href="ch05.html" title="">
 <link rel="next" href="deprecated-api-index.html" title="Index of deprecated API">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
index a5790c4..390fe81 100644 (file)
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Introduction</title>
+<title>Tiny Login Manager Reference Manual: Introduction</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="up" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="prev" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="up" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="prev" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="next" href="tlm-intro.html" title="Introduction">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <span class="refentrytitle"><a href="tlm-General-configuration.html">General configuration</a></span><span class="refpurpose"> — tlm general configuration keys</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="gdbus-org.tizen.Tlm.Login.html">org.tizen.Tlm.Login</a></span><span class="refpurpose"> — a D-Bus interface to TLM</span>
+<span class="refentrytitle"><a href="tlm-Seat-configuration.html">Seat configuration</a></span><span class="refpurpose"> — Seat specific configuration</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="gdbus-org.O1.Tlm.Login.html">org.O1.Tlm.Login</a></span><span class="refpurpose"> — a D-Bus interface to TLM</span>
 </dt>
 </dl></div>
 </div>
index 6a23590..e6766fe 100644 (file)
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Tlm plugins reference</title>
+<title>Tiny Login Manager Reference Manual: Tlm plugins reference</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="up" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="prev" href="gdbus-org.tizen.Tlm.Login.html" title="org.tizen.Tlm.Login">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="up" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="prev" href="gdbus-org.O1.Tlm.Login.html" title="org.O1.Tlm.Login">
 <link rel="next" href="TlmAccountPlugin.html" title="TlmAccountPlugin">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
-<td><a accesskey="p" href="gdbus-org.tizen.Tlm.Login.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="gdbus-org.O1.Tlm.Login.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="TlmAccountPlugin.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
@@ -38,9 +38,6 @@
 <dt>
 <span class="refentrytitle"><a href="TlmAuthPluginDefault.html">TlmAuthPluginDefault</a></span><span class="refpurpose"> — an default authentication plugin</span>
 </dt>
-<dt>
-<span class="refentrytitle"><a href="tlm-Seat-configuration.html">Seat configuration</a></span><span class="refpurpose"> — Seat specific configuration</span>
-</dt>
 </dl></div>
 </div>
 <div class="footer">
index 68b41e2..3fa5f75 100644 (file)
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Tlm miscellaneous</title>
+<title>Tiny Login Manager Reference Manual: Tlm miscellaneous</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="up" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="prev" href="tlm-Seat-configuration.html" title="Seat configuration">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="up" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="prev" href="TlmAuthPluginDefault.html" title="TlmAuthPluginDefault">
 <link rel="next" href="tlm-tlm-log.html" title="tlm-log">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
-<td><a accesskey="p" href="tlm-Seat-configuration.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="TlmAuthPluginDefault.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="tlm-tlm-log.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
index dca846b..b885ef1 100644 (file)
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: </title>
+<title>Tiny Login Manager Reference Manual: </title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="up" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="up" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="api-index-full.html" title="API Index">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
index 9a98cbd..2b3032f 100644 (file)
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Index of deprecated API</title>
+<title>Tiny Login Manager Reference Manual: Index of deprecated API</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="up" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="up" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
similarity index 76%
rename from docs/html/gdbus-org.tizen.Tlm.Login.html
rename to docs/html/gdbus-org.O1.Tlm.Login.html
index 44b03d4..2b641e3 100644 (file)
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: org.tizen.Tlm.Login</title>
+<title>Tiny Login Manager Reference Manual: org.O1.Tlm.Login</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch01.html" title="Introduction">
-<link rel="prev" href="tlm-General-configuration.html" title="General configuration">
+<link rel="prev" href="tlm-Seat-configuration.html" title="Seat configuration">
 <link rel="next" href="ch02.html" title="Tlm plugins reference">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#gdbus-org.tizen.Tlm.Login.description" class="shortcut">Description</a></span>
+                  <a href="#gdbus-org.O1.Tlm.Login.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="tlm-General-configuration.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="tlm-Seat-configuration.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="ch02.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
-<a name="gdbus-org.tizen.Tlm.Login"></a><div class="titlepage"></div>
+<a name="gdbus-org.O1.Tlm.Login"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
-<h2><span class="refentrytitle"><a name="gdbus-interface-org-tizen-Tlm-Login.top_of_page"></a>org.tizen.Tlm.Login</span></h2>
-<p>org.tizen.Tlm.Login — a D-Bus interface to TLM</p>
+<h2><span class="refentrytitle"><a name="gdbus-interface-org-O1-Tlm-Login.top_of_page"></a>org.O1.Tlm.Login</span></h2>
+<p>org.O1.Tlm.Login — a D-Bus interface to TLM</p>
 </td>
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsynopsisdiv">
 <h2>Methods</h2>
 <pre class="synopsis">
-<a class="link" href="gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.loginUser" title="The loginUser() method">loginUser</a>  (IN  s     seat_id,
+<a class="link" href="gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.loginUser" title="The loginUser() method">loginUser</a>  (IN  s     seat_id,
             IN  s     username,
             IN  s     password,
             IN  a{ss} environ);
-<a class="link" href="gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.logoutUser" title="The logoutUser() method">logoutUser</a> (IN  s     seat_id);
-<a class="link" href="gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.switchUser" title="The switchUser() method">switchUser</a> (IN  s     seat_id,
+<a class="link" href="gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.logoutUser" title="The logoutUser() method">logoutUser</a> (IN  s     seat_id);
+<a class="link" href="gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.switchUser" title="The switchUser() method">switchUser</a> (IN  s     seat_id,
             IN  s     username,
             IN  s     password,
             IN  a{ss} environ);
 </pre>
 </div>
 <div class="refsect1">
-<a name="gdbus-interface-org-tizen-Tlm-Login"></a><h2>Description</h2>
+<a name="gdbus-interface-org-O1-Tlm-Login"></a><h2>Description</h2>
 <p>    Login objects can be used to login, logout and switch users. Login object
     with root access is exported at TLM_DBUS_ROOT_SOCKET_ADDRESS which can be
     used to login, logout and switch any user. TLM_DBUS_ROOT_SOCKET_ADDRESS can
@@ -59,9 +59,9 @@
 </p>
 </div>
 <div class="refsect1">
-<a name="gdbus-methods-org.tizen.Tlm.Login"></a><h2>Method Details</h2>
+<a name="gdbus-methods-org.O1.Tlm.Login"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-tizen-Tlm-Login.loginUser"></a><h3>The loginUser() method</h3>
+<a name="gdbus-method-org-O1-Tlm-Login.loginUser"></a><h3>The loginUser() method</h3>
 <pre class="programlisting">
 loginUser (IN  s     seat_id,
            IN  s     username,
@@ -98,7 +98,7 @@ loginUser (IN  s     seat_id,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-tizen-Tlm-Login.logoutUser"></a><h3>The logoutUser() method</h3>
+<a name="gdbus-method-org-O1-Tlm-Login.logoutUser"></a><h3>The logoutUser() method</h3>
 <pre class="programlisting">
 logoutUser (IN  s seat_id);
 </pre>
@@ -117,7 +117,7 @@ logoutUser (IN  s seat_id);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-tizen-Tlm-Login.switchUser"></a><h3>The switchUser() method</h3>
+<a name="gdbus-method-org-O1-Tlm-Login.switchUser"></a><h3>The switchUser() method</h3>
 <pre class="programlisting">
 switchUser (IN  s     seat_id,
             IN  s     username,
index e511a1a..7b81554 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Tizen Login Manager Reference Manual</title>
+<title>Tiny Login Manager Reference Manual: Tiny Login Manager Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="next" href="ch01.html" title="Introduction">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -13,7 +13,7 @@
 <div class="book">
 <div class="titlepage">
 <div>
-<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Tizen Login Manager Reference Manual</p></th></tr></table></div>
+<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Tiny Login Manager Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
       for tlm.
       The latest version of this documentation can be found on-line at
 <span class="refentrytitle"><a href="tlm-General-configuration.html">General configuration</a></span><span class="refpurpose"> — tlm general configuration keys</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="gdbus-org.tizen.Tlm.Login.html">org.tizen.Tlm.Login</a></span><span class="refpurpose"> — a D-Bus interface to TLM</span>
+<span class="refentrytitle"><a href="tlm-Seat-configuration.html">Seat configuration</a></span><span class="refpurpose"> — Seat specific configuration</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="gdbus-org.O1.Tlm.Login.html">org.O1.Tlm.Login</a></span><span class="refpurpose"> — a D-Bus interface to TLM</span>
 </dt>
 </dl></dd>
 <dt><span class="chapter"><a href="ch02.html">Tlm plugins reference</a></span></dt>
@@ -55,9 +58,6 @@
 <dt>
 <span class="refentrytitle"><a href="TlmAuthPluginDefault.html">TlmAuthPluginDefault</a></span><span class="refpurpose"> — an default authentication plugin</span>
 </dt>
-<dt>
-<span class="refentrytitle"><a href="tlm-Seat-configuration.html">Seat configuration</a></span><span class="refpurpose"> — Seat specific configuration</span>
-</dt>
 </dl></dd>
 <dt><span class="chapter"><a href="ch03.html">Tlm miscellaneous</a></span></dt>
 <dd><dl>
index af57ef0..5af90bd 100644 (file)
 <ANCHOR id="TLM-CONFIG-GENERAL-X11-SESSION:CAPS" href="tlm/tlm-General-configuration.html#TLM-CONFIG-GENERAL-X11-SESSION:CAPS">
 <ANCHOR id="TLM-CONFIG-GENERAL-PAUSE-SESSION:CAPS" href="tlm/tlm-General-configuration.html#TLM-CONFIG-GENERAL-PAUSE-SESSION:CAPS">
 <ANCHOR id="TLM-CONFIG-GENERAL-SESSION-TYPE:CAPS" href="tlm/tlm-General-configuration.html#TLM-CONFIG-GENERAL-SESSION-TYPE:CAPS">
-<ANCHOR id="gdbus-org.tizen.Tlm.Login" href="tlm/gdbus-org.tizen.Tlm.Login.html">
-<ANCHOR id="gdbus-interface-org-tizen-Tlm-Login" href="tlm/gdbus-org.tizen.Tlm.Login.html#gdbus-interface-org-tizen-Tlm-Login">
-<ANCHOR id="gdbus-methods-org.tizen.Tlm.Login" href="tlm/gdbus-org.tizen.Tlm.Login.html#gdbus-methods-org.tizen.Tlm.Login">
-<ANCHOR id="gdbus-method-org-tizen-Tlm-Login.loginUser" href="tlm/gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.loginUser">
-<ANCHOR id="gdbus-method-org-tizen-Tlm-Login.logoutUser" href="tlm/gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.logoutUser">
-<ANCHOR id="gdbus-method-org-tizen-Tlm-Login.switchUser" href="tlm/gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.switchUser">
+<ANCHOR id="tlm-Seat-configuration" href="tlm/tlm-Seat-configuration.html">
+<ANCHOR id="tlm-Seat-configuration.other" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.other">
+<ANCHOR id="tlm-Seat-configuration.object-hierarchy" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.object-hierarchy">
+<ANCHOR id="tlm-Seat-configuration.description" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.description">
+<ANCHOR id="tlm-Seat-configuration.functions_details" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.functions_details">
+<ANCHOR id="tlm-Seat-configuration.other_details" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.other_details">
+<ANCHOR id="TLM-CONFIG-SEAT-ACTIVE:CAPS" href="tlm/tlm-Seat-configuration.html#TLM-CONFIG-SEAT-ACTIVE:CAPS">
+<ANCHOR id="TLM-CONFIG-SEAT-NWATCH:CAPS" href="tlm/tlm-Seat-configuration.html#TLM-CONFIG-SEAT-NWATCH:CAPS">
+<ANCHOR id="TLM-CONFIG-SEAT-WATCHX:CAPS" href="tlm/tlm-Seat-configuration.html#TLM-CONFIG-SEAT-WATCHX:CAPS">
+<ANCHOR id="TLM-CONFIG-SEAT-VTNR:CAPS" href="tlm/tlm-Seat-configuration.html#TLM-CONFIG-SEAT-VTNR:CAPS">
+<ANCHOR id="gdbus-org.O1.Tlm.Login" href="tlm/gdbus-org.O1.Tlm.Login.html">
+<ANCHOR id="gdbus-interface-org-O1-Tlm-Login" href="tlm/gdbus-org.O1.Tlm.Login.html#gdbus-interface-org-O1-Tlm-Login">
+<ANCHOR id="gdbus-methods-org.O1.Tlm.Login" href="tlm/gdbus-org.O1.Tlm.Login.html#gdbus-methods-org.O1.Tlm.Login">
+<ANCHOR id="gdbus-method-org-O1-Tlm-Login.loginUser" href="tlm/gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.loginUser">
+<ANCHOR id="gdbus-method-org-O1-Tlm-Login.logoutUser" href="tlm/gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.logoutUser">
+<ANCHOR id="gdbus-method-org-O1-Tlm-Login.switchUser" href="tlm/gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.switchUser">
 <ANCHOR id="TlmAccountPlugin" href="tlm/TlmAccountPlugin.html">
 <ANCHOR id="TlmAccountPlugin.functions" href="tlm/TlmAccountPlugin.html#TlmAccountPlugin.functions">
 <ANCHOR id="TlmAccountPlugin.properties" href="tlm/TlmAccountPlugin.html#TlmAccountPlugin.properties">
 <ANCHOR id="TlmAuthPluginDefault.description" href="tlm/TlmAuthPluginDefault.html#TlmAuthPluginDefault.description">
 <ANCHOR id="TlmAuthPluginDefault.functions_details" href="tlm/TlmAuthPluginDefault.html#TlmAuthPluginDefault.functions_details">
 <ANCHOR id="TlmAuthPluginDefault.other_details" href="tlm/TlmAuthPluginDefault.html#TlmAuthPluginDefault.other_details">
-<ANCHOR id="tlm-Seat-configuration" href="tlm/tlm-Seat-configuration.html">
-<ANCHOR id="tlm-Seat-configuration.other" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.other">
-<ANCHOR id="tlm-Seat-configuration.object-hierarchy" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.object-hierarchy">
-<ANCHOR id="tlm-Seat-configuration.description" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.description">
-<ANCHOR id="tlm-Seat-configuration.functions_details" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.functions_details">
-<ANCHOR id="tlm-Seat-configuration.other_details" href="tlm/tlm-Seat-configuration.html#tlm-Seat-configuration.other_details">
-<ANCHOR id="TLM-CONFIG-SEAT-ACTIVE:CAPS" href="tlm/tlm-Seat-configuration.html#TLM-CONFIG-SEAT-ACTIVE:CAPS">
-<ANCHOR id="TLM-CONFIG-SEAT-NWATCH:CAPS" href="tlm/tlm-Seat-configuration.html#TLM-CONFIG-SEAT-NWATCH:CAPS">
-<ANCHOR id="TLM-CONFIG-SEAT-WATCHX:CAPS" href="tlm/tlm-Seat-configuration.html#TLM-CONFIG-SEAT-WATCHX:CAPS">
-<ANCHOR id="TLM-CONFIG-SEAT-VTNR:CAPS" href="tlm/tlm-Seat-configuration.html#TLM-CONFIG-SEAT-VTNR:CAPS">
 <ANCHOR id="tlm-tlm-log" href="tlm/tlm-tlm-log.html">
 <ANCHOR id="tlm-tlm-log.functions" href="tlm/tlm-tlm-log.html#tlm-tlm-log.functions">
 <ANCHOR id="tlm-tlm-log.object-hierarchy" href="tlm/tlm-tlm-log.html#tlm-tlm-log.object-hierarchy">
index b99ae9a..e3f6921 100644 (file)
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Object Hierarchy</title>
+<title>Tiny Login Manager Reference Manual: Object Hierarchy</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="up" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="up" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="prev" href="tlm-Errors.html" title="Errors">
 <link rel="next" href="ch05.html" title="">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
index 4677828..ae21007 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Errors</title>
+<title>Tiny Login Manager Reference Manual: Errors</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch03.html" title="Tlm miscellaneous">
 <link rel="prev" href="tlm-tlm-log.html" title="tlm-log">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
index ec27535..95f8c58 100644 (file)
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: General configuration</title>
+<title>Tiny Login Manager Reference Manual: General configuration</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch01.html" title="Introduction">
 <link rel="prev" href="TlmConfig.html" title="TlmConfig">
-<link rel="next" href="gdbus-org.tizen.Tlm.Login.html" title="org.tizen.Tlm.Login">
+<link rel="next" href="tlm-Seat-configuration.html" title="Seat configuration">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,7 +21,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="TlmConfig.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gdbus-org.tizen.Tlm.Login.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="tlm-Seat-configuration.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="tlm-General-configuration"></a><div class="titlepage"></div>
index c0b61a0..0f929bc 100644 (file)
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Seat configuration</title>
+<title>Tiny Login Manager Reference Manual: Seat configuration</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
-<link rel="up" href="ch02.html" title="Tlm plugins reference">
-<link rel="prev" href="TlmAuthPluginDefault.html" title="TlmAuthPluginDefault">
-<link rel="next" href="ch03.html" title="Tlm miscellaneous">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
+<link rel="up" href="ch01.html" title="Introduction">
+<link rel="prev" href="tlm-General-configuration.html" title="General configuration">
+<link rel="next" href="gdbus-org.O1.Tlm.Login.html" title="org.O1.Tlm.Login">
 <meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -19,9 +19,9 @@
                   <a href="#tlm-Seat-configuration.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="TlmAuthPluginDefault.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="ch03.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="tlm-General-configuration.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="gdbus-org.O1.Tlm.Login.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="tlm-Seat-configuration"></a><div class="titlepage"></div>
index 2dc05be..31e141a 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: Introduction</title>
+<title>Tiny Login Manager Reference Manual: Introduction</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch01.html" title="Introduction">
 <link rel="prev" href="ch01.html" title="Introduction">
 <link rel="next" href="TlmConfig.html" title="TlmConfig">
@@ -36,7 +36,7 @@
         user is logged in at a specific seat.
     </p>
 <p>
-        TLM also exports a <a class="link" href="gdbus-org.tizen.Tlm.Login.html" title="org.tizen.Tlm.Login">D-Bus API</a>, that can be used to log in, log out and
+        TLM also exports a <a class="link" href="gdbus-org.O1.Tlm.Login.html" title="org.O1.Tlm.Login">D-Bus API</a>, that can be used to log in, log out and
         switch users on a seat.
     </p>
 <p>
index cecccfc..9830df6 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Tizen Login Manager Reference Manual: tlm-log</title>
+<title>Tiny Login Manager Reference Manual: tlm-log</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Tizen Login Manager Reference Manual">
+<link rel="home" href="index.html" title="Tiny Login Manager Reference Manual">
 <link rel="up" href="ch03.html" title="Tlm miscellaneous">
 <link rel="prev" href="ch03.html" title="Tlm miscellaneous">
 <link rel="next" href="tlm-Errors.html" title="Errors">
index b791a01..80ef929 100644 (file)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="Tizen Login Manager Reference Manual" link="index.html" author="" name="tlm" version="2" language="c">
+<book xmlns="http://www.devhelp.net/book" title="Tiny Login Manager Reference Manual" link="index.html" author="" name="tlm" version="2" language="c">
   <chapters>
     <sub name="Introduction" link="ch01.html">
       <sub name="Introduction" link="tlm-intro.html"/>
       <sub name="TlmConfig" link="TlmConfig.html"/>
       <sub name="General configuration" link="tlm-General-configuration.html"/>
-      <sub name="org.tizen.Tlm.Login" link="gdbus-org.tizen.Tlm.Login.html"/>
+      <sub name="Seat configuration" link="tlm-Seat-configuration.html"/>
+      <sub name="org.O1.Tlm.Login" link="gdbus-org.O1.Tlm.Login.html"/>
     </sub>
     <sub name="Tlm plugins reference" link="ch02.html">
       <sub name="TlmAccountPlugin" link="TlmAccountPlugin.html"/>
@@ -14,7 +15,6 @@
       <sub name="TlmAccountPluginGumd" link="TlmAccountPluginGumd.html"/>
       <sub name="TlmAuthPlugin" link="TlmAuthPlugin.html"/>
       <sub name="TlmAuthPluginDefault" link="TlmAuthPluginDefault.html"/>
-      <sub name="Seat configuration" link="tlm-Seat-configuration.html"/>
     </sub>
     <sub name="Tlm miscellaneous" link="ch03.html">
       <sub name="tlm-log" link="tlm-tlm-log.html"/>
     <keyword type="macro" name="TLM_CONFIG_GENERAL_X11_SESSION" link="tlm-General-configuration.html#TLM-CONFIG-GENERAL-X11-SESSION:CAPS"/>
     <keyword type="macro" name="TLM_CONFIG_GENERAL_PAUSE_SESSION" link="tlm-General-configuration.html#TLM-CONFIG-GENERAL-PAUSE-SESSION:CAPS"/>
     <keyword type="macro" name="TLM_CONFIG_GENERAL_SESSION_TYPE" link="tlm-General-configuration.html#TLM-CONFIG-GENERAL-SESSION-TYPE:CAPS"/>
-    <keyword type="method" name="The loginUser() method" link="gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.loginUser"/>
-    <keyword type="method" name="The logoutUser() method" link="gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.logoutUser"/>
-    <keyword type="method" name="The switchUser() method" link="gdbus-org.tizen.Tlm.Login.html#gdbus-method-org-tizen-Tlm-Login.switchUser"/>
+    <keyword type="macro" name="TLM_CONFIG_SEAT_ACTIVE" link="tlm-Seat-configuration.html#TLM-CONFIG-SEAT-ACTIVE:CAPS"/>
+    <keyword type="macro" name="TLM_CONFIG_SEAT_NWATCH" link="tlm-Seat-configuration.html#TLM-CONFIG-SEAT-NWATCH:CAPS"/>
+    <keyword type="macro" name="TLM_CONFIG_SEAT_WATCHX" link="tlm-Seat-configuration.html#TLM-CONFIG-SEAT-WATCHX:CAPS"/>
+    <keyword type="macro" name="TLM_CONFIG_SEAT_VTNR" link="tlm-Seat-configuration.html#TLM-CONFIG-SEAT-VTNR:CAPS"/>
+    <keyword type="method" name="The loginUser() method" link="gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.loginUser"/>
+    <keyword type="method" name="The logoutUser() method" link="gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.logoutUser"/>
+    <keyword type="method" name="The switchUser() method" link="gdbus-org.O1.Tlm.Login.html#gdbus-method-org-O1-Tlm-Login.switchUser"/>
     <keyword type="function" name="tlm_account_plugin_setup_guest_user_account ()" link="TlmAccountPlugin.html#tlm-account-plugin-setup-guest-user-account"/>
     <keyword type="function" name="tlm_account_plugin_is_valid_user ()" link="TlmAccountPlugin.html#tlm-account-plugin-is-valid-user"/>
     <keyword type="function" name="tlm_account_plugin_cleanup_guest_user ()" link="TlmAccountPlugin.html#tlm-account-plugin-cleanup-guest-user"/>
     <keyword type="struct" name="struct TlmAuthPluginInterface" link="TlmAuthPlugin.html#TlmAuthPluginInterface"/>
     <keyword type="property" name="The “config” property" link="TlmAuthPlugin.html#TlmAuthPlugin--config"/>
     <keyword type="signal" name="The “authenticate” signal" link="TlmAuthPlugin.html#TlmAuthPlugin-authenticate"/>
-    <keyword type="macro" name="TLM_CONFIG_SEAT_ACTIVE" link="tlm-Seat-configuration.html#TLM-CONFIG-SEAT-ACTIVE:CAPS"/>
-    <keyword type="macro" name="TLM_CONFIG_SEAT_NWATCH" link="tlm-Seat-configuration.html#TLM-CONFIG-SEAT-NWATCH:CAPS"/>
-    <keyword type="macro" name="TLM_CONFIG_SEAT_WATCHX" link="tlm-Seat-configuration.html#TLM-CONFIG-SEAT-WATCHX:CAPS"/>
-    <keyword type="macro" name="TLM_CONFIG_SEAT_VTNR" link="tlm-Seat-configuration.html#TLM-CONFIG-SEAT-VTNR:CAPS"/>
     <keyword type="function" name="tlm_log_init ()" link="tlm-tlm-log.html#tlm-log-init"/>
     <keyword type="function" name="tlm_log_close ()" link="tlm-tlm-log.html#tlm-log-close"/>
     <keyword type="macro" name="EXPAND_LOG_MSG()" link="tlm-tlm-log.html#EXPAND-LOG-MSG:CAPS"/>
index 7d19c5b..fa6a9e2 100644 (file)
@@ -22,7 +22,7 @@
         user is logged in at a specific seat.
     </para>
     <para>
-        TLM also exports a <link linkend="gdbus-org.tizen.Tlm.Login">D-Bus API</link>, that can be used to log in, log out and
+        TLM also exports a <link linkend="gdbus-org.O1.Tlm.Login">D-Bus API</link>, that can be used to log in, log out and
         switch users on a seat.
     </para>
     <para>
@@ -2,24 +2,24 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 ]>
-<refentry id="gdbus-org.tizen.Tlm.Login">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-tizen-Tlm-Login.top_of_page">org.tizen.Tlm.Login</refentrytitle>
-  <indexterm zone="gdbus-interface-org-tizen-Tlm-Login.top_of_page"><primary sortas="Login">org.tizen.Tlm.Login</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.tizen.Tlm.Login</refname>    <refpurpose>a D-Bus interface to TLM</refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
+<refentry id="gdbus-org.O1.Tlm.Login">
+  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-O1-Tlm-Login.top_of_page">org.O1.Tlm.Login</refentrytitle>
+  <indexterm zone="gdbus-interface-org-O1-Tlm-Login.top_of_page"><primary sortas="Login">org.O1.Tlm.Login</primary></indexterm>
+  </refmeta>  <refnamediv>    <refname>org.O1.Tlm.Login</refname>    <refpurpose>a D-Bus interface to TLM</refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
     <synopsis>
-<link linkend="gdbus-method-org-tizen-Tlm-Login.loginUser">loginUser</link>  (IN  s     seat_id,
+<link linkend="gdbus-method-org-O1-Tlm-Login.loginUser">loginUser</link>  (IN  s     seat_id,
             IN  s     username,
             IN  s     password,
             IN  a{ss} environ);
-<link linkend="gdbus-method-org-tizen-Tlm-Login.logoutUser">logoutUser</link> (IN  s     seat_id);
-<link linkend="gdbus-method-org-tizen-Tlm-Login.switchUser">switchUser</link> (IN  s     seat_id,
+<link linkend="gdbus-method-org-O1-Tlm-Login.logoutUser">logoutUser</link> (IN  s     seat_id);
+<link linkend="gdbus-method-org-O1-Tlm-Login.switchUser">switchUser</link> (IN  s     seat_id,
             IN  s     username,
             IN  s     password,
             IN  a{ss} environ);
 </synopsis>
   </refsynopsisdiv>
-<refsect1 role="desc" id="gdbus-interface-org-tizen-Tlm-Login">
+<refsect1 role="desc" id="gdbus-interface-org-O1-Tlm-Login">
   <title role="desc.title">Description</title>
   <para>    Login objects can be used to login, logout and switch users. Login object
     with root access is exported at TLM_DBUS_ROOT_SOCKET_ADDRESS which can be
     at the seat (seat_id).
 </para>
 </refsect1>
-<refsect1 role="details" id="gdbus-methods-org.tizen.Tlm.Login">
+<refsect1 role="details" id="gdbus-methods-org.O1.Tlm.Login">
   <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Login.loginUser">
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Login.loginUser">
   <title>The loginUser() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Login.loginUser"><primary sortas="Login.loginUser">org.tizen.Tlm.Login.loginUser()</primary></indexterm>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Login.loginUser"><primary sortas="Login.loginUser">org.O1.Tlm.Login.loginUser()</primary></indexterm>
 <programlisting>
 loginUser (IN  s     seat_id,
            IN  s     username,
@@ -65,9 +65,9 @@ loginUser (IN  s     seat_id,
 </varlistentry>
 </variablelist>
 </refsect2>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Login.logoutUser">
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Login.logoutUser">
   <title>The logoutUser() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Login.logoutUser"><primary sortas="Login.logoutUser">org.tizen.Tlm.Login.logoutUser()</primary></indexterm>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Login.logoutUser"><primary sortas="Login.logoutUser">org.O1.Tlm.Login.logoutUser()</primary></indexterm>
 <programlisting>
 logoutUser (IN  s seat_id);
 </programlisting>
@@ -80,9 +80,9 @@ logoutUser (IN  s seat_id);
 </varlistentry>
 </variablelist>
 </refsect2>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Login.switchUser">
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Login.switchUser">
   <title>The switchUser() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Login.switchUser"><primary sortas="Login.switchUser">org.tizen.Tlm.Login.switchUser()</primary></indexterm>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Login.switchUser"><primary sortas="Login.switchUser">org.O1.Tlm.Login.switchUser()</primary></indexterm>
 <programlisting>
 switchUser (IN  s     seat_id,
             IN  s     username,
diff --git a/docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml b/docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
new file mode 100644 (file)
index 0000000..7229d33
--- /dev/null
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+]>
+<refentry id="gdbus-org.O1.Tlm.Session">
+  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-O1-Tlm-Session.top_of_page">org.O1.Tlm.Session</refentrytitle>
+  <indexterm zone="gdbus-interface-org-O1-Tlm-Session.top_of_page"><primary sortas="Session">org.O1.Tlm.Session</primary></indexterm>
+  </refmeta>  <refnamediv>    <refname>org.O1.Tlm.Session</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
+    <title role="synopsis.title">Methods</title>
+    <synopsis>
+<link linkend="gdbus-method-org-O1-Tlm-Session.sessionCreate">sessionCreate</link>    (IN  s     password,
+                  IN  a{ss} environment);
+<link linkend="gdbus-method-org-O1-Tlm-Session.sessionTerminate">sessionTerminate</link> ();
+</synopsis>
+  </refsynopsisdiv>
+  <refsect1 role="signal_proto">
+    <title role="signal_proto.title">Signals</title>
+    <synopsis>
+<link linkend="gdbus-signal-org-O1-Tlm-Session.sessionCreated">sessionCreated</link>    (s     sessionid);
+<link linkend="gdbus-signal-org-O1-Tlm-Session.sessionTerminated">sessionTerminated</link> ();
+<link linkend="gdbus-signal-org-O1-Tlm-Session.error">error</link>             ((uis) error);
+<link linkend="gdbus-signal-org-O1-Tlm-Session.authenticated">authenticated</link>     ();
+</synopsis>
+  </refsect1>
+  <refsect1 role="properties">
+    <title role="properties.title">Properties</title>
+    <synopsis>
+<link linkend="gdbus-property-org-O1-Tlm-Session.seatid">seatid</link>     readwrite  s
+<link linkend="gdbus-property-org-O1-Tlm-Session.username">username</link>   readwrite  s
+<link linkend="gdbus-property-org-O1-Tlm-Session.service">service</link>    readwrite  s
+<link linkend="gdbus-property-org-O1-Tlm-Session.sessionid">sessionid</link>  readable   s
+</synopsis>
+  </refsect1>
+<refsect1 role="desc" id="gdbus-interface-org-O1-Tlm-Session">
+  <title role="desc.title">Description</title>
+  <para></para>
+</refsect1>
+<refsect1 role="details" id="gdbus-methods-org.O1.Tlm.Session">
+  <title role="details.title">Method Details</title>
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Session.sessionCreate">
+  <title>The sessionCreate() method</title>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Session.sessionCreate"><primary sortas="Session.sessionCreate">org.O1.Tlm.Session.sessionCreate()</primary></indexterm>
+<programlisting>
+sessionCreate (IN  s     password,
+               IN  a{ss} environment);
+</programlisting>
+<para></para>
+<variablelist role="params">
+<varlistentry>
+  <term><literal>IN s <parameter>password</parameter></literal>:</term>
+  <listitem><para></para></listitem>
+</varlistentry>
+<varlistentry>
+  <term><literal>IN a{ss} <parameter>environment</parameter></literal>:</term>
+  <listitem><para></para></listitem>
+</varlistentry>
+</variablelist>
+</refsect2>
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Session.sessionTerminate">
+  <title>The sessionTerminate() method</title>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Session.sessionTerminate"><primary sortas="Session.sessionTerminate">org.O1.Tlm.Session.sessionTerminate()</primary></indexterm>
+<programlisting>
+sessionTerminate ();
+</programlisting>
+<para></para>
+</refsect2>
+</refsect1>
+<refsect1 role="details" id="gdbus-signals-org.O1.Tlm.Session">
+  <title role="details.title">Signal Details</title>
+<refsect2 role="signal" id="gdbus-signal-org-O1-Tlm-Session.sessionCreated">
+  <title>The "sessionCreated" signal</title>
+  <indexterm zone="gdbus-signal-org-O1-Tlm-Session.sessionCreated"><primary sortas="Session::sessionCreated">org.O1.Tlm.Session::sessionCreated</primary></indexterm>
+<programlisting>
+sessionCreated (s sessionid);
+</programlisting>
+<para></para>
+<variablelist role="params">
+<varlistentry>
+  <term><literal>s <parameter>sessionid</parameter></literal>:</term>
+  <listitem><para></para></listitem>
+</varlistentry>
+</variablelist>
+</refsect2>
+<refsect2 role="signal" id="gdbus-signal-org-O1-Tlm-Session.sessionTerminated">
+  <title>The "sessionTerminated" signal</title>
+  <indexterm zone="gdbus-signal-org-O1-Tlm-Session.sessionTerminated"><primary sortas="Session::sessionTerminated">org.O1.Tlm.Session::sessionTerminated</primary></indexterm>
+<programlisting>
+sessionTerminated ();
+</programlisting>
+<para></para>
+</refsect2>
+<refsect2 role="signal" id="gdbus-signal-org-O1-Tlm-Session.error">
+  <title>The "error" signal</title>
+  <indexterm zone="gdbus-signal-org-O1-Tlm-Session.error"><primary sortas="Session::error">org.O1.Tlm.Session::error</primary></indexterm>
+<programlisting>
+error ((uis) error);
+</programlisting>
+<para></para>
+<variablelist role="params">
+<varlistentry>
+  <term><literal>(uis) <parameter>error</parameter></literal>:</term>
+  <listitem><para></para></listitem>
+</varlistentry>
+</variablelist>
+</refsect2>
+<refsect2 role="signal" id="gdbus-signal-org-O1-Tlm-Session.authenticated">
+  <title>The "authenticated" signal</title>
+  <indexterm zone="gdbus-signal-org-O1-Tlm-Session.authenticated"><primary sortas="Session::authenticated">org.O1.Tlm.Session::authenticated</primary></indexterm>
+<programlisting>
+authenticated ();
+</programlisting>
+<para></para>
+</refsect2>
+</refsect1>
+<refsect1 role="details" id="gdbus-properties-org.O1.Tlm.Session">
+  <title role="details.title">Property Details</title>
+<refsect2 role="property" id="gdbus-property-org-O1-Tlm-Session.seatid">
+  <title>The "seatid" property</title>
+  <indexterm zone="gdbus-property-org-O1-Tlm-Session.seatid"><primary sortas="Session:seatid">org.O1.Tlm.Session:seatid</primary></indexterm>
+<programlisting>
+seatid  readwrite  s
+</programlisting>
+<para></para>
+</refsect2>
+<refsect2 role="property" id="gdbus-property-org-O1-Tlm-Session.username">
+  <title>The "username" property</title>
+  <indexterm zone="gdbus-property-org-O1-Tlm-Session.username"><primary sortas="Session:username">org.O1.Tlm.Session:username</primary></indexterm>
+<programlisting>
+username  readwrite  s
+</programlisting>
+<para></para>
+</refsect2>
+<refsect2 role="property" id="gdbus-property-org-O1-Tlm-Session.service">
+  <title>The "service" property</title>
+  <indexterm zone="gdbus-property-org-O1-Tlm-Session.service"><primary sortas="Session:service">org.O1.Tlm.Session:service</primary></indexterm>
+<programlisting>
+service  readwrite  s
+</programlisting>
+<para></para>
+</refsect2>
+<refsect2 role="property" id="gdbus-property-org-O1-Tlm-Session.sessionid">
+  <title>The "sessionid" property</title>
+  <indexterm zone="gdbus-property-org-O1-Tlm-Session.sessionid"><primary sortas="Session:sessionid">org.O1.Tlm.Session:sessionid</primary></indexterm>
+<programlisting>
+sessionid  readable   s
+</programlisting>
+<para></para>
+</refsect2>
+</refsect1>
+</refentry>
+
diff --git a/docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml b/docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
deleted file mode 100644 (file)
index d1eb63e..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.tizen.Tlm.Session">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-tizen-Tlm-Session.top_of_page">org.tizen.Tlm.Session</refentrytitle>
-  <indexterm zone="gdbus-interface-org-tizen-Tlm-Session.top_of_page"><primary sortas="Session">org.tizen.Tlm.Session</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.tizen.Tlm.Session</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-tizen-Tlm-Session.sessionCreate">sessionCreate</link>    (IN  s     password,
-                  IN  a{ss} environment);
-<link linkend="gdbus-method-org-tizen-Tlm-Session.sessionTerminate">sessionTerminate</link> ();
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-tizen-Tlm-Session.sessionCreated">sessionCreated</link>    (s     sessionid);
-<link linkend="gdbus-signal-org-tizen-Tlm-Session.sessionTerminated">sessionTerminated</link> ();
-<link linkend="gdbus-signal-org-tizen-Tlm-Session.error">error</link>             ((uis) error);
-<link linkend="gdbus-signal-org-tizen-Tlm-Session.authenticated">authenticated</link>     ();
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-tizen-Tlm-Session.seatid">seatid</link>     readwrite  s
-<link linkend="gdbus-property-org-tizen-Tlm-Session.username">username</link>   readwrite  s
-<link linkend="gdbus-property-org-tizen-Tlm-Session.service">service</link>    readwrite  s
-<link linkend="gdbus-property-org-tizen-Tlm-Session.sessionid">sessionid</link>  readable   s
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-tizen-Tlm-Session">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.tizen.Tlm.Session">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Session.sessionCreate">
-  <title>The sessionCreate() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Session.sessionCreate"><primary sortas="Session.sessionCreate">org.tizen.Tlm.Session.sessionCreate()</primary></indexterm>
-<programlisting>
-sessionCreate (IN  s     password,
-               IN  a{ss} environment);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>password</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN a{ss} <parameter>environment</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Session.sessionTerminate">
-  <title>The sessionTerminate() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Session.sessionTerminate"><primary sortas="Session.sessionTerminate">org.tizen.Tlm.Session.sessionTerminate()</primary></indexterm>
-<programlisting>
-sessionTerminate ();
-</programlisting>
-<para></para>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.tizen.Tlm.Session">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-tizen-Tlm-Session.sessionCreated">
-  <title>The "sessionCreated" signal</title>
-  <indexterm zone="gdbus-signal-org-tizen-Tlm-Session.sessionCreated"><primary sortas="Session::sessionCreated">org.tizen.Tlm.Session::sessionCreated</primary></indexterm>
-<programlisting>
-sessionCreated (s sessionid);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>s <parameter>sessionid</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-tizen-Tlm-Session.sessionTerminated">
-  <title>The "sessionTerminated" signal</title>
-  <indexterm zone="gdbus-signal-org-tizen-Tlm-Session.sessionTerminated"><primary sortas="Session::sessionTerminated">org.tizen.Tlm.Session::sessionTerminated</primary></indexterm>
-<programlisting>
-sessionTerminated ();
-</programlisting>
-<para></para>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-tizen-Tlm-Session.error">
-  <title>The "error" signal</title>
-  <indexterm zone="gdbus-signal-org-tizen-Tlm-Session.error"><primary sortas="Session::error">org.tizen.Tlm.Session::error</primary></indexterm>
-<programlisting>
-error ((uis) error);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>(uis) <parameter>error</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-tizen-Tlm-Session.authenticated">
-  <title>The "authenticated" signal</title>
-  <indexterm zone="gdbus-signal-org-tizen-Tlm-Session.authenticated"><primary sortas="Session::authenticated">org.tizen.Tlm.Session::authenticated</primary></indexterm>
-<programlisting>
-authenticated ();
-</programlisting>
-<para></para>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.tizen.Tlm.Session">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-tizen-Tlm-Session.seatid">
-  <title>The "seatid" property</title>
-  <indexterm zone="gdbus-property-org-tizen-Tlm-Session.seatid"><primary sortas="Session:seatid">org.tizen.Tlm.Session:seatid</primary></indexterm>
-<programlisting>
-seatid  readwrite  s
-</programlisting>
-<para></para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-tizen-Tlm-Session.username">
-  <title>The "username" property</title>
-  <indexterm zone="gdbus-property-org-tizen-Tlm-Session.username"><primary sortas="Session:username">org.tizen.Tlm.Session:username</primary></indexterm>
-<programlisting>
-username  readwrite  s
-</programlisting>
-<para></para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-tizen-Tlm-Session.service">
-  <title>The "service" property</title>
-  <indexterm zone="gdbus-property-org-tizen-Tlm-Session.service"><primary sortas="Session:service">org.tizen.Tlm.Session:service</primary></indexterm>
-<programlisting>
-service  readwrite  s
-</programlisting>
-<para></para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-tizen-Tlm-Session.sessionid">
-  <title>The "sessionid" property</title>
-  <indexterm zone="gdbus-property-org-tizen-Tlm-Session.sessionid"><primary sortas="Session:sessionid">org.tizen.Tlm.Session:sessionid</primary></indexterm>
-<programlisting>
-sessionid  readable   s
-</programlisting>
-<para></para>
-</refsect2>
-</refsect1>
-</refentry>
-
index ba9dbbc..83be0dd 100644 (file)
@@ -6,7 +6,7 @@
 ]>
 <book id="index">
   <bookinfo>
-    <title>Tizen Login Manager Reference Manual</title>
+    <title>Tiny Login Manager Reference Manual</title>
     <releaseinfo>
       for tlm.
       The latest version of this documentation can be found on-line at
@@ -19,7 +19,8 @@
     <xi:include href="introduction.xml"/>
     <xi:include href="xml/tlm-config.xml"/>
     <xi:include href="xml/tlm-config-general.xml"/>
-    <xi:include href="tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml"/>
+    <xi:include href="xml/tlm-config-seat.xml"/>
+    <xi:include href="tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml"/>
 
   </chapter>
 
@@ -30,7 +31,6 @@
     <xi:include href="xml/tlm-plugin-gumd.xml"><xi:fallback /></xi:include>
     <xi:include href="xml/tlm-auth-plugin.xml"/>
     <xi:include href="xml/tlm-auth-plugin-default.xml"/>
-    <xi:include href="xml/tlm-config-seat.xml"/>
     <xi:include href="xml/tlm-auth-plugin-nfc.xml"><xi:fallback /></xi:include>
 
   </chapter>
index 165a00c..6e920ee 100644 (file)
@@ -1,3 +1,7 @@
+* Tue Feb 18 2015 Imran Zaman <imran.zaman@intel.com>
+- Move the tlm dbus interface under org.01
+- tlm-launcher is used to launch session scripts
+
 * Tue Dec 23 2014 Imran Zaman <imran.zaman@intel.com>
 - Added config package for modello
 
index a2e4fad..ea4318b 100644 (file)
@@ -73,7 +73,7 @@ Requires:   %{name} = %{version}-%{release}
 Provides:   %{name}-config
 
 %description config-common
-Tizen Login Manager configuration files for common-profile.
+Tiny Login Manager configuration files for common-profile.
 
 %else
 
@@ -88,7 +88,7 @@ Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
 Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-singleseat
-Generic Tizen Login Manager configuration files for ivi-profile with
+Generic Tiny Login Manager configuration files for ivi-profile with
 single seat.
 
 
@@ -104,7 +104,7 @@ Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
 Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-singleseat-modello
-Generic Tizen Login Manager configuration files for ivi-profile with
+Generic Tiny Login Manager configuration files for ivi-profile with
 single seat for modello.
 
 
@@ -118,7 +118,7 @@ Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
 Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
 
 %description config-ivi-singleseat-ico
-Generic Tizen Login Manager configuration files for ivi-profile with
+Generic Tiny Login Manager configuration files for ivi-profile with
 single seat for ico.
 
 
@@ -133,7 +133,7 @@ Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-vtc1010
 Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-multiseat
-Generic Tizen Login Manager configuration files for ivi-profile with
+Generic Tiny Login Manager configuration files for ivi-profile with
 multi seat.
 
 
@@ -148,7 +148,7 @@ Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-multiseat
 Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-vtc1010
-Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.
+Tiny Login Manager configuration files for ivi-profile on VTC-1010 hardware.
 
 %endif
 
@@ -365,6 +365,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-singleseat.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
@@ -376,6 +378,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-singleseat-modello.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-modello
 %config(noreplace) %{_sysconfdir}/session.d/user-session-modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-modello.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user-modello.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
@@ -387,6 +391,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-singleseat-ico.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
@@ -398,6 +404,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-multiseat.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-multiseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
@@ -409,6 +417,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-vtc1010.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-vtc1010
 %config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
+%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
index d98b000..091a40b 100644 (file)
@@ -6,14 +6,15 @@ DBUS_BUILT_SOURCES = \
     tlm-dbus-session-gen.c \
     tlm-dbus-session-gen.h \
     $(NULL)
+BUILT_SOURCES = $(DBUS_BUILT_SOURCES)
 
 DBUS_BUILT_DOCS = \
-    tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml \
-    tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml \
+    tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml \
+    tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml \
     $(NULL)
 
-DBUS_INTERFACE_PREFIX="org.tizen.Tlm."
-tlm-dbus-login-gen.c tlm-dbus-login-gen.h : $(INTERFACES_DIR)/org.tizen.Tlm.Login.xml
+DBUS_INTERFACE_PREFIX="org.O1.Tlm."
+tlm-dbus-login-gen.c tlm-dbus-login-gen.h : $(INTERFACES_DIR)/org.O1.Tlm.Login.xml
        gdbus-codegen                                       \
        --interface-prefix $(DBUS_INTERFACE_PREFIX)      \
        --c-namespace TlmDbus                       \
@@ -21,7 +22,7 @@ tlm-dbus-login-gen.c tlm-dbus-login-gen.h : $(INTERFACES_DIR)/org.tizen.Tlm.Logi
        --generate-docbook tlm-dbus-login-doc-gen \
        $<
 
-tlm-dbus-session-gen.c tlm-dbus-session-gen.h : $(INTERFACES_DIR)/org.tizen.Tlm.Session.xml
+tlm-dbus-session-gen.c tlm-dbus-session-gen.h : $(INTERFACES_DIR)/org.O1.Tlm.Session.xml
        gdbus-codegen                                       \
        --interface-prefix $(DBUS_INTERFACE_PREFIX)      \
        --c-namespace TlmDbus                       \
@@ -49,20 +50,20 @@ libtlm_dbus_glue_la_SOURCES =  \
    tlm-dbus-utils.h \
    $(NULL)
 
-EXTRA_DIST = interfaces tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml \
-  tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
+EXTRA_DIST = interfaces tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml \
+  tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
 
 all-local: copy_xml_doc
 
 mostlyclean-local:
-       rm -rf $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml
-       rm -rf $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
+       rm -rf $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml
+       rm -rf $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
 
 copy_xml_doc: tlm-dbus-login-gen.c tlm-dbus-session-gen.c
-       cp -f $(abs_top_srcdir)/src/common/dbus/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml
-       chmod +w $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml
-       cp -f $(abs_top_srcdir)/src/common/dbus/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
-       chmod +w $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
+       cp -f $(abs_top_srcdir)/src/common/dbus/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml
+       chmod +w $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml
+       cp -f $(abs_top_srcdir)/src/common/dbus/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
+       chmod +w $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
 
 clean-local:
        rm -f *~ $(DBUS_BUILT_SOURCES) $(DBUS_BUILT_DOCS)
index bf85a4f..9e9fd0f 100644 (file)
@@ -321,12 +321,13 @@ DBUS_BUILT_SOURCES = \
     tlm-dbus-session-gen.h \
     $(NULL)
 
+BUILT_SOURCES = $(DBUS_BUILT_SOURCES)
 DBUS_BUILT_DOCS = \
-    tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml \
-    tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml \
+    tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml \
+    tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml \
     $(NULL)
 
-DBUS_INTERFACE_PREFIX = "org.tizen.Tlm."
+DBUS_INTERFACE_PREFIX = "org.O1.Tlm."
 noinst_LTLIBRARIES = libtlm-dbus-glue.la
 libtlm_dbus_glue_la_CPPFLAGS = \
     $(TLM_CFLAGS) \
@@ -346,10 +347,11 @@ libtlm_dbus_glue_la_SOURCES = \
    tlm-dbus-utils.h \
    $(NULL)
 
-EXTRA_DIST = interfaces tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml \
-  tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
+EXTRA_DIST = interfaces tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml \
+  tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
 
-all: all-am
+all: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -542,10 +544,12 @@ distdir: $(DISTFILES)
          fi; \
        done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES) all-local
 installdirs:
-install: install-am
+install: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -575,6 +579,7 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
@@ -646,7 +651,7 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
        clean-generic clean-libtool clean-local \
@@ -663,7 +668,7 @@ uninstall-am:
        mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \
        uninstall-am
 
-tlm-dbus-login-gen.c tlm-dbus-login-gen.h : $(INTERFACES_DIR)/org.tizen.Tlm.Login.xml
+tlm-dbus-login-gen.c tlm-dbus-login-gen.h : $(INTERFACES_DIR)/org.O1.Tlm.Login.xml
        gdbus-codegen                                       \
        --interface-prefix $(DBUS_INTERFACE_PREFIX)      \
        --c-namespace TlmDbus                       \
@@ -671,7 +676,7 @@ tlm-dbus-login-gen.c tlm-dbus-login-gen.h : $(INTERFACES_DIR)/org.tizen.Tlm.Logi
        --generate-docbook tlm-dbus-login-doc-gen \
        $<
 
-tlm-dbus-session-gen.c tlm-dbus-session-gen.h : $(INTERFACES_DIR)/org.tizen.Tlm.Session.xml
+tlm-dbus-session-gen.c tlm-dbus-session-gen.h : $(INTERFACES_DIR)/org.O1.Tlm.Session.xml
        gdbus-codegen                                       \
        --interface-prefix $(DBUS_INTERFACE_PREFIX)      \
        --c-namespace TlmDbus                       \
@@ -682,14 +687,14 @@ tlm-dbus-session-gen.c tlm-dbus-session-gen.h : $(INTERFACES_DIR)/org.tizen.Tlm.
 all-local: copy_xml_doc
 
 mostlyclean-local:
-       rm -rf $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml
-       rm -rf $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
+       rm -rf $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml
+       rm -rf $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
 
 copy_xml_doc: tlm-dbus-login-gen.c tlm-dbus-session-gen.c
-       cp -f $(abs_top_srcdir)/src/common/dbus/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml
-       chmod +w $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.tizen.Tlm.Login.xml
-       cp -f $(abs_top_srcdir)/src/common/dbus/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
-       chmod +w $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
+       cp -f $(abs_top_srcdir)/src/common/dbus/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml
+       chmod +w $(abs_top_builddir)/docs/tlm-dbus-login-doc-gen-org.O1.Tlm.Login.xml
+       cp -f $(abs_top_srcdir)/src/common/dbus/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
+       chmod +w $(abs_top_builddir)/docs/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
 
 clean-local:
        rm -f *~ $(DBUS_BUILT_SOURCES) $(DBUS_BUILT_DOCS)
@@ -2,7 +2,7 @@
 <node>
 
     <!--
-    org.tizen.Tlm.Login:
+    org.O1.Tlm.Login:
     @short_description: a D-Bus interface to TLM
 
     Login objects can be used to login, logout and switch users. Login object
@@ -15,7 +15,7 @@
     TLM_DBUS_SOCKET_PATH/&lt;seat_id-uid&gt; by the user (uid) who is logged in
     at the seat (seat_id).
     -->
-    <interface name="org.tizen.Tlm.Login">
+    <interface name="org.O1.Tlm.Login">
 
         <!--
         loginUser:
@@ -28,7 +28,7 @@
         while switchUser() will not.
         -->
         <method name="loginUser">
-            
+
             <arg name="seat_id" type="s" direction="in">
             </arg>
 
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.tizen.Tlm.Session">
+  <interface name="org.O1.Tlm.Session">
     <property type='s' name='seatid' access='readwrite'/>
     <property type='s' name='username' access='readwrite'/>
     <property type='s' name='service' access='readwrite'/>
@@ -2,24 +2,24 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 ]>
-<refentry id="gdbus-org.tizen.Tlm.Login">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-tizen-Tlm-Login.top_of_page">org.tizen.Tlm.Login</refentrytitle>
-  <indexterm zone="gdbus-interface-org-tizen-Tlm-Login.top_of_page"><primary sortas="Login">org.tizen.Tlm.Login</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.tizen.Tlm.Login</refname>    <refpurpose>a D-Bus interface to TLM</refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
+<refentry id="gdbus-org.O1.Tlm.Login">
+  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-O1-Tlm-Login.top_of_page">org.O1.Tlm.Login</refentrytitle>
+  <indexterm zone="gdbus-interface-org-O1-Tlm-Login.top_of_page"><primary sortas="Login">org.O1.Tlm.Login</primary></indexterm>
+  </refmeta>  <refnamediv>    <refname>org.O1.Tlm.Login</refname>    <refpurpose>a D-Bus interface to TLM</refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
     <synopsis>
-<link linkend="gdbus-method-org-tizen-Tlm-Login.loginUser">loginUser</link>  (IN  s     seat_id,
+<link linkend="gdbus-method-org-O1-Tlm-Login.loginUser">loginUser</link>  (IN  s     seat_id,
             IN  s     username,
             IN  s     password,
             IN  a{ss} environ);
-<link linkend="gdbus-method-org-tizen-Tlm-Login.logoutUser">logoutUser</link> (IN  s     seat_id);
-<link linkend="gdbus-method-org-tizen-Tlm-Login.switchUser">switchUser</link> (IN  s     seat_id,
+<link linkend="gdbus-method-org-O1-Tlm-Login.logoutUser">logoutUser</link> (IN  s     seat_id);
+<link linkend="gdbus-method-org-O1-Tlm-Login.switchUser">switchUser</link> (IN  s     seat_id,
             IN  s     username,
             IN  s     password,
             IN  a{ss} environ);
 </synopsis>
   </refsynopsisdiv>
-<refsect1 role="desc" id="gdbus-interface-org-tizen-Tlm-Login">
+<refsect1 role="desc" id="gdbus-interface-org-O1-Tlm-Login">
   <title role="desc.title">Description</title>
   <para>    Login objects can be used to login, logout and switch users. Login object
     with root access is exported at TLM_DBUS_ROOT_SOCKET_ADDRESS which can be
     at the seat (seat_id).
 </para>
 </refsect1>
-<refsect1 role="details" id="gdbus-methods-org.tizen.Tlm.Login">
+<refsect1 role="details" id="gdbus-methods-org.O1.Tlm.Login">
   <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Login.loginUser">
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Login.loginUser">
   <title>The loginUser() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Login.loginUser"><primary sortas="Login.loginUser">org.tizen.Tlm.Login.loginUser()</primary></indexterm>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Login.loginUser"><primary sortas="Login.loginUser">org.O1.Tlm.Login.loginUser()</primary></indexterm>
 <programlisting>
 loginUser (IN  s     seat_id,
            IN  s     username,
@@ -65,9 +65,9 @@ loginUser (IN  s     seat_id,
 </varlistentry>
 </variablelist>
 </refsect2>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Login.logoutUser">
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Login.logoutUser">
   <title>The logoutUser() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Login.logoutUser"><primary sortas="Login.logoutUser">org.tizen.Tlm.Login.logoutUser()</primary></indexterm>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Login.logoutUser"><primary sortas="Login.logoutUser">org.O1.Tlm.Login.logoutUser()</primary></indexterm>
 <programlisting>
 logoutUser (IN  s seat_id);
 </programlisting>
@@ -80,9 +80,9 @@ logoutUser (IN  s seat_id);
 </varlistentry>
 </variablelist>
 </refsect2>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Login.switchUser">
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Login.switchUser">
   <title>The switchUser() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Login.switchUser"><primary sortas="Login.switchUser">org.tizen.Tlm.Login.switchUser()</primary></indexterm>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Login.switchUser"><primary sortas="Login.switchUser">org.O1.Tlm.Login.switchUser()</primary></indexterm>
 <programlisting>
 switchUser (IN  s     seat_id,
             IN  s     username,
diff --git a/src/common/dbus/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml b/src/common/dbus/tlm-dbus-session-doc-gen-org.O1.Tlm.Session.xml
new file mode 100644 (file)
index 0000000..7229d33
--- /dev/null
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+]>
+<refentry id="gdbus-org.O1.Tlm.Session">
+  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-O1-Tlm-Session.top_of_page">org.O1.Tlm.Session</refentrytitle>
+  <indexterm zone="gdbus-interface-org-O1-Tlm-Session.top_of_page"><primary sortas="Session">org.O1.Tlm.Session</primary></indexterm>
+  </refmeta>  <refnamediv>    <refname>org.O1.Tlm.Session</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
+    <title role="synopsis.title">Methods</title>
+    <synopsis>
+<link linkend="gdbus-method-org-O1-Tlm-Session.sessionCreate">sessionCreate</link>    (IN  s     password,
+                  IN  a{ss} environment);
+<link linkend="gdbus-method-org-O1-Tlm-Session.sessionTerminate">sessionTerminate</link> ();
+</synopsis>
+  </refsynopsisdiv>
+  <refsect1 role="signal_proto">
+    <title role="signal_proto.title">Signals</title>
+    <synopsis>
+<link linkend="gdbus-signal-org-O1-Tlm-Session.sessionCreated">sessionCreated</link>    (s     sessionid);
+<link linkend="gdbus-signal-org-O1-Tlm-Session.sessionTerminated">sessionTerminated</link> ();
+<link linkend="gdbus-signal-org-O1-Tlm-Session.error">error</link>             ((uis) error);
+<link linkend="gdbus-signal-org-O1-Tlm-Session.authenticated">authenticated</link>     ();
+</synopsis>
+  </refsect1>
+  <refsect1 role="properties">
+    <title role="properties.title">Properties</title>
+    <synopsis>
+<link linkend="gdbus-property-org-O1-Tlm-Session.seatid">seatid</link>     readwrite  s
+<link linkend="gdbus-property-org-O1-Tlm-Session.username">username</link>   readwrite  s
+<link linkend="gdbus-property-org-O1-Tlm-Session.service">service</link>    readwrite  s
+<link linkend="gdbus-property-org-O1-Tlm-Session.sessionid">sessionid</link>  readable   s
+</synopsis>
+  </refsect1>
+<refsect1 role="desc" id="gdbus-interface-org-O1-Tlm-Session">
+  <title role="desc.title">Description</title>
+  <para></para>
+</refsect1>
+<refsect1 role="details" id="gdbus-methods-org.O1.Tlm.Session">
+  <title role="details.title">Method Details</title>
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Session.sessionCreate">
+  <title>The sessionCreate() method</title>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Session.sessionCreate"><primary sortas="Session.sessionCreate">org.O1.Tlm.Session.sessionCreate()</primary></indexterm>
+<programlisting>
+sessionCreate (IN  s     password,
+               IN  a{ss} environment);
+</programlisting>
+<para></para>
+<variablelist role="params">
+<varlistentry>
+  <term><literal>IN s <parameter>password</parameter></literal>:</term>
+  <listitem><para></para></listitem>
+</varlistentry>
+<varlistentry>
+  <term><literal>IN a{ss} <parameter>environment</parameter></literal>:</term>
+  <listitem><para></para></listitem>
+</varlistentry>
+</variablelist>
+</refsect2>
+<refsect2 role="method" id="gdbus-method-org-O1-Tlm-Session.sessionTerminate">
+  <title>The sessionTerminate() method</title>
+  <indexterm zone="gdbus-method-org-O1-Tlm-Session.sessionTerminate"><primary sortas="Session.sessionTerminate">org.O1.Tlm.Session.sessionTerminate()</primary></indexterm>
+<programlisting>
+sessionTerminate ();
+</programlisting>
+<para></para>
+</refsect2>
+</refsect1>
+<refsect1 role="details" id="gdbus-signals-org.O1.Tlm.Session">
+  <title role="details.title">Signal Details</title>
+<refsect2 role="signal" id="gdbus-signal-org-O1-Tlm-Session.sessionCreated">
+  <title>The "sessionCreated" signal</title>
+  <indexterm zone="gdbus-signal-org-O1-Tlm-Session.sessionCreated"><primary sortas="Session::sessionCreated">org.O1.Tlm.Session::sessionCreated</primary></indexterm>
+<programlisting>
+sessionCreated (s sessionid);
+</programlisting>
+<para></para>
+<variablelist role="params">
+<varlistentry>
+  <term><literal>s <parameter>sessionid</parameter></literal>:</term>
+  <listitem><para></para></listitem>
+</varlistentry>
+</variablelist>
+</refsect2>
+<refsect2 role="signal" id="gdbus-signal-org-O1-Tlm-Session.sessionTerminated">
+  <title>The "sessionTerminated" signal</title>
+  <indexterm zone="gdbus-signal-org-O1-Tlm-Session.sessionTerminated"><primary sortas="Session::sessionTerminated">org.O1.Tlm.Session::sessionTerminated</primary></indexterm>
+<programlisting>
+sessionTerminated ();
+</programlisting>
+<para></para>
+</refsect2>
+<refsect2 role="signal" id="gdbus-signal-org-O1-Tlm-Session.error">
+  <title>The "error" signal</title>
+  <indexterm zone="gdbus-signal-org-O1-Tlm-Session.error"><primary sortas="Session::error">org.O1.Tlm.Session::error</primary></indexterm>
+<programlisting>
+error ((uis) error);
+</programlisting>
+<para></para>
+<variablelist role="params">
+<varlistentry>
+  <term><literal>(uis) <parameter>error</parameter></literal>:</term>
+  <listitem><para></para></listitem>
+</varlistentry>
+</variablelist>
+</refsect2>
+<refsect2 role="signal" id="gdbus-signal-org-O1-Tlm-Session.authenticated">
+  <title>The "authenticated" signal</title>
+  <indexterm zone="gdbus-signal-org-O1-Tlm-Session.authenticated"><primary sortas="Session::authenticated">org.O1.Tlm.Session::authenticated</primary></indexterm>
+<programlisting>
+authenticated ();
+</programlisting>
+<para></para>
+</refsect2>
+</refsect1>
+<refsect1 role="details" id="gdbus-properties-org.O1.Tlm.Session">
+  <title role="details.title">Property Details</title>
+<refsect2 role="property" id="gdbus-property-org-O1-Tlm-Session.seatid">
+  <title>The "seatid" property</title>
+  <indexterm zone="gdbus-property-org-O1-Tlm-Session.seatid"><primary sortas="Session:seatid">org.O1.Tlm.Session:seatid</primary></indexterm>
+<programlisting>
+seatid  readwrite  s
+</programlisting>
+<para></para>
+</refsect2>
+<refsect2 role="property" id="gdbus-property-org-O1-Tlm-Session.username">
+  <title>The "username" property</title>
+  <indexterm zone="gdbus-property-org-O1-Tlm-Session.username"><primary sortas="Session:username">org.O1.Tlm.Session:username</primary></indexterm>
+<programlisting>
+username  readwrite  s
+</programlisting>
+<para></para>
+</refsect2>
+<refsect2 role="property" id="gdbus-property-org-O1-Tlm-Session.service">
+  <title>The "service" property</title>
+  <indexterm zone="gdbus-property-org-O1-Tlm-Session.service"><primary sortas="Session:service">org.O1.Tlm.Session:service</primary></indexterm>
+<programlisting>
+service  readwrite  s
+</programlisting>
+<para></para>
+</refsect2>
+<refsect2 role="property" id="gdbus-property-org-O1-Tlm-Session.sessionid">
+  <title>The "sessionid" property</title>
+  <indexterm zone="gdbus-property-org-O1-Tlm-Session.sessionid"><primary sortas="Session:sessionid">org.O1.Tlm.Session:sessionid</primary></indexterm>
+<programlisting>
+sessionid  readable   s
+</programlisting>
+<para></para>
+</refsect2>
+</refsect1>
+</refentry>
+
diff --git a/src/common/dbus/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml b/src/common/dbus/tlm-dbus-session-doc-gen-org.tizen.Tlm.Session.xml
deleted file mode 100644 (file)
index d1eb63e..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.tizen.Tlm.Session">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-tizen-Tlm-Session.top_of_page">org.tizen.Tlm.Session</refentrytitle>
-  <indexterm zone="gdbus-interface-org-tizen-Tlm-Session.top_of_page"><primary sortas="Session">org.tizen.Tlm.Session</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.tizen.Tlm.Session</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-tizen-Tlm-Session.sessionCreate">sessionCreate</link>    (IN  s     password,
-                  IN  a{ss} environment);
-<link linkend="gdbus-method-org-tizen-Tlm-Session.sessionTerminate">sessionTerminate</link> ();
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-tizen-Tlm-Session.sessionCreated">sessionCreated</link>    (s     sessionid);
-<link linkend="gdbus-signal-org-tizen-Tlm-Session.sessionTerminated">sessionTerminated</link> ();
-<link linkend="gdbus-signal-org-tizen-Tlm-Session.error">error</link>             ((uis) error);
-<link linkend="gdbus-signal-org-tizen-Tlm-Session.authenticated">authenticated</link>     ();
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-tizen-Tlm-Session.seatid">seatid</link>     readwrite  s
-<link linkend="gdbus-property-org-tizen-Tlm-Session.username">username</link>   readwrite  s
-<link linkend="gdbus-property-org-tizen-Tlm-Session.service">service</link>    readwrite  s
-<link linkend="gdbus-property-org-tizen-Tlm-Session.sessionid">sessionid</link>  readable   s
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-tizen-Tlm-Session">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.tizen.Tlm.Session">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Session.sessionCreate">
-  <title>The sessionCreate() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Session.sessionCreate"><primary sortas="Session.sessionCreate">org.tizen.Tlm.Session.sessionCreate()</primary></indexterm>
-<programlisting>
-sessionCreate (IN  s     password,
-               IN  a{ss} environment);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>password</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN a{ss} <parameter>environment</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-tizen-Tlm-Session.sessionTerminate">
-  <title>The sessionTerminate() method</title>
-  <indexterm zone="gdbus-method-org-tizen-Tlm-Session.sessionTerminate"><primary sortas="Session.sessionTerminate">org.tizen.Tlm.Session.sessionTerminate()</primary></indexterm>
-<programlisting>
-sessionTerminate ();
-</programlisting>
-<para></para>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.tizen.Tlm.Session">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-tizen-Tlm-Session.sessionCreated">
-  <title>The "sessionCreated" signal</title>
-  <indexterm zone="gdbus-signal-org-tizen-Tlm-Session.sessionCreated"><primary sortas="Session::sessionCreated">org.tizen.Tlm.Session::sessionCreated</primary></indexterm>
-<programlisting>
-sessionCreated (s sessionid);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>s <parameter>sessionid</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-tizen-Tlm-Session.sessionTerminated">
-  <title>The "sessionTerminated" signal</title>
-  <indexterm zone="gdbus-signal-org-tizen-Tlm-Session.sessionTerminated"><primary sortas="Session::sessionTerminated">org.tizen.Tlm.Session::sessionTerminated</primary></indexterm>
-<programlisting>
-sessionTerminated ();
-</programlisting>
-<para></para>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-tizen-Tlm-Session.error">
-  <title>The "error" signal</title>
-  <indexterm zone="gdbus-signal-org-tizen-Tlm-Session.error"><primary sortas="Session::error">org.tizen.Tlm.Session::error</primary></indexterm>
-<programlisting>
-error ((uis) error);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>(uis) <parameter>error</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-tizen-Tlm-Session.authenticated">
-  <title>The "authenticated" signal</title>
-  <indexterm zone="gdbus-signal-org-tizen-Tlm-Session.authenticated"><primary sortas="Session::authenticated">org.tizen.Tlm.Session::authenticated</primary></indexterm>
-<programlisting>
-authenticated ();
-</programlisting>
-<para></para>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.tizen.Tlm.Session">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-tizen-Tlm-Session.seatid">
-  <title>The "seatid" property</title>
-  <indexterm zone="gdbus-property-org-tizen-Tlm-Session.seatid"><primary sortas="Session:seatid">org.tizen.Tlm.Session:seatid</primary></indexterm>
-<programlisting>
-seatid  readwrite  s
-</programlisting>
-<para></para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-tizen-Tlm-Session.username">
-  <title>The "username" property</title>
-  <indexterm zone="gdbus-property-org-tizen-Tlm-Session.username"><primary sortas="Session:username">org.tizen.Tlm.Session:username</primary></indexterm>
-<programlisting>
-username  readwrite  s
-</programlisting>
-<para></para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-tizen-Tlm-Session.service">
-  <title>The "service" property</title>
-  <indexterm zone="gdbus-property-org-tizen-Tlm-Session.service"><primary sortas="Session:service">org.tizen.Tlm.Session:service</primary></indexterm>
-<programlisting>
-service  readwrite  s
-</programlisting>
-<para></para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-tizen-Tlm-Session.sessionid">
-  <title>The "sessionid" property</title>
-  <indexterm zone="gdbus-property-org-tizen-Tlm-Session.sessionid"><primary sortas="Session:sessionid">org.tizen.Tlm.Session:sessionid</primary></indexterm>
-<programlisting>
-sessionid  readable   s
-</programlisting>
-<para></para>
-</refsect2>
-</refsect1>
-</refentry>
-
index a59e2b2..779a21c 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *
index 9d3d65d..2b3c02e 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *
index e78a3ed..01259de 100644 (file)
 /*
  * Common DBUS definitions
  */
-#define TLM_SERVICE_PREFIX       "org.tizen.Tlm"
+#define TLM_SERVICE_PREFIX       "org.O1.Tlm"
 #define TLM_SERVICE              TLM_SERVICE_PREFIX
-#define TLM_LOGIN_OBJECTPATH     "/org/tizen/Tlm/Login"
-#define TLM_SESSION_OBJECTPATH   "/org/tizen/Tlm/Session"
+#define TLM_LOGIN_OBJECTPATH     "/org/O1/Tlm/Login"
+#define TLM_SESSION_OBJECTPATH   "/org/O1/Tlm/Session"
 
 #define TLM_DBUS_FREEDESKTOP_SERVICE    "org.freedesktop.DBus"
 #define TLM_DBUS_FREEDESKTOP_PATH       "/org/freedesktop/DBus"
index 88089a6..c1d6193 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 53a795b..8986d51 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index f9dbaf2..052ada2 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 7e0eecf..76babe6 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 4f790b5..ffd1088 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *
@@ -89,7 +89,7 @@
  * A helper macro that creates a #GError with the proper tlm domain
  */
 
-#define _ERROR_PREFIX "org.tizen.Tlm.Error"
+#define _ERROR_PREFIX "org.O1.Tlm.Error"
 
 GDBusErrorEntry _tlm_errors[] =
 {
index 0e67720..270f207 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *
index ad3d8c2..9c71da3 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index ae0e79e..39800fb 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 67149ae..1a81709 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/inotify.h>
 #include <netdb.h>
 #include <string.h>
 #include <unistd.h>
+#include <glib/gstdio.h>
+#include <glib-unix.h>
+#include <errno.h>
 
 #include "tlm-utils.h"
 #include "tlm-log.h"
@@ -397,3 +401,280 @@ tlm_utils_split_command_lines (const GList const *commands_list) {
 
   return argv_list;
 }
+
+typedef struct {
+  int ifd;
+  GHashTable *dir_table; /* { gchar*: GList* } */
+  GHashTable *wd_table; /* { int: const gchar* } */
+  WatchCb cb;
+  gpointer userdata;
+} WatchInfo;
+
+static WatchInfo*
+_watch_info_new (
+    int ifd,
+    WatchCb cb,
+    gpointer userdata)
+{
+  WatchInfo *info = g_slice_new0 (WatchInfo);
+  info->ifd = ifd;
+  info->cb = cb;
+  info->userdata = userdata;
+  info->dir_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+  info->wd_table = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
+
+  return info;
+}
+
+static void
+_destroy_dir_table_entry (gpointer key, gpointer value, gpointer userdata) {
+  (void)key;
+  (void)userdata;
+  g_list_free_full ((GList *)value, g_free);
+}
+
+static void
+_destroy_wd_table_entry (gpointer key, gpointer value, gpointer userdata) {
+  (void)value;
+  int ifd = GPOINTER_TO_INT(userdata);
+  int wd = GPOINTER_TO_INT(key);
+
+  inotify_rm_watch (ifd, wd);
+}
+
+static void
+_watch_info_free (WatchInfo *info)
+{
+  if (!info) return;
+
+  if (info->dir_table) {
+    g_hash_table_foreach (info->dir_table, _destroy_dir_table_entry, NULL);
+    g_hash_table_unref (info->dir_table);
+  }
+  if (info->wd_table) {
+    g_hash_table_foreach (info->wd_table, _destroy_wd_table_entry,
+        GINT_TO_POINTER(info->ifd));
+    g_hash_table_unref (info->wd_table);
+  }
+  if (info->ifd) close(info->ifd);
+
+  g_slice_free (WatchInfo, info);
+}
+
+typedef enum {
+  WATCH_FAILED,
+  WATCH_ADDED,
+  WATCH_READY
+} AddWatchResults;
+  
+AddWatchResults
+_add_watch (int ifd, char *file_path, WatchInfo *info) {
+  GList *file_list = NULL;
+  int wd = 0;
+  gchar *file_name = NULL;
+  gchar *dir = NULL;
+  AddWatchResults res = WATCH_FAILED;
+
+  if (!file_path) return WATCH_FAILED;
+
+  file_name = g_path_get_basename (file_path);
+  if (!file_name) return WATCH_FAILED;
+
+  dir = g_path_get_dirname (file_path);
+  if (!dir) {
+    g_free (file_name);
+    return WATCH_FAILED;
+  }
+  if ((file_list = (GList *)g_hash_table_lookup (
+        info->dir_table, (gconstpointer)dir))) {
+    file_list = g_list_append (file_list, file_name);
+    g_free (dir);
+    return WATCH_ADDED;
+  }
+  file_list = g_list_append (NULL, file_name);
+  g_hash_table_insert (info->dir_table, g_strdup(dir), file_list);
+
+  /* add watch on directory if its not existing */
+  if (g_access (dir, 0)) {
+    return _add_watch (ifd, dir, info);
+  }
+
+  DBG("Adding watch for file '%s' in dir '%s'", file_name, dir);
+  if ((wd = inotify_add_watch (ifd, dir, IN_CREATE)) == -1) {
+    WARN ("failed to add inotify watch on %s: %s", dir, strerror (errno));
+    res = WATCH_FAILED;
+    goto remove_and_return;
+  }
+
+  if (!g_access (file_path, 0)) {
+    /* socket is ready, need not have a inotify watch for this */
+    inotify_rm_watch (ifd, wd);
+    res = WATCH_READY;
+    goto remove_and_return;
+  }
+
+  g_hash_table_insert (info->wd_table, GINT_TO_POINTER(wd), dir);
+
+  return WATCH_ADDED;
+
+remove_and_return:
+  g_hash_table_remove (info->dir_table, (gconstpointer)dir);
+  g_list_free_full (file_list, (GDestroyNotify)g_free);
+  
+  return res;
+}
+
+static gboolean
+_inotify_watcher_cb (gint ifd, GIOCondition condition, gpointer userdata)
+{
+  WatchInfo *info = (WatchInfo *)userdata;
+  struct inotify_event *ie = NULL;
+  gsize size = sizeof (struct inotify_event) + PATH_MAX + 1;
+  guint nwatch = g_hash_table_size (info->wd_table);
+
+  ie = (struct inotify_event *) g_slice_alloc0(size);
+  while (nwatch &&
+         read (ifd, ie, size) > (ssize_t)sizeof (struct inotify_event)) {
+    GList *file_list = NULL;
+    GList *element = NULL;
+    GList *pending_list = NULL;
+    gboolean is_first = FALSE;
+    gchar *file_path = NULL;
+    const gchar *dir = NULL;
+
+    dir = (gchar *)g_hash_table_lookup (
+        info->wd_table, GINT_TO_POINTER(ie->wd));
+    if (!dir) continue;
+
+    file_list = g_hash_table_lookup (info->dir_table, (gconstpointer)dir);
+    element = g_list_find_custom (file_list,
+        (gpointer)ie->name, (GCompareFunc)g_strcmp0);
+    if (!element) {
+      DBG("Ignoring '%s' file creation", ie->name);
+      continue;
+    }
+    is_first = (file_list == element);
+
+    g_free (element->data);
+    file_list = g_list_delete_link(file_list, element);
+    if (!file_list) {
+      g_hash_table_remove (info->dir_table, dir);
+      g_hash_table_remove (info->wd_table, GINT_TO_POINTER(ie->wd));
+      inotify_rm_watch (ifd, ie->wd);
+      nwatch--;
+    } else if (is_first) {
+      g_hash_table_insert (info->dir_table, g_strdup (dir), file_list);
+    }
+
+    file_path = g_build_filename (dir, ie->name, NULL);
+    if ((pending_list = (GList *)g_hash_table_lookup (info->dir_table,
+          (gconstpointer)file_path)) != NULL) {
+      GList *tmp = NULL;
+
+      // as we are about add real inotify watch, first remove from dir_table
+      g_hash_table_steal (info->dir_table, (gconstpointer)file_path);
+
+      // Add watches to all the files depend on this directory
+      for (tmp = pending_list; tmp; tmp = tmp->next) {
+        gchar *file_name = (gchar *)tmp->data;
+        gchar *new_file_path = g_build_filename (file_path, file_name, NULL);
+        AddWatchResults res = _add_watch (ifd, new_file_path, info);
+        if (res == WATCH_READY) {
+          if (info->cb) {
+            info->cb (new_file_path, nwatch == 0, NULL, info->userdata);
+          }
+        } else if (res == WATCH_ADDED) nwatch++;
+        else {
+          WARN ("Couldn't add watch on '%s'", new_file_path);
+        }
+        g_free (file_name);
+        g_free (new_file_path);
+      }
+      g_list_free (pending_list);
+    } else {
+      DBG("%s", file_path);
+      if (info->cb) info->cb (file_path, nwatch == 0, NULL, info->userdata);
+    }
+    g_free (file_path);
+  }
+
+  g_slice_free1 (size, ie);
+
+  return nwatch ? G_SOURCE_CONTINUE : G_SOURCE_REMOVE;
+}
+
+gchar *
+_expand_file_path (const gchar *file_path)
+{
+  gchar **items =NULL;
+  gchar **tmp_item =NULL;
+  gchar *expanded_path = NULL;
+
+  if (!file_path) return NULL;
+
+  /* nothing to expand
+   * FIXME: we are not considering filename which having \$ in it
+   */
+  if (g_strrstr (file_path, "$") == NULL) return g_strdup(file_path);
+
+  items = g_strsplit (file_path, G_DIR_SEPARATOR_S, -1);
+  /* soemthing wrong in file path */
+  if (!items) { return g_strdup (file_path); }
+
+  for (tmp_item = items; *tmp_item; tmp_item++) {
+    char *item = *tmp_item;
+    if (item[0] == '$') {
+      const gchar *env = g_getenv (item+1);
+      g_free (item);
+      *tmp_item = g_strdup (env ? env : "");
+    }
+  }
+  
+  expanded_path = g_strjoinv (G_DIR_SEPARATOR_S, items);
+
+  g_strfreev(items);
+
+  return expanded_path;
+}
+
+guint
+tlm_utils_watch_for_files (
+    const gchar **watch_list,
+    WatchCb cb,
+    gpointer userdata)
+{
+  gint nwatch = 0;
+  int ifd = 0;
+  WatchInfo *w_info = NULL;
+
+  if (!watch_list) return 0;
+
+  if ((ifd = inotify_init1 (IN_NONBLOCK | IN_CLOEXEC)) < 0) {
+    WARN("Failed to start inotify: %s", strerror(errno));
+    return 0;
+  }
+
+  w_info = _watch_info_new (ifd, cb, userdata);
+
+  for (; *watch_list; watch_list++) {
+    char *socket_path  = _expand_file_path (*watch_list);
+    AddWatchResults res = _add_watch (ifd, socket_path, w_info);
+    if (res == WATCH_FAILED) {
+      WARN ("Failed to watch for '%s'", socket_path);
+    } else if (res == WATCH_READY) {
+      gboolean is_final = !nwatch && !*(watch_list + 1);
+      if (cb) cb (socket_path, is_final, NULL, userdata);
+    } else {
+      nwatch++;
+    }
+  }
+
+  if (nwatch == 0) {
+    _watch_info_free (w_info);
+    return 0;
+  }
+
+  return g_unix_fd_add_full (G_PRIORITY_DEFAULT, ifd, G_IO_IN,
+      _inotify_watcher_cb, w_info, (GDestroyNotify)_watch_info_free);
+}
+
index d4118ca..488877d 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
@@ -57,10 +57,15 @@ void
 tlm_utils_log_utmp_entry (const gchar *username);
 
 gchar **
-tlm_utils_split_command_line(const gchar *command);
+tlm_utils_split_command_line (const gchar *command);
 
 GList *
-tlm_utils_split_command_lines(const GList const *commands_list);
+tlm_utils_split_command_lines (const GList const *commands_list);
+
+typedef void (*WatchCb) (const gchar *found_item, gboolean is_final, GError *error, gpointer userdata);
+
+guint
+tlm_utils_watch_for_files (const gchar **watch_list, WatchCb cb, gpointer userdata);
 
 G_END_DECLS
 
index 4211266..13519bf 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *
index 9529074..d8b14f4 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *
index dfd92ec..8a62e37 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2015 Intel Corporation.
  *
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
     g_type_init ();
 #endif
 
-    opt_context = g_option_context_new ("Tizen Login Manager");
+    opt_context = g_option_context_new ("Tiny Login Manager");
     g_option_context_add_main_entries (opt_context, opt_entries, NULL);
     g_option_context_parse (opt_context, &argc, &argv, &error);
     g_option_context_free (opt_context);
index 2cbfdd5..a644534 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2014 Intel Corporation.
  *
@@ -91,8 +91,6 @@ typedef struct _TlmSeatWatchClosure
     TlmManager *manager;
     gchar *seat_id;
     gchar *seat_path;
-    guint nwatch;
-    GList *watch_list;
 } TlmSeatWatchClosure;
 
 static void
@@ -520,47 +518,35 @@ _create_seat (TlmManager *manager,
     }
 }
 
-
-gboolean
-_seat_watch_cb (gint ifd, GIOCondition condition, gpointer user_data)
+static void
+_seat_watch_cb (
+    const gchar *watch_item,
+    gboolean is_final,
+    GError *error,
+    gpointer user_data)
 {
-    g_return_val_if_fail (user_data, G_SOURCE_REMOVE);
+    g_return_if_fail (watch_item && user_data);
+
     TlmSeatWatchClosure *closure = (TlmSeatWatchClosure *) user_data;
-    struct inotify_event *ievent;
-    gsize size_event;
-
-    size_event = sizeof (struct inotify_event) + PATH_MAX + 1;
-    ievent = (struct inotify_event *) g_malloc (size_event);
-    DBG ("seat %s inotify wakeup", closure->seat_id);
-    while (read (ifd, ievent, size_event) > (ssize_t) sizeof (struct inotify_event) &&
-           closure->nwatch) {
-        DBG ("seat %s notify for %s", closure->seat_id, ievent->name);
-        GList *res = g_list_find_custom (closure->watch_list, ievent->name,
-                                         (GCompareFunc) g_strcmp0);
-        if (res) {
-            DBG ("seat %s watch for %s succeeded, %u left",
-                 closure->seat_id, (gchar *) res->data, closure->nwatch - 1);
-            g_free (res->data);
-            closure->watch_list = g_list_delete_link (closure->watch_list, res);
-            inotify_rm_watch (ifd, ievent->wd);
-            closure->nwatch--;
-        }
+
+    if (error) {
+      WARN ("Error in notify %s on seat %s: %s", watch_item, closure->seat_id,
+          error->message);
+      g_error_free (error);
+      return;
     }
-    g_free (ievent);
-    if (!closure->nwatch) {
+
+    DBG ("seat %s notify for %s", closure->seat_id, watch_item);
+
+    if (is_final) {
         _create_seat (closure->manager, closure->seat_id, closure->seat_path);
-        close (ifd);
         g_object_unref (closure->manager);
         g_free (closure->seat_id);
         g_free (closure->seat_path);
-        g_list_free_full (closure->watch_list, g_free);
         g_free (closure);
-        return G_SOURCE_REMOVE;
     }
-    return G_SOURCE_CONTINUE;
 }
 
-
 static void
 _add_seat (TlmManager *manager, const gchar *seat_id, const gchar *seat_path)
 {
@@ -579,45 +565,29 @@ _add_seat (TlmManager *manager, const gchar *seat_id, const gchar *seat_path)
                                         TLM_CONFIG_SEAT_NWATCH,
                                         0);
     if (nwatch) {
-        GList *watch_list = NULL;
-        guint x, watch_len = 0;
-        int ifd = inotify_init1 (IN_NONBLOCK|IN_CLOEXEC);
-        if (ifd < 0)
-            ERR ("inotify_init(): %s", strerror (errno));
+        int x;
+        int watch_id = 0;
+        gchar **watch_items = g_new0 (gchar *, nwatch + 1);
         for (x = 0; x < nwatch; x++) {
-            gchar *watchx = g_strdup_printf ("%s%u",
-                                             TLM_CONFIG_SEAT_WATCHX,
-                                             x);
-            const gchar *watch_item = tlm_config_get_string (priv->config,
-                                                             seat_id,
-                                                             watchx);
-            g_free (watchx);
-            if (!watch_item)
-                continue;
-            gchar *watch_path = g_path_get_dirname (watch_item);
-            if (inotify_add_watch (ifd, watch_path, IN_CREATE) < 0)
-                WARN ("inotify_add_watch(): %s", strerror (errno));
-            g_free (watch_path);
-            if (g_access (watch_item, 0)) {
-                watch_list = g_list_append (watch_list,
-                                            g_path_get_basename (watch_item));
-                watch_len++;
-                DBG ("seat %s waiting for %s", seat_id, watch_item);
-            }
+          gchar *watchx = g_strdup_printf ("%s%u", TLM_CONFIG_SEAT_WATCHX, x);
+          watch_items[x] = (char *)tlm_config_get_string (
+              priv->config, seat_id, watchx);
+          g_free (watchx);
         }
-
-        if (watch_len) {
-            TlmSeatWatchClosure *watch_closure =
-                g_new0 (TlmSeatWatchClosure, 1);
-            watch_closure->manager = g_object_ref (manager);
-            watch_closure->seat_id = g_strdup (seat_id);
-            watch_closure->seat_path = g_strdup (seat_path);
-            watch_closure->nwatch = watch_len;
-            watch_closure->watch_list = watch_list;
-            g_unix_fd_add (ifd, G_IO_IN, _seat_watch_cb, watch_closure);
-            return;
+        watch_items[nwatch] = NULL;
+        TlmSeatWatchClosure *watch_closure = 
+            g_new0 (TlmSeatWatchClosure, 1);
+        watch_closure->manager = g_object_ref (manager);
+        watch_closure->seat_id = g_strdup (seat_id);
+        watch_closure->seat_path = g_strdup (seat_path);
+
+        watch_id = tlm_utils_watch_for_files (
+            (const gchar **)watch_items, _seat_watch_cb, watch_closure);
+        g_free (watch_items);
+        if (watch_id <= 0) {
+            WARN ("Failed to add watch on seat %s", seat_id);
         } else {
-            close (ifd);
+            return;
         }
     }
 
index 00c157d..4987fbe 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2014 Intel Corporation.
  *
index d461e35..01d6ed6 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2014 Intel Corporation.
  *
index eba6311..8e832ed 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2014 Intel Corporation.
  *
index 8decd52..6921e52 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *
index f8a6cfd..3dc0e16 100644 (file)
@@ -6,7 +6,7 @@ tlm_dbus_socket_path=@TLM_DBUS_SOCKET_PATH@
 tlm_dbus_root_socket_address=@TLM_DBUS_ROOT_SOCKET_ADDRESS@
 
 Name: TLM daemon
-Description: Tizen login management daemon
+Description: Tiny login management daemon
 Version: @PACKAGE_VERSION@
 URL: @PACKAGE_URL@
 Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0
index bd59f72..1195a76 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index bc0a624..cad948b 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index e9ba0f6..153b035 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
@@ -178,6 +178,6 @@ tlm_auth_plugin_default_init (TlmAuthPluginDefault *self)
         WARN ("assert(sigaction()) : %s", strerror(errno));
     }
 
-    tlm_log_init("TLM_AUTH_PLIGIN");
+    tlm_log_init("TLM_AUTH_PLUGIN");
 }
 
index 90d3233..cb18bf2 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 5609f94..1cf1b3a 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 8998f50..1c7cf90 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 44dde25..b6c8136 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 8108bab..1475785 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index b3617ad..484bced 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2014 Intel Corporation.
  *
index 3650039..7d7c071 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2014 Intel Corporation.
  *
index f62b18a..b3ee939 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2015 Intel Corporation.
  *
index a11d900..74e91d2 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013 Intel Corporation.
  *
index 4f9128f..3380d58 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *
index 3649b7d..e4a413a 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2013-2014 Intel Corporation.
  *
 #include "common/tlm-log.h"
 #include "common/tlm-utils.h"
 
-static void launch_from_file(const char *file) {
-  FILE *fp = NULL;
-  char str[1024];
-  GList *commands = NULL, *tmp_list = NULL;
-  GList *argv_list = NULL;
-  gchar **argv = NULL;
+typedef struct {
+  GPid pid;
+  guint watcher;
+} ChildInfo;
+
+typedef struct {
+  GMainLoop *loop;
+  FILE *fp;
+  guint socket_watcher;
+  GHashTable *childs; /* { pid_t:ChildInfo* } */
+} TlmLauncher;
+
+static void _tlm_launcher_process (TlmLauncher *l);
+
+static void
+_child_info_free (gpointer data)
+{
+  ChildInfo *info = (ChildInfo *)data;
+  if (info) {
+    g_spawn_close_pid (info->pid);
+    g_source_remove (info->watcher);
+    g_slice_free (ChildInfo, info);
+  }
+}
 
-  if (!(fp = fopen(file, "r"))) {
-    ERR("Failed to open file '%s':%s", file, strerror(errno));
-    return;
+static void
+_tlm_launcher_init (TlmLauncher *l)
+{
+  if (!l) return;
+  l->loop = g_main_loop_new (NULL, FALSE);
+  l->fp = NULL;
+  l->socket_watcher = 0;
+  l->childs = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+                                     NULL, _child_info_free);
+}
+
+static void
+_tlm_launcher_deinit (TlmLauncher *l)
+{
+  if (!l) return;
+
+  if (l->fp) {
+    fclose (l->fp);
+    l->fp = NULL;
   }
-  
-  while (fgets(str, sizeof(str) - 1, fp) != NULL) {
-    gchar *cmd = g_strstrip(str);
 
-    if (!strlen(cmd) || cmd[0] == '#') /* comment */
-      continue;
+  g_hash_table_unref (l->childs);
+  l->childs = 0;
 
-    INFO("COMMAND: %s(%u)\n", cmd, strlen(cmd));
-    commands = g_list_append(commands, g_strdup(cmd));
+  if (l->socket_watcher) {
+    g_source_remove (l->socket_watcher);
+    l->socket_watcher = 0;
   }
+}
 
-  fclose(fp);
+static void
+_on_child_down_cb (GPid pid, gint status, gpointer userdata)
+{
+  TlmLauncher *l = (TlmLauncher *)userdata;
 
-  argv_list = tlm_utils_split_command_lines(commands);
+  DBG("Child dead: %d", pid);
 
-  g_list_free_full(commands, g_free);
+  g_hash_table_remove (l->childs, GINT_TO_POINTER (pid));
 
-  if (g_list_length(argv_list) == 0) {
-    WARN("No valid commands found in file '%s'!!!", file);
-    return;
+  if (g_hash_table_size (l->childs) == 0) {
+    DBG("All childs dead, going down...");
+    kill (getpid(), SIGINT);
   }
+}
 
-  for (tmp_list = argv_list;
-       tmp_list && tmp_list->next;
-       tmp_list = tmp_list->next) {
-    pid_t child_pid = 0;
-
-    if (!(argv = (gchar **)tmp_list->data)) {
-      continue;
-    }
+static gboolean
+_continue_launch (gpointer userdata)
+{
+  _tlm_launcher_process ((TlmLauncher*)userdata);
+  return FALSE;
+}
 
-    if ((child_pid = fork()) < 0) {
-      ERR("fork() failed: %s", strerror(errno));
-    } else if (child_pid == 0) {
-      /* child process */
-      INFO("Launching command : %s, pid: %d, ppid: %d\n",
-              argv[0], getpid(), getppid());
-      execvp(argv[0], argv);
-      WARN("exec failed: %s", strerror(errno));
-      return;
-    }
 
-    g_strfreev(argv);
+static void
+_on_socket_ready (
+    const gchar *socket,
+    gboolean is_final,
+    GError *error,
+    gpointer userdata)
+{
+  DBG("Socket Ready; %s", socket);
+  if (is_final) {
+    ((TlmLauncher *)userdata)->socket_watcher = 0;
+    g_idle_add (_continue_launch, userdata);
   }
+}
 
-  if (!tmp_list) {
-    goto end;
-  }
+/*
+ * file syntax;
+ * M: command -> fork & exec and monitor child
+ * W: socket/file -> Wait for socket ready before moving forward
+ * L: command -> Launch process
+ */
 
-  argv = (gchar **)tmp_list->data;
-  if (!argv) {
-    goto end;
-  }
+static void _tlm_launcher_process (TlmLauncher *l)
+{
+  char str[1024];
+  gchar **argv = NULL;
+  gint wait = 0;
+  pid_t child_pid = 0;
 
-  INFO("Launching command : %s, pid: %d, ppid: %d\n",
-        argv[0], getpid(), getppid());
-  g_list_free(argv_list);
+  if (!l || !l->fp) return;
 
-  execvp(argv[0], argv);
+  while (fgets(str, sizeof(str) - 1, l->fp) != NULL) {
+    char control = 0;
+    gchar *cmd = g_strstrip(str);
 
-  g_strfreev(argv);
+    if (!strlen(cmd) || cmd[0] == '#') /* comment */
+      continue;
 
-  return;
+    INFO("Processing %s\n", cmd);
+    control = cmd[0];
+    cmd = g_strstrip (cmd + 2);
+    switch (control) {
+      case 'M':
+      case 'L':
+        argv = tlm_utils_split_command_line (cmd);
+        if ((child_pid = fork()) < 0) {
+          ERR("fork() failed: %s", strerror (errno));
+        } else if (child_pid == 0) {
+            /* child process */
+            INFO("Launching command : %s, pid: %d, ppid: %d\n",
+                argv[0], getpid (), getppid ());
+            execvp(argv[0], argv);
+            WARN("exec failed: %s", strerror (errno));
+        } else if (control == 'M') {
+          ChildInfo *info = g_slice_new0 (ChildInfo);
+          info->pid = child_pid;
+          info->watcher = g_child_watch_add (child_pid,
+              (GChildWatchFunc)_on_child_down_cb, l);
+          g_hash_table_insert (l->childs,
+              GINT_TO_POINTER(child_pid), info);
+        }
+        break;
+      case 'W': {
+        gchar **sockets = g_strsplit(cmd, ",", -1);
+        l->socket_watcher = tlm_utils_watch_for_files (
+            (const gchar **)sockets, _on_socket_ready, l);
+        g_strfreev (sockets);
+        if (l->socket_watcher) return;
+        }
+        break;
+      default:
+        WARN("Ignoring unknown control '%c' for command '%s'", control, cmd);
+    }
+  }
 
-end:
-  g_list_free(argv_list);
+  fclose (l->fp);
+  l->fp = NULL;
 }
 
-static void help() {
+static void help ()
+{
   g_print("Usage:\n"
           "\ttlm-launcher -f script_file  - Launch commands from script_file.\n"
           "\t             -h              - Print this help message.\n");
 }
 
-int main(int argc, char *argv[]) {
+int main (int argc, char *argv[])
+{
   struct option opts[] = {
     { "file", required_argument, NULL, 'f' },
     { "help", no_argument, NULL, 'h' },
@@ -129,10 +208,11 @@ int main(int argc, char *argv[]) {
   };
   int i, c;
   char *file = NULL;
+  TlmLauncher launcher;
 
   tlm_log_init("tlm-launch");
 
-  while ((c = getopt_long(argc, argv, "f:h", opts, &i)) != -1) {
+  while ((c = getopt_long (argc, argv, "f:h", opts, &i)) != -1) {
     switch(c) {
       case 'h':
         help();
@@ -148,9 +228,21 @@ int main(int argc, char *argv[]) {
     return 0;
   }
 
+  _tlm_launcher_init (&launcher);
+
+  if (!(launcher.fp = fopen(file, "r"))) {
+    ERR("Failed to open file '%s':%s", file, strerror(errno));
+    _tlm_launcher_deinit (&launcher);
+    return 0;
+  }
+
   INFO("PID: %d\n", getpid());
 
-  launch_from_file(file);
+  _tlm_launcher_process (&launcher);
+
+  g_main_loop_run (launcher.loop);
+
+  _tlm_launcher_deinit (&launcher);
 
   return 0;
 }
index 51c4811..3b00ed1 100644 (file)
@@ -1,7 +1,7 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of tlm (Tizen Login Manager)
+ * This file is part of tlm (Tiny Login Manager)
  *
  * Copyright (C) 2014 Intel Corporation.
  *