diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/CMakeLists.txt | 9 | ||||
-rw-r--r-- | data/ayatana-indicator-notifications.desktop.in | 2 | ||||
-rw-r--r-- | data/ayatana-indicator-notifications.service.in | 2 | ||||
-rw-r--r-- | data/org.ayatana.indicator.notifications.gschema.xml (renamed from data/org.ayatana.indicator.notifications.gschema.xml.in) | 12 | ||||
-rw-r--r-- | data/org.ayatana.indicator.notifications.gschema.xml.in.in | 40 |
5 files changed, 8 insertions, 57 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 3fb8430..c81ac7b 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,13 +3,6 @@ ## set (SCHEMA_NAME "org.ayatana.indicator.notifications.gschema.xml") -set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") -set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") - -# generate the .xml file using intltool -find_package(Intltool REQUIRED) -set (ENV{LC_ALL} "C") -intltool_merge_translations("${SCHEMA_FILE_IN}" "${SCHEMA_FILE}" ALL UTF8 STYLE "xml" NO_TRANSLATIONS) # let GSettings do the rest find_package(GSettings REQUIRED) @@ -29,7 +22,6 @@ if (${SYSTEMD_FOUND}) set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in") # build it - set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}") # install it @@ -50,7 +42,6 @@ set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}") set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in") # build it -set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}") # install it diff --git a/data/ayatana-indicator-notifications.desktop.in b/data/ayatana-indicator-notifications.desktop.in index 7dac4fd..4a085a7 100644 --- a/data/ayatana-indicator-notifications.desktop.in +++ b/data/ayatana-indicator-notifications.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Ayatana Indicator Notifications -Exec=@pkglibexecdir@/ayatana-indicator-notifications-service +Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-notifications/ayatana-indicator-notifications-service OnlyShowIn=Unity;MATE;XFCE; NoDisplay=true StartupNotify=false diff --git a/data/ayatana-indicator-notifications.service.in b/data/ayatana-indicator-notifications.service.in index 223cea9..f0207ee 100644 --- a/data/ayatana-indicator-notifications.service.in +++ b/data/ayatana-indicator-notifications.service.in @@ -4,7 +4,7 @@ PartOf=graphical-session.target PartOf=ayatana-indicators.target [Service] -ExecStart=@pkglibexecdir@/ayatana-indicator-notifications-service +ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-notifications/ayatana-indicator-notifications-service Restart=on-failure [Install] diff --git a/data/org.ayatana.indicator.notifications.gschema.xml.in b/data/org.ayatana.indicator.notifications.gschema.xml index b85f14b..c0e4901 100644 --- a/data/org.ayatana.indicator.notifications.gschema.xml.in +++ b/data/org.ayatana.indicator.notifications.gschema.xml @@ -1,9 +1,9 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.ayatana.indicator.notifications" path="/org/ayatana/indicator/notifications/"> +<schemalist> + <schema gettext-domain="ayatana-indicator-notifications" id="org.ayatana.indicator.notifications" path="/org/ayatana/indicator/notifications/"> <key name="filter-list" type="as"> <default>[]</default> - <_summary>Discard notifications by application name</_summary> - <_description>If an application name is in the filter list, all notifications matching the application name will be discarded.</_description> + <summary>Discard notifications by application name</summary> + <description>If an application name is in the filter list, all notifications matching the application name will be discarded.</description> </key> <key name="filter-list-hints" type="as"> <default>[]</default> @@ -18,8 +18,8 @@ <key name="max-items" type="i"> <range min="1" max="10"/> <default>5</default> - <_summary>Maximum number of visible items</_summary> - <_description>The indicator will only display at most the number of notifications indicated by this value.</_description> + <summary>Maximum number of visible items</summary> + <description>The indicator will only display at most the number of notifications indicated by this value.</description> </key> </schema> </schemalist> diff --git a/data/org.ayatana.indicator.notifications.gschema.xml.in.in b/data/org.ayatana.indicator.notifications.gschema.xml.in.in deleted file mode 100644 index 280cc2b..0000000 --- a/data/org.ayatana.indicator.notifications.gschema.xml.in.in +++ /dev/null @@ -1,40 +0,0 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.ayatana.indicator.notifications" path="/org/ayatana/indicator/notifications/"> - <key name="filter-list" type="as"> - <default>[]</default> - <_summary>Discard notifications by application name</_summary> - <_description>If an application name is in the filter list, all notifications matching the application name will be discarded.</_description> - </key> - <key name="filter-list-hints" type="as"> - <default>[]</default> - <summary>Recent application names to suggest for the filter list</summary> - <description>Keeps track of recent application names so we can suggest them in the settings.</description> - </key> - <key name="clear-on-middle-click" type="b"> - <default>false</default> - <_summary>Clear notifications on middle click</_summary> - <_description>Normally when middle clicking the notification icon, the unread status will be toggled if the queue is not empty. With this option enabled, the notification queue will be cleared instead.</_description> - </key> - <key name="do-not-disturb" type="b"> - <default>false</default> - <summary>Enable do-not-disturb mode</summary> - <description>On supported desktops enables do-not-disturb mode on the notification daemon.</description> - </key> - <key name="hide-indicator" type="b"> - <default>false</default> - <_summary>Hide the indicator</_summary> - <_description>If true, the indicator is hidden.</_description> - </key> - <key name="max-items" type="i"> - <range min="1" max="10"/> - <default>5</default> - <_summary>Maximum number of visible items</_summary> - <_description>The indicator will only display at most the number of notifications indicated by this value.</_description> - </key> - <key name="swap-clear-settings" type="b"> - <default>false</default> - <summary>Swap the Clear and Settings items in the menu</summary> - <description>This will move the Clear option to the bottom of the menu, below the Settings item.</description> - </key> - </schema> -</schemalist> |