[gnome-flashback] data: add custom directory files

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 0b0c71765f44b0c18103373025b6cbc7c777ab95
Author: Balló György <ballogyor gmail com>
Date:   Sun Sep 13 21:02:59 2015 +0200

    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

 data/Makefile.am                                   |   13 +++++++++++++
 ...-Flashback-Settings-System.directory.desktop.in |    5 +++++
 ...X-GNOME-Flashback-Settings.directory.desktop.in |    5 +++++
 data/gnome-flashback-applications.menu             |    4 ++--
 po/POTFILES.in                                     |    2 ++
 5 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 352a98d..f5a584a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -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
diff --git a/data/X-GNOME-Flashback-Settings-System.directory.desktop.in 
b/data/X-GNOME-Flashback-Settings-System.directory.desktop.in
new file mode 100644
index 0000000..b5506e5
--- /dev/null
+++ b/data/X-GNOME-Flashback-Settings-System.directory.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Name=Administration
+Comment=Change system-wide settings (affects all users)
+Icon=preferences-system
diff --git a/data/X-GNOME-Flashback-Settings.directory.desktop.in 
b/data/X-GNOME-Flashback-Settings.directory.desktop.in
new file mode 100644
index 0000000..ed1a087
--- /dev/null
+++ b/data/X-GNOME-Flashback-Settings.directory.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Preferences
+Comment=Personal preferences
+Icon=preferences-desktop
+Type=Directory
diff --git a/data/gnome-flashback-applications.menu b/data/gnome-flashback-applications.menu
index 3e352e5..2776851 100644
--- a/data/gnome-flashback-applications.menu
+++ b/data/gnome-flashback-applications.menu
@@ -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>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a60a80c..a8c5900 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -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