[nautilus] gschema: move to /data



commit 9d3e07c6d400a92ec88af18a8aced8c6878bb727
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed Dec 16 12:57:04 2015 +0100

    gschema: move to /data
    
    To be more clear and follow a similar structure than gedit.
    
    Also remove tabs sneakily...

 data/Makefile.am                                   |    5 +++++
 .../org.gnome.nautilus.gschema.xml                 |    4 ++--
 libnautilus-private/Makefile.am                    |    5 -----
 po/POTFILES.in                                     |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 41f8bd0..1db62a7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,12 +34,17 @@ org.freedesktop.FileManager1.service: org.freedesktop.FileManager1.service.in Ma
 searchproviderdir = $(datadir)/gnome-shell/search-providers
 searchprovider_DATA = nautilus-search-provider.ini
 
+gsettings_SCHEMAS = org.gnome.nautilus.gschema.xml
+
+ GSETTINGS_RULES@
+
 EXTRA_DIST =                           \
        org.gnome.Nautilus.desktop      \
        org.gnome.Nautilus.desktop.in   \
        dbus-interfaces.xml             \
        freedesktop-dbus-interfaces.xml \
        shell-search-provider-dbus-interfaces.xml \
+       $(gsettings_SCHEMAS)     \
        $(desktop_in_files)             \
        $(service_in_files)             \
        $(autostart_in_files)           \
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml b/data/org.gnome.nautilus.gschema.xml
similarity index 99%
rename from libnautilus-private/org.gnome.nautilus.gschema.xml
rename to data/org.gnome.nautilus.gschema.xml
index 7c24969..9aece59 100644
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml
+++ b/data/org.gnome.nautilus.gschema.xml
@@ -60,7 +60,7 @@
   <schema path="/org/gnome/nautilus/preferences/" id="org.gnome.nautilus.preferences" 
gettext-domain="nautilus">
     <key name="tabs-open-position" enum="org.gnome.nautilus.TabPosition">
       <aliases>
-       <alias value='after_current_tab' target='after-current-tab'/>
+        <alias value='after_current_tab' target='after-current-tab'/>
       </aliases>
       <default>'after-current-tab'</default>
       <summary>Where to position newly open tabs in browser windows.</summary>
@@ -145,7 +145,7 @@
     </key>
     <key name="default-sort-order" enum="org.gnome.nautilus.SortOrder">
       <aliases>
-       <alias value='modification_date' target='mtime'/>
+        <alias value='modification_date' target='mtime'/>
       </aliases>
       <default>'name'</default>
       <summary>Default sort order</summary>
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index d42d7b6..166744d 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -187,12 +187,7 @@ nodist_libnautilus_private_la_SOURCES =\
        $(BUILT_SOURCES) \
        $(NULL)
 
-gsettings_SCHEMAS = org.gnome.nautilus.gschema.xml
-
- GSETTINGS_RULES@
-
 EXTRA_DIST =                           \
-       $(gsettings_SCHEMAS)     \
        $(TRACKER_SOURCES)              \
        nautilus-private-enum-types.h.template  \
        nautilus-private-enum-types.c.template  \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ffa78b4..cf68058 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,7 @@
 data/org.gnome.Nautilus.appdata.xml.in
 data/nautilus-autorun-software.desktop.in.in
 data/org.gnome.Nautilus.desktop.in.in
+data/org.gnome.nautilus.gschema.xml
 eel/eel-canvas.c
 eel/eel-glib-extensions.c
 eel/eel-gnome-extensions.c
@@ -41,7 +42,6 @@ libnautilus-private/nautilus-search-directory-file.c
 libnautilus-private/nautilus-search-engine.c
 libnautilus-private/nautilus-tree-view-drag-dest.c
 libnautilus-private/nautilus-vfs-file.c
-libnautilus-private/org.gnome.nautilus.gschema.xml
 nautilus-sendto-extension/nautilus-nste.c
 src/nautilus-application-actions.c
 src/nautilus-application.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]