GNOME.org
 

[file-roller] Fix GSettings schema validation with recent GLib

commit 37df6d640817127dbad0f9ba94141cfb1e6a8360
Author: David King <dking redhat com>
Date:   Thu May 5 10:12:19 2016 +0100

    Fix GSettings schema validation with recent GLib
    
    Recent versions of GLib (2.45.1 and above) made a change to
    glib-compile-schemas that rejects schemas with duplicate summary or
    description elements.
    
    Depend on a version of intltool with native GSettings support, and use
    that instead of merging the translations back into the schema.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=756607

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |   16 +-----
 ...ema.xml.in => org.gnome.FileRoller.gschema.xml} |   60 ++++++++++----------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 34 insertions(+), 46 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 51ab26a..f90570c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,7 @@ AC_DEFINE_UNQUOTED(CPIO_PATH, "${CPIO}", [Path to cpio])
 
 dnl ******************************
 
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 GETTEXT_PACKAGE=file-roller
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/data/Makefile.am b/data/Makefile.am
index 33f1edd..63b6ecd 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,9 +15,7 @@ service_DATA = $(service_in_files:.service.in=.service)
 %.service : %.service.in Makefile
        $(AM_V_GEN) $(SED) -e "s|\ bindir\@|$(bindir)|" $< > $@
 
-gsettingsschema_in_files = org.gnome.FileRoller.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-.PRECIOUS: $(gsettings_SCHEMAS)
+gsettings_SCHEMAS = org.gnome.FileRoller.gschema.xml
 
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
@@ -25,13 +23,8 @@ appdata_in_files = org.gnome.FileRoller.appdata.xml.in
 
 @INTLTOOL_XML_RULE@
 
- INTLTOOL_XML_NOMERGE_RULE@
-
 @GSETTINGS_RULES@
 
-%.gschema.xml: %.gschema.xml.in
-       $(AM_V_GEN) $(INTLTOOL_MERGE) -x -u --no-translations $< $@
-
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = file-roller.convert
 
@@ -58,7 +51,7 @@ EXTRA_DIST =                          \
        $(desktop_in_in_files)          \
        $(desktop_in_files)             \
        $(desktop_DATA)                 \
-       $(gsettingsschema_in_files)     \
+       $(gsettings_SCHEMAS)            \
        $(service_in_files)             \
        $(NULL)
 
@@ -69,14 +62,9 @@ DISTCLEANFILES =                     \
        $(service_DATA)                 \
        $(NULL)
 
-CLEANFILES =                           \
-        $(gsettings_SCHEMAS)           \
-        $(NULL)
-
 dist-hook:
 if DESKTOP_VALIDATE
        desktop-file-validate $(desktop_DATA)
 endif
-       cd $(distdir); rm -f $(CLEANFILES)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.FileRoller.gschema.xml.in b/data/org.gnome.FileRoller.gschema.xml
similarity index 73%
rename from data/org.gnome.FileRoller.gschema.xml.in
rename to data/org.gnome.FileRoller.gschema.xml
index db632a8..5e74ca6 100644
--- a/data/org.gnome.FileRoller.gschema.xml.in
+++ b/data/org.gnome.FileRoller.gschema.xml
@@ -55,43 +55,43 @@
   <schema id="org.gnome.FileRoller.Listing" path="/org/gnome/file-roller/listing/" 
gettext-domain="file-roller">
     <key name="sort-method" enum="org.gnome.FileRoller.SortMethod">
       <default>'name'</default>
-      <_summary>How to sort files</_summary>
-      <_description>What criteria must be used to arrange files. Possible values: name, size, type, time, 
path.</_description>
+      <summary>How to sort files</summary>
+      <description>What criteria must be used to arrange files. Possible values: name, size, type, time, 
path.</description>
     </key>
     <key name="sort-type" enum="org.gnome.FileRoller.SortType">
       <default>'ascending'</default>
-      <_summary>Sort type</_summary>
-      <_description>Whether to sort in ascending or descending direction. Possible values: ascending, 
descending.</_description>
+      <summary>Sort type</summary>
+      <description>Whether to sort in ascending or descending direction. Possible values: ascending, 
descending.</description>
     </key>
     <key name="list-mode" enum="org.gnome.FileRoller.ListMode">
       <default>'as-folder'</default>
-      <_summary>List Mode</_summary>
-      <_description>Use 'all-files' to view all the files in the archive in a single list, use 'as-folder' 
to navigate the archive as a folder.</_description>
+      <summary>List Mode</summary>
+      <description>Use 'all-files' to view all the files in the archive in a single list, use 'as-folder' to 
navigate the archive as a folder.</description>
     </key>
     <key name="show-type" type="b">
       <default>true</default>
