From 405a6969a0b2409d5f013e8d2845945b51146eb9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Nov 2015 22:07:18 +0100 Subject: Fork from Ubuntu's indicator-session project. --- data/CMakeLists.txt | 17 +++++----- data/ayatana-indicator-session.conf.in | 9 ++++++ data/ayatana-indicator-session.desktop.in | 9 ++++++ data/ayatana-indicator-session.upstart.desktop.in | 9 ++++++ data/com.canonical.indicator.session | 16 ---------- .../com.canonical.indicator.session.gschema.xml.in | 36 ---------------------- data/indicator-session.conf.in | 9 ------ data/indicator-session.convert | 5 --- data/indicator-session.desktop.in | 9 ------ data/indicator-session.upstart.desktop.in | 9 ------ data/org.ayatana.indicator.session | 16 ++++++++++ data/org.ayatana.indicator.session.gschema.xml.in | 36 ++++++++++++++++++++++ 12 files changed, 87 insertions(+), 93 deletions(-) create mode 100644 data/ayatana-indicator-session.conf.in create mode 100644 data/ayatana-indicator-session.desktop.in create mode 100644 data/ayatana-indicator-session.upstart.desktop.in delete mode 100644 data/com.canonical.indicator.session delete mode 100644 data/com.canonical.indicator.session.gschema.xml.in delete mode 100644 data/indicator-session.conf.in delete mode 100644 data/indicator-session.convert delete mode 100644 data/indicator-session.desktop.in delete mode 100644 data/indicator-session.upstart.desktop.in create mode 100644 data/org.ayatana.indicator.session create mode 100644 data/org.ayatana.indicator.session.gschema.xml.in (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index a6a2e9f..395ffb2 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,7 +4,7 @@ include (UseGSettings) ## GSettings schema ## -set (SCHEMA_NAME "com.canonical.indicator.session.gschema.xml") +set (SCHEMA_NAME "org.ayatana.indicator.session.gschema.xml") set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") @@ -79,18 +79,18 @@ install (FILES "${UPSTART_XDG_AUTOSTART_FILE}" RENAME "${XDG_AUTOSTART_NAME}") ## -## Unity Indicator File +## Ayatana Indicator File ## # where to install -set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators") -message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir") +set (AYATANA_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators") +message (STATUS "${AYATANA_INDICATOR_DIR} is the Ayatana Indicator install dir") -set (UNITY_INDICATOR_NAME "com.canonical.indicator.session") -set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}") +set (AYATANA_INDICATOR_NAME "org.ayatana.indicator.session") +set (AYATANA_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${AYATANA_INDICATOR_NAME}") -install (FILES "${UNITY_INDICATOR_FILE}" - DESTINATION "${UNITY_INDICATOR_DIR}") +install (FILES "${AYATANA_INDICATOR_FILE}" + DESTINATION "${AYATANA_INDICATOR_DIR}") ## @@ -112,4 +112,3 @@ install (DIRECTORY icons install(CODE "execute_process (COMMAND gtk-update-icon-cache -t -f ${ICON_DIR})" CODE "message (STATUS \"Updating icon cache\")") - diff --git a/data/ayatana-indicator-session.conf.in b/data/ayatana-indicator-session.conf.in new file mode 100644 index 0000000..d6474f4 --- /dev/null +++ b/data/ayatana-indicator-session.conf.in @@ -0,0 +1,9 @@ +description "Ayatana Indicator Session Service" + +start on ayatana-indicator-services-start +stop on desktop-end or ayatana-indicator-services-end + +respawn +respawn limit 2 10 + +exec @pkglibexecdir@/ayatana-indicator-session-service diff --git a/data/ayatana-indicator-session.desktop.in b/data/ayatana-indicator-session.desktop.in new file mode 100644 index 0000000..2ce63e0 --- /dev/null +++ b/data/ayatana-indicator-session.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Ayatana Indicator Session +Exec=@pkglibexecdir@/ayatana-indicator-session-service +OnlyShowIn=Unity;GNOME; +NoDisplay=true +StartupNotify=false +Terminal=false +AutostartCondition=GNOME3 unless-session gnome diff --git a/data/ayatana-indicator-session.upstart.desktop.in b/data/ayatana-indicator-session.upstart.desktop.in new file mode 100644 index 0000000..f1f70e1 --- /dev/null +++ b/data/ayatana-indicator-session.upstart.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Indicator Session +Exec=@pkglibexecdir@/ayatana-indicator-session-service +OnlyShowIn=Unity; +NoDisplay=true +StartupNotify=false +Terminal=false +Hidden=true diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session deleted file mode 100644 index e2ec730..0000000 --- a/data/com.canonical.indicator.session +++ /dev/null @@ -1,16 +0,0 @@ -[Indicator Service] -Name=indicator-session -ObjectPath=/com/canonical/indicator/session -Position=10 - -[desktop] -ObjectPath=/com/canonical/indicator/session/desktop - -[desktop_greeter] -ObjectPath=/com/canonical/indicator/session/desktop_greeter - -[desktop_lockscreen] -ObjectPath=/com/canonical/indicator/session/desktop_lockscreen - -[ubiquity] -ObjectPath=/com/canonical/indicator/session/desktop_greeter diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in deleted file mode 100644 index d5e852e..0000000 --- a/data/com.canonical.indicator.session.gschema.xml.in +++ /dev/null @@ -1,36 +0,0 @@ - - - - false - <_summary>Suppress the dialog to confirm logout, restart and shutdown action - <_description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions. - - - false - <_summary>Remove the Log Out item from the session menu - <_description>Makes it so that the logout button doesn’t show in the session menu. - - - false - <_summary>Remove the Restart item from the session menu - <_description>Makes it so that the restart button doesn’t show in the session menu. - - - false - <_summary>Remove the shutdown item from the session menu - <_description>Makes it so that the shutdown button doesn’t show in the session menu. - - - false - Determine the visibility of the User's real name on the panel - Allow for the Removal of the users name from the panel - - - true - Show the list of users - Allow for the user list to be hidden by the user. - - - - - diff --git a/data/indicator-session.conf.in b/data/indicator-session.conf.in deleted file mode 100644 index c7530e3..0000000 --- a/data/indicator-session.conf.in +++ /dev/null @@ -1,9 +0,0 @@ -description "Indicator Session Service" - -start on indicator-services-start -stop on desktop-end or indicator-services-end - -respawn -respawn limit 2 10 - -exec @pkglibexecdir@/indicator-session-service diff --git a/data/indicator-session.convert b/data/indicator-session.convert deleted file mode 100644 index c98eddb..0000000 --- a/data/indicator-session.convert +++ /dev/null @@ -1,5 +0,0 @@ -[com.canonical.indicator.session] -suppress-logout-restart-shutdown = /apps/indicator-session/suppress_logout_restart_shutdown -suppress-logout-menuitem = /apps/indicator-session/suppress_logout_menuitem -suppress-restart-menuitem = /apps/indicator-session/suppress_restart_menuitem -suppress-shutdown-menuitem = /apps/indicator-session/suppress_shutdown_menuitem diff --git a/data/indicator-session.desktop.in b/data/indicator-session.desktop.in deleted file mode 100644 index 10dcadd..0000000 --- a/data/indicator-session.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Session -Exec=@pkglibexecdir@/indicator-session-service -OnlyShowIn=Unity;GNOME; -NoDisplay=true -StartupNotify=false -Terminal=false -AutostartCondition=GNOME3 unless-session gnome diff --git a/data/indicator-session.upstart.desktop.in b/data/indicator-session.upstart.desktop.in deleted file mode 100644 index f4970f6..0000000 --- a/data/indicator-session.upstart.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Session -Exec=@pkglibexecdir@/indicator-session-service -OnlyShowIn=Unity; -NoDisplay=true -StartupNotify=false -Terminal=false -Hidden=true diff --git a/data/org.ayatana.indicator.session b/data/org.ayatana.indicator.session new file mode 100644 index 0000000..f8a29b7 --- /dev/null +++ b/data/org.ayatana.indicator.session @@ -0,0 +1,16 @@ +[Indicator Service] +Name=ayatana-indicator-session +ObjectPath=/org/ayatana/indicator/session +Position=10 + +[desktop] +ObjectPath=/org/ayatana/indicator/session/desktop + +[desktop_greeter] +ObjectPath=/org/ayatana/indicator/session/desktop_greeter + +[desktop_lockscreen] +ObjectPath=/org/ayatana/indicator/session/desktop_lockscreen + +[ubiquity] +ObjectPath=/org/ayatana/indicator/session/desktop_greeter diff --git a/data/org.ayatana.indicator.session.gschema.xml.in b/data/org.ayatana.indicator.session.gschema.xml.in new file mode 100644 index 0000000..0a83afe --- /dev/null +++ b/data/org.ayatana.indicator.session.gschema.xml.in @@ -0,0 +1,36 @@ + + + + false + <_summary>Suppress the dialog to confirm logout, restart and shutdown action + <_description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions. + + + false + <_summary>Remove the Log Out item from the session menu + <_description>Makes it so that the logout button doesn’t show in the session menu. + + + false + <_summary>Remove the Restart item from the session menu + <_description>Makes it so that the restart button doesn’t show in the session menu. + + + false + <_summary>Remove the shutdown item from the session menu + <_description>Makes it so that the shutdown button doesn’t show in the session menu. + + + false + Determine the visibility of the User's real name on the panel + Allow for the Removal of the users name from the panel + + + true + Show the list of users + Allow for the user list to be hidden by the user. + + + + + -- cgit v1.2.3