Commit #6

madmurphy · May 24, 2021 · 1d3bf00 · 1d3bf00
1 parent 5ce84cd
commit 1d3bf00
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 143 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,17 @@ Change Log
 ==========
 
 
+## 0.2.3 (2021-05-24)
+
+Changes:
+
+* Use of `fprintf()` for logging has been dropped in favor of GLib's
+  `g_message()`
+* Code review
+* A small bug in the build system that caused `make distcheck` not to function
+  properly has been fixed
+
+
 ## 0.2.2 (2021-05-07)
 
 Changes:

diff --git a/Makefile.am b/Makefile.am
@@ -69,7 +69,9 @@ i18n-update:
 	&& mkdir -p 'backups' && grep -o '^\s*\w\S\+' 'LINGUAS' | while read \
 	coin; do mv "$${coin}.po" "$${coin}.po.bak" && msgmerge \
 	"$${coin}.po.bak" '$(PACKAGE_TARNAME).pot' > "$${coin}.po" && mv \
-	"$${coin}.po.bak" 'backups'; done; rm '$(PACKAGE_TARNAME).pot')
+	"$${coin}.po.bak" 'backups' && sed -i \
+	's/"Project-Id-Version:\s*\([0-9]\+\(\.[0-9]\+\(\.[0-9]\)\?\)\?\)\?\+\\n"/"Project-Id-Version: @PACKAGE_VERSION@\\n"/' \
+	"$${coin}.po"; done; rm '$(PACKAGE_TARNAME).pot')
 
 
 # EOF

diff --git a/README b/README
@@ -43,9 +43,9 @@ commands:
 
 ``` sh
 cd nautilus-hide/po
-intltool-update -p
+intltool-update -p --gettext-package=nautilus-hide
 msginit -l nl
-rm NautilusHide.pot
+rm nautilus-hide.pot
 ```
 
 Now edit the `po/LINGUAS` file and add a new line containing the abbreviated
@@ -59,9 +59,9 @@ in the extension source code, launch
 
 ``` sh
 cd nautilus-hide/po
-intltool-update -p
-mv nl.po nl.po.bak && msgmerge nl.po.bak NautilusHide.pot > nl.po
-rm NautilusHide.pot nl.po.bak
+intltool-update -p --gettext-package=nautilus-hide
+mv nl.po nl.po.bak && msgmerge nl.po.bak nautilus-hide.pot > nl.po
+rm nautilus-hide.pot nl.po.bak
 ```
 
 For any issue, [drop me a message][1].
@@ -77,9 +77,9 @@ generator.
 Free software
 -------------
 
-This extension is free software. You can redistribute it and/or modify it under
-the terms of the GPL license version 3 or any later version. See [COPYING][3]
-for details.
+**Nautilus Hide** is free software. You can redistribute it and/or modify it
+under the terms of the GPL license version 3 or any later version. See
+[COPYING][3] for details.
 
 
   [1]: https://gitlab.gnome.org/madmurphy/nautilus-hide/issues

diff --git a/bootstrap b/bootstrap
@@ -1,4 +1,3 @@
-
 #!/bin/bash
 # Run this to generate all the initial makefiles, etc.
 
@@ -42,7 +41,7 @@ if test "${CLEANONLY}" -ne 0; then
 	echo 'Cleaning package...'
 	test -f 'Makefile' && make maintainer-clean
 	rm -Rf autom4te.cache m4 build-aux no-dist `find . -type d -name .deps`
-	rm -f aclocal.m4 compile config.* configure depcomp install-sh libtool ltmain.sh missing intltool-* `find . -name Makefile.in`
+	rm -f aclocal.m4 compile config.* configure configure~ depcomp install-sh libtool ltmain.sh missing intltool-* `find . -name Makefile.in`
 	echo 'Done'
 	exit 0
 fi