-      <_summary>Display type</_summary>
-      <_description>Display the type column in the main window.</_description>
+      <summary>Display type</summary>
+      <description>Display the type column in the main window.</description>
     </key>
     <key name="show-size" type="b">
       <default>true</default>
-      <_summary>Display size</_summary>
-      <_description>Display the size column in the main window.</_description>
+      <summary>Display size</summary>
+      <description>Display the size column in the main window.</description>
     </key>
     <key name="show-time" type="b">
       <default>true</default>
-      <_summary>Display time</_summary>
-      <_description>Display the time column in the main window.</_description>
+      <summary>Display time</summary>
+      <description>Display the time column in the main window.</description>
     </key>
     <key name="show-path" type="b">
       <default>true</default>
-      <_summary>Display path</_summary>
-      <_description>Display the path column in the main window.</_description>
+      <summary>Display path</summary>
+      <description>Display the path column in the main window.</description>
     </key>
     <key name="name-column-width" type="i">
       <default>250</default>
-      <_summary>Name column width</_summary>
-      <_description>The default width of the name column in the file list.</_description>
+      <summary>Name column width</summary>
+      <description>The default width of the name column in the file list.</description>
     </key>
   </schema>
 
@@ -107,8 +107,8 @@
     </key>
     <key name="view-sidebar" type="b">
       <default>false</default>
-      <_summary>View the sidebar</_summary>
-      <_description>Whether to display the sidebar.</_description>
+      <summary>View the sidebar</summary>
+      <description>Whether to display the sidebar.</description>
     </key>
   </schema>
 
@@ -127,18 +127,18 @@
   <schema id="org.gnome.FileRoller.General" path="/org/gnome/file-roller/general/" 
gettext-domain="file-roller">
     <key name="editors" type="as">
       <default>[]</default>
-      <_summary>Editors</_summary>
-      <_description>List of applications entered in the 'Open File' dialog and not associated with the file 
type.</_description>
+      <summary>Editors</summary>
+      <description>List of applications entered in the 'Open File' dialog and not associated with the file 
type.</description>
     </key>
     <key name="compression-level" enum="org.gnome.FileRoller.CompressionLevel">
       <default>'normal'</default>
-      <_summary>Compression level</_summary>
-      <_description>Compression level used when adding files to an archive. Possible values: very-fast, 
fast, normal, maximum.</_description>
+      <summary>Compression level</summary>
+      <description>Compression level used when adding files to an archive. Possible values: very-fast, fast, 
normal, maximum.</description>
     </key>
     <key name="encrypt-header" type="b">
       <default>false</default>
-      <_summary>Encrypt the archive header</_summary>
-      <_description>Whether to encrypt the archive header.  If the header is encrypted the password will be 
required to list the archive content as well.</_description>
+      <summary>Encrypt the archive header</summary>
+      <description>Whether to encrypt the archive header.  If the header is encrypted the password will be 
required to list the archive content as well.</description>
     </key>
   </schema>
 
@@ -152,11 +152,11 @@
   <schema id="org.gnome.FileRoller.Dialogs.Extract" path="/org/gnome/file-roller/dialogs/extract/" 
gettext-domain="file-roller">
     <key name="skip-newer" type="b">
       <default>false</default>
-      <_summary>Do not overwrite newer files</_summary>
+      <summary>Do not overwrite newer files</summary>
     </key>
     <key name="recreate-folders" type="b">
       <default>true</default>
-      <_summary>Recreate the folders stored in the archive</_summary>
+      <summary>Recreate the folders stored in the archive</summary>
     </key>
   </schema>
 
@@ -169,13 +169,13 @@
     </key>
     <key name="encrypt-header" type="b">
       <default>false</default>
-      <_summary>Encrypt the archive header</_summary>
-      <_description>Whether to encrypt the archive header.  If the header is encrypted the password will be 
required to list the archive content as well.</_description>
+      <summary>Encrypt the archive header</summary>
+      <description>Whether to encrypt the archive header.  If the header is encrypted the password will be 
required to list the archive content as well.</description>
     </key>
     <key name="volume-size" type="i">
       <default>0</default>
-      <_summary>Default volume size</_summary>
-      <_description>The default size for volumes.</_description>
+      <summary>Default volume size</summary>
+      <description>The default size for volumes.</description>
     </key>
   </schema>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8e89ae8..a7ada62 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 [encoding: UTF-8]
 data/org.gnome.FileRoller.appdata.xml.in
 data/org.gnome.FileRoller.desktop.in.in
-data/org.gnome.FileRoller.gschema.xml.in
+[type: gettext/gsettings]data/org.gnome.FileRoller.gschema.xml
 nautilus/fileroller-module.c
 nautilus/nautilus-fileroller.c
 nautilus/nautilus-fileroller.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]