GNOME.org
 

[eog-plugins] Switch to intltool's native GSettings support

commit c98fe6e1530664d1aac894a0161e15e86c7e715a
Author: Felix Riemann <friemann gnome org>
Date:   Sun Aug 10 17:53:55 2014 +0200

    Switch to intltool's native GSettings support
    
    Allows coexistence between GSettings and AppData files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=731676

 autogen.sh                                         |    2 +-
 configure.ac                                       |   10 +++++-----
 plugins/exif-display/Makefile.am                   |    3 +--
 ....gnome.eog.plugins.exif-display.gschema.xml.in} |    0
 plugins/export-to-folder/Makefile.am               |    3 +--
 ...me.eog.plugins.export-to-folder.gschema.xml.in} |    4 ++--
 plugins/fullscreenbg/Makefile.am                   |    4 ++--
 ...g.gnome.eog.plugins.fullscreenbg.gschema.xml.in |   14 ++++++++++++++
 ...nome.eog.plugins.fullscreenbg.gschema.xml.in.in |   14 --------------
 plugins/pythonconsole/Makefile.am                  |    5 ++---
 ...gnome.eog.plugins.pythonconsole.gschema.xml.in} |   20 ++++++++++----------
 po/POTFILES.in                                     |    6 +++---
 12 files changed, 41 insertions(+), 44 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 5bcb697..aba0505 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,6 +18,6 @@ which gnome-autogen.sh || {
 }
 REQUIRED_AUTOCONF_VERSION=2.59
 REQUIRED_AUTOMAKE_VERSION=1.11
-REQUIRED_INTLTOOL_VERSION=0.40.0
+REQUIRED_INTLTOOL_VERSION=0.50.1
 REQUIRED_PKG_CONFIG_VERSION=0.16.0
 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index addbb15..dda782d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_PROG_MAKE_SET
 # ***********
 
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 GETTEXT_PACKAGE=eog-plugins
 AC_SUBST(GETTEXT_PACKAGE)
@@ -338,11 +338,11 @@ plugins/Makefile
 plugins/map/Makefile
 plugins/fit-to-width/Makefile
 plugins/exif-display/Makefile
-plugins/exif-display/org.gnome.eog.plugins.exif-display.gschema.xml.in
+plugins/exif-display/org.gnome.eog.plugins.exif-display.gschema.xml
 plugins/export-to-folder/Makefile
-plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in
+plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml
 plugins/fullscreenbg/Makefile
-plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml.in
+plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml
 plugins/hide-titlebar/Makefile
 plugins/light-theme/Makefile
 plugins/send-by-mail/Makefile
@@ -350,7 +350,7 @@ plugins/slideshowshuffle/Makefile
 plugins/postr/Makefile
 plugins/postasa/Makefile
 plugins/pythonconsole/Makefile
-plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in
+plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml
 po/Makefile.in])
 
 AC_OUTPUT
diff --git a/plugins/exif-display/Makefile.am b/plugins/exif-display/Makefile.am
index 31fb6a1..e29fe60 100644
--- a/plugins/exif-display/Makefile.am
+++ b/plugins/exif-display/Makefile.am
@@ -48,7 +48,6 @@ appstream_DATA = $(appstream_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 gsettings_SCHEMAS = org.gnome.eog.plugins.exif-display.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
@@ -57,7 +56,7 @@ EXTRA_DIST = \
        exif-display.ui         \
        exif-display-config.ui  \
        eog-exif-display-plugin.gresource.xml   \
-       org.gnome.eog.plugins.exif-display.gschema.xml.in.in
+       org.gnome.eog.plugins.exif-display.gschema.xml.in
 
 CLEANFILES = \
        ${BUILT_SOURCES}        \
diff --git a/plugins/exif-display/org.gnome.eog.plugins.exif-display.gschema.xml.in.in 
b/plugins/exif-display/org.gnome.eog.plugins.exif-display.gschema.xml.in
similarity index 100%
rename from plugins/exif-display/org.gnome.eog.plugins.exif-display.gschema.xml.in.in
rename to plugins/exif-display/org.gnome.eog.plugins.exif-display.gschema.xml.in
diff --git a/plugins/export-to-folder/Makefile.am b/plugins/export-to-folder/Makefile.am
index 50c894e..ed5be21 100644
--- a/plugins/export-to-folder/Makefile.am
+++ b/plugins/export-to-folder/Makefile.am
@@ -12,8 +12,7 @@ plugin_PYTHON = \
        export-to-folder.py
 
 gsettings_SCHEMAS = org.gnome.eog.plugins.export-to-folder.gschema.xml
-gsettings_SCHEMAS_in_files = org.gnome.eog.plugins.export-to-folder.gschema.xml.in.in
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS_in_files = org.gnome.eog.plugins.export-to-folder.gschema.xml.in
 @GSETTINGS_RULES@
 
 %.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff --git a/plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in.in 
b/plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in
similarity index 55%
rename from plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in.in
rename to plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in
index 46998eb..28dd0ee 100644
--- a/plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in.in
+++ b/plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in
@@ -2,8 +2,8 @@
   <schema id="org.gnome.eog.plugins.export-to-folder" path="/org/gnome/eog/plugins/export-to-folder/" 
gettext-domain="@GETTEXT_PACKAGE@">
     <key name="target-folder" type="s">
       <default>""</default>
-      <_summary>The folder to export to</_summary>
-      <_description>This is the folder the plugin will place the exported files in. Plugin will export to 
$HOME/exported-images if not set.</_description>
+      <summary>The folder to export to</summary>
+      <description>This is the folder the plugin will place the exported files in. Plugin will export to 
$HOME/exported-images if not set.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/plugins/fullscreenbg/Makefile.am b/plugins/fullscreenbg/Makefile.am
index 40a7f78..140a1e0 100644
--- a/plugins/fullscreenbg/Makefile.am
+++ b/plugins/fullscreenbg/Makefile.am
@@ -5,7 +5,7 @@ plugin_in_files = fullscreenbg.plugin.desktop.in
 appstream_in_files = eog-fullscreenbg.metainfo.xml.in
 
 gsettings_SCHEMAS = org.gnome.eog.plugins.fullscreenbg.gschema.xml
-gsettings_SCHEMAS_in_files = org.gnome.eog.plugins.fullscreenbg.gschema.xml.in.in
+gsettings_SCHEMAS_in_files = org.gnome.eog.plugins.fullscreenbg.gschema.xml.in
 
 
 ui_DATA = preferences_dialog.ui
@@ -20,7 +20,7 @@ plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
 
- INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = $(plugin_in_files)\
diff --git a/plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml.in 
b/plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml.in
new file mode 100644
index 0000000..e455d83
--- /dev/null
+++ b/plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist>
+  <schema id="org.gnome.eog.plugins.fullscreenbg" path="/org/gnome/eog/plugins/fullscreenbg/" 
gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="use-custom" type="b">
+      <default>true</default>
+      <summary>Use custom background settings</summary>
+      <description>Whether the plugin should use global settings or its own.</description>
+    </key>
+    <key name="background-color" type="s">
+      <default>'#000000'</default>
+      <summary>Background color in fullscreen mode</summary>
+      <description>The color that is used to fill the area behind the image. This option has effect only if 
use-custom is enabled.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/plugins/pythonconsole/Makefile.am b/plugins/pythonconsole/Makefile.am
index 3012d0f..2c01617 100644
--- a/plugins/pythonconsole/Makefile.am
+++ b/plugins/pythonconsole/Makefile.am
@@ -22,17 +22,16 @@ appstream_DATA = $(appstream_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 gsettings_SCHEMAS = org.gnome.eog.plugins.pythonconsole.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
        $(plugin_in_files)      \
        $(appstream_in_files)   \
        $(UI_FILES)             \
-       org.gnome.eog.plugins.pythonconsole.gschema.xml.in.in
+       org.gnome.eog.plugins.pythonconsole.gschema.xml.in
 
 
-CLEANFILES = $(plugin_DATA) $(appstream_in_files) $(gsettings_SCHEMAS)
+CLEANFILES = $(plugin_DATA) $(appstream_DATA) $(gsettings_SCHEMAS)
 DISTCLEANFILES = $(plugin_DATA) $(appstream_DATA) $(gsettings_SCHEMAS)
 MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
 
diff --git a/plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in.in 
b/plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in
similarity index 64%
rename from plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in.in
rename to plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in
index 07e18f1..c998070 100644
--- a/plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in.in
+++ b/plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in
@@ -2,29 +2,29 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog.plugins.pythonconsole" 
path="/org/gnome/eog/plugins/pythonconsole/">
     <key name="command-color" type="s">
       <default>'#0000FF'</default>
-      <_summary>Command Text Color</_summary>
-      <_description>The color used for commands.</_description>
+      <summary>Command Text Color</summary>
+      <description>The color used for commands.</description>
     </key>
     <key name="error-color" type="s">
       <default>'#FF0000'</default>
-      <_summary>Error Text Color</_summary>
-      <_description>The color used for errors.</_description>
+      <summary>Error Text Color</summary>
+      <description>The color used for errors.</description>
     </key>
     <key name="use-system-font" type="b">
       <default>true</default>
-      <_summary>Whether to use the system font</_summary>
-      <_description>
+      <summary>Whether to use the system font</summary>
+      <description>
         If true, the terminal will use the desktop-global standard
         font if it's monospace (and the most similar font it can
         come up with otherwise).
-      </_description>
+      </description>
     </key>
     <key name="font" type="s">
       <default>'Monospace 10'</default>
-      <_summary>Font used by Python Console</_summary>
-      <_description>
+      <summary>Font used by Python Console</summary>
+      <description>
         A Pango font name. Examples are "Sans 12" or "Monospace Bold 14".
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f783b83..e63487a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,14 +6,14 @@ plugins/exif-display/eog-exif-display.metainfo.xml.in
 plugins/export-to-folder/export-to-folder.plugin.desktop.in
 plugins/export-to-folder/eog-export-to-folder.metainfo.xml.in
 plugins/export-to-folder/export-to-folder.py
-plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in.in
+[type: gettext/gsettings][type: 
gettext/gsettings]plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in
 [type: gettext/glade]plugins/export-to-folder/preferences_dialog.ui
 plugins/fit-to-width/eog-fit-to-width-plugin.c
 plugins/fit-to-width/fit-to-width.plugin.desktop.in
 plugins/fit-to-width/eog-fit-to-width.metainfo.xml.in
 plugins/fullscreenbg/fullscreenbg.plugin.desktop.in
 plugins/fullscreenbg/eog-fullscreenbg.metainfo.xml.in
-plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml.in.in
+[type: gettext/gsettings]plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml.in
 [type: gettext/glade]plugins/fullscreenbg/preferences_dialog.ui
 plugins/hide-titlebar/hide-titlebar.plugin.desktop.in
 plugins/hide-titlebar/eog-hide-titlebar.metainfo.xml.in
@@ -32,7 +32,7 @@ plugins/postr/postr.plugin.desktop.in
 plugins/postr/eog-postr.metainfo.xml.in
 plugins/pythonconsole/__init__.py
 [type: gettext/glade]plugins/pythonconsole/config.ui
-plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in.in
+[type: gettext/gsettings]plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in
 plugins/pythonconsole/pythonconsole.plugin.desktop.in
 plugins/pythonconsole/eog-pythonconsole.metainfo.xml.in
 plugins/send-by-mail/eog-send-by-mail-plugin.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]