diff --git a/configure.ac b/configure.ac
@@ -9,7 +9,7 @@ dnl  ***************************************************************************
 AC_PREREQ([2.69])
 
 AC_INIT([Nautilus Hide],
-	[0.2.2],
+	[0.2.3],
 	[madmurphy333@gmail.com],
 	[nautilus-hide],
 	[https://gitlab.gnome.org/madmurphy/nautilus-hide])
@@ -63,8 +63,10 @@ dnl     F I N A L I Z A T I O N
 dnl  ***************************************************************************
 
 
-AC_SUBST([NAUTILUS_EXTENSION_DIR],
-	["$($PKG_CONFIG --variable=extensiondir libnautilus-extension)"])
+AC_SUBST([NAUTILUS_EXTENSION_DIR], m4_normalize(["$(
+	"${PKG_CONFIG}" --define-variable='libdir=${libdir}'
+		--variable=extensiondir libnautilus-extension
+)"]))
 
 LT_INIT([disable-static])
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "nautilus-hide",
-	"version": "0.2.2",
+	"version": "0.2.3",
 	"description": "A simple Nautilus extension that adds \"Hide\" and \"Unhide\" to Nautilus right-click menu",
 	"homepage": "https://gitlab.gnome.org/madmurphy/nautilus-hide",
 	"author": "madmurphy333@gmail.com",

diff --git a/po/it.po b/po/it.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.2.2\n"
+"Project-Id-Version: 0.2.3\n"
 "Report-Msgid-Bugs-To: <madmurphy333@gmail.com>\n"
-"POT-Creation-Date: 2021-05-07 14:09+0200\n"
-"PO-Revision-Date: 2021-05-07 14:09+0200\n"
+"POT-Creation-Date: 2021-05-24 11:52+0200\n"
+"PO-Revision-Date: 2021-05-24 11:52+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -17,93 +17,89 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/nautilus-hide.c:106
+#: ../src/nautilus-hide.c:119
 msgid "Could not close the database of hidden files"
 msgstr "Impossibile chiudere il database dei file nascosti"
 
-#: ../src/nautilus-hide.c:126 ../src/nautilus-hide.c:144
-#: ../src/nautilus-hide.c:159 ../src/nautilus-hide.c:258
-#: ../src/nautilus-hide.c:312
+#: ../src/nautilus-hide.c:136 ../src/nautilus-hide.c:149
+#: ../src/nautilus-hide.c:159 ../src/nautilus-hide.c:252
+#: ../src/nautilus-hide.c:300
 msgid "Error allocating memory"
 msgstr "Errore nell'allocare memoria"
 
-#: ../src/nautilus-hide.c:213
+#: ../src/nautilus-hide.c:209
 msgid "Error attempting to access the database of hidden files"
 msgstr "Impossibile accedere al database dei file nascosti"
 
-#: ../src/nautilus-hide.c:228
+#: ../src/nautilus-hide.c:226
 msgid "Could not calculate the size of the database of hidden files"
 msgstr "Impossibile calcolare le dimensioni del database dei file nascosti"
 
-#: ../src/nautilus-hide.c:242
+#: ../src/nautilus-hide.c:239
 msgid "Database of hidden files is too big"
 msgstr "Il database dei file nascosti è troppo grande"
 
-#: ../src/nautilus-hide.c:273
+#: ../src/nautilus-hide.c:264
 msgid "I/O error while accessing database of hidden files"
 msgstr "Errore I/O nell'accedere al database dei file nascosti"
 
-#: ../src/nautilus-hide.c:375
-msgid "Could not get file path"
-msgstr "Impossibile ottenere la posizione del file"
-
-#: ../src/nautilus-hide.c:459
+#: ../src/nautilus-hide.c:440
 msgid "No files have been selected to be hidden"
 msgstr "Non ci sono file selezionati da nascondere"
 
-#: ../src/nautilus-hide.c:475
+#: ../src/nautilus-hide.c:453
 msgid ""
 "Could not hide the selected files, error attempting to group them according "
 "to their parent directories"
 msgstr ""
 "Impossibile nascondere i file selezionati, errore nel tentativo di "
 "raggrupparli in base alla loro directory di appartenenza"
 
-#: ../src/nautilus-hide.c:504
+#: ../src/nautilus-hide.c:481
 msgid ""
 "Could not hide the selected files, error attempting to edit the database"
 msgstr ""
 "Impossibile nascondere i file selezionati, errore nel tentativo di "
 "modificare il database"
 
-#: ../src/nautilus-hide.c:632
+#: ../src/nautilus-hide.c:606
 msgid "No files have been selected to be unhidden"
 msgstr "Non ci sono file selezionati da rendere visibili"
 
-#: ../src/nautilus-hide.c:648
+#: ../src/nautilus-hide.c:619
 msgid ""
 "Could not unhide the selected files, error attempting to group them "
 "according to their parent directories"
 msgstr ""
 "Impossibile rendere visibili i file selezionati, errore nel tentativo di "
 "raggrupparli in base alla loro directory di appartenenza"
 
-#: ../src/nautilus-hide.c:689
+#: ../src/nautilus-hide.c:659
 msgid ""
 "Could not unhide the selected files, error attempting to edit the database"
 msgstr ""
 "Impossibile rendere visibili i file selezionati, errore nel tentativo di "
 "modificare il database"
 
-#: ../src/nautilus-hide.c:948
+#: ../src/nautilus-hide.c:918
 msgid "_Hide file"
 msgid_plural "_Hide files"
 msgstr[0] "_Nascondi"
 msgstr[1] "_Nascondi i file"
 
-#: ../src/nautilus-hide.c:954
+#: ../src/nautilus-hide.c:924
 msgid "Hide the selected file"
 msgid_plural "Hide the selected files"
 msgstr[0] "Nascondi il file selezionato"
 msgstr[1] "Nascondi i file selezionati"
 
-#: ../src/nautilus-hide.c:987
+#: ../src/nautilus-hide.c:957
 msgid "_Unhide file"
 msgid_plural "_Unhide files"
 msgstr[0] "Ripristina _visibilità"
 msgstr[1] "Ripristina _visibilità dei file"
 
-#: ../src/nautilus-hide.c:993
+#: ../src/nautilus-hide.c:963
 msgid "Unhide the selected file"
 msgid_plural "Unhide the selected files"
 msgstr[0] "Rendi visibile il file selezionato"