Commit 0b0c7176 authored by Balló György's avatar Balló György 🇭🇺 Committed by Alberts Muktupāvels
Browse files

data: add custom directory files

Settings and Settings-System directories was removed from gnome-menus:
https://git.gnome.org/browse/gnome-menus/commit/?id=b68bcd27f44ce2c494f6e3cd9695890b9c02af04

https://bugzilla.gnome.org/show_bug.cgi?id=754962
parent 16d91366
......@@ -42,6 +42,17 @@ xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
%.desktop: %.desktop.in
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t -d $(top_srcdir)/po && mv $@-t $@
directorydir = $(datadir)/desktop-directories
directory_in_files = \
X-GNOME-Flashback-Settings.directory.desktop.in \
X-GNOME-Flashback-Settings-System.directory.desktop.in
directory_DATA = $(directory_in_files:.directory.desktop.in=.directory)
%.directory: %.directory.desktop.in
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t -d $(top_srcdir)/po && mv $@-t $@
gsettings_SCHEMAS = org.gnome.gnome-flashback.gschema.xml
@GSETTINGS_RULES@
......@@ -52,6 +63,7 @@ EXTRA_DIST = \
$(session_in_files) \
$(xsession_in_in_files) \
$(gsettings_SCHEMAS) \
$(directory_in_files) \
$(NULL)
CLEANFILES = \
......@@ -63,6 +75,7 @@ CLEANFILES = \
$(xsession_in_files) \
$(xsession_DATA) \
*.gschema.valid \
$(directory_DATA) \
$(NULL)
-include $(top_srcdir)/git.mk
[Desktop Entry]
Type=Directory
Name=Administration
Comment=Change system-wide settings (affects all users)
Icon=preferences-system
[Desktop Entry]
Name=Preferences
Comment=Personal preferences
Icon=preferences-desktop
Type=Directory
......@@ -152,7 +152,7 @@
</Include>
<Menu>
<Name>Preferences</Name>
<Directory>Settings.directory</Directory>
<Directory>X-GNOME-Flashback-Settings.directory</Directory>
<Include>
<And>
<Category>Settings</Category>
......@@ -209,7 +209,7 @@
</Menu>
<Menu>
<Name>Administration</Name>
<Directory>Settings-System.directory</Directory>
<Directory>X-GNOME-Flashback-Settings-System.directory</Directory>
<Include>
<And>
<Category>Settings</Category>
......
......@@ -9,6 +9,8 @@ data/gnome-flashback-metacity.session.in
data/gnome-flashback-nm-applet.desktop.in
data/gnome-flashback-screensaver.desktop.in
data/org.gnome.gnome-flashback.gschema.xml
data/X-GNOME-Flashback-Settings.directory.desktop.in
data/X-GNOME-Flashback-Settings-System.directory.desktop.in
gnome-flashback/gf-main.c
gnome-flashback/libautomount-manager/gsd-automount-manager.c
gnome-flashback/libautomount-manager/gsd-autorun.c
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment