Commit 5c3c13cf authored by Sebastian Ramacher's avatar Sebastian Ramacher
Browse files

Merge branch 'release/0.3.7'

parents c24136f4 0783cdf4
Pipeline #428 passed with stages
in 2 minutes and 20 seconds
......@@ -13,26 +13,26 @@ Requirements
The following dependencies are required:
* gtk3 (>= 3.20)
* glib (>= 2.50)
* `gtk3` (>= 3.20)
* `glib` (>= 2.50)
The following dependencies are optional:
* libnotify: notification support
* json-c: configuration dumping support
* `libnotify`: notification support
* `json-c`: configuration dumping support
For building girara, the following dependencies are also required:
* meson (>= 0.48)
* gettext
* `meson` (>= 0.56)
* `gettext`
The following dependencies are optional build-time only dependencies:
* check: for tests
* doxygen: HTML documentation
* `check` (>= 0.11): for tests
* `doxygen`: HTML documentation
To disable the optional support for libnotify and json-c, configure the build
system with -Dnotify=disabled or -Djson=disabled.
To disable the optional support for `libnotify` and `json-c`, configure the build
system with `-Dnotify=disabled` or `-Djson=disabled`.
Installation
------------
......@@ -40,10 +40,10 @@ Installation
Run the following command to build and install girara to your system using
meson's ninja backend:
meson build
cd build
ninja
ninja install
meson build
cd build
ninja
ninja install
Note that the default backend for meson might vary based on the platform. Please
refer to the meson documentation for platform specific dependencies.
......
doxygen = find_program('doxygen', required: get_option('docs'))
if doxygen.found()
conf_data = configuration_data()
conf_data.set('DOXYGEN_INPUT', meson.source_root())
conf_data.set('DOXYGEN_INPUT', meson.project_source_root())
conf_data.set('DOXYGEN_OUTPUT', meson.current_build_dir())
doxyfile = configure_file(
......
......@@ -290,18 +290,28 @@ config_parse(girara_session_t* session, const char* path)
gchar** argv = NULL;
gint argc = 0;
GError* error = NULL;
/* parse current line */
if (g_shell_parse_argv(line, &argc, &argv, NULL) != FALSE) {
if (g_shell_parse_argv(line, &argc, &argv, &error) != FALSE) {
for (int i = 1; i < argc; i++) {
char* argument = g_strdup(argv[i]);
girara_list_append(argument_list, argument);
}
} else {
girara_list_free(argument_list);
fclose(file);
g_free(line);
return false;
if (error->code != G_SHELL_ERROR_EMPTY_STRING) {
girara_error("Could not parse line %d in '%s': %s", line_number, path, error->message);
g_error_free(error);
fclose(file);
g_free(line);
return false;
} else {
g_error_free(error);
g_free(line);
continue;
}
}
/* include gets a special treatment */
......
......@@ -389,7 +389,7 @@ girara_safe_realloc(void** ptr, size_t size)
}
*ptr = tmp;
return *ptr;
return tmp;
error_free:
......
......@@ -124,7 +124,7 @@ void girara_clean_line(char* line) GIRARA_VISIBLE;
* @param size Number of bytes
* @return Pointer to the allocated memory block or NULL
*/
void* girara_safe_realloc(void** ptr, size_t size) GIRARA_ALLOC_SIZE(2) GIRARA_VISIBLE;
void* girara_safe_realloc(void** ptr, size_t size) GIRARA_ALLOC_SIZE(2) GIRARA_VISIBLE GIRARA_DEPRECATED_;
/**
* Escape \\, \\t, ", ' and spaces in strings.
......
project('girara', 'c',
version: '0.3.6',
meson_version: '>=0.48',
version: '0.3.7',
meson_version: '>=0.56',
default_options: ['c_std=c11', 'warning_level=3'],
)
......
......@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Arabic (http://www.transifex.com/pwmt/girara/language/ar/)\n"
"Language: ar\n"
......
......@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: German (http://www.transifex.com/pwmt/girara/language/de/)\n"
"Language: de\n"
......
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Greek (http://www.transifex.com/pwmt/girara/language/el/)\n"
"Language: el\n"
......
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Spanish (http://www.transifex.com/pwmt/girara/language/es/)\n"
"Language: es\n"
......
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2020-03-12 21:19+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Goudarz Jafari <goudarz.jafari@gmail.com>\n"
"Language-Team: Persian (Iran) (http://www.transifex.com/pwmt/girara/language/"
"fa_IR/)\n"
......
......@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: French (http://www.transifex.com/pwmt/girara/language/fr/)\n"
"Language: fr\n"
......
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Hebrew (http://www.transifex.com/pwmt/girara/language/he/)\n"
"Language: he\n"
......
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Italian (http://www.transifex.com/pwmt/girara/language/it/)\n"
"Language: it\n"
......
......@@ -2,14 +2,15 @@
# SPDX-License-Identifier: Zlib
#
# Translators:
# Heimen Stoffels <vistausss@fastmail.com>, 2021
# Heimen Stoffels <vistausss@outlook.com>, 2018
msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 17:37+0000\n"
"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
"Language-Team: Dutch (http://www.transifex.com/pwmt/girara/language/nl/)\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
......@@ -20,7 +21,7 @@ msgstr ""
#: girara/commands.c:111 girara/commands.c:311
#, c-format
msgid "Invalid number of arguments passed: %zu instead of at least %u"
msgstr "Ongeldig aantal argumenten: %zu i.p.v. minimaal %u"
msgstr "Ongeldig aantal aanvullende opties: %zu i.p.v. minimaal %u"
#: girara/commands.c:145
#, c-format
......@@ -49,11 +50,11 @@ msgstr "Ongeldige sneltoetsfunctie: %s"
#: girara/commands.c:423
msgid "Not enough arguments."
msgstr "Onvoldoende argumenten."
msgstr "Onvoldoende aanvullende opties."
#: girara/commands.c:428
msgid "Too many arguments."
msgstr "Teveel argumenten."
msgstr "Teveel aanvullende opties."
#: girara/commands.c:441
#, c-format
......@@ -199,7 +200,7 @@ msgstr "Uit te voeren opdracht in :exec"
#: girara/config.c:162
msgid "Show or hide certain GUI elements"
msgstr "Bepaalde app-elementen weergeven of verbergen"
msgstr "Bepaalde toepassingselementen tonen of verbergen"
#. commands
#: girara/config.c:198
......@@ -212,7 +213,7 @@ msgstr "Toetsaanslag toekennen"
#: girara/config.c:200
msgid "Quit the program"
msgstr "Applicatie afsluiten"
msgstr "Toepassing afsluiten"
#: girara/config.c:201
msgid "Set an option"
......@@ -220,7 +221,7 @@ msgstr "Optie instellen"
#: girara/config.c:202
msgid "Unmap a key sequence"
msgstr "Toetsaanslag verwijderen"
msgstr "Toetsaanslag wissen"
#: girara/config.c:204
msgid "Dump settings to a file"
......
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Polish (http://www.transifex.com/pwmt/girara/language/pl/)\n"
"Language: pl\n"
......
......@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/pwmt/girara/"
"language/pt_BR/)\n"
......
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2020-04-28 19:51+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: crt0r citrus\n"
"Language-Team: Russian (http://www.transifex.com/pwmt/girara/language/ru/)\n"
"Language: ru\n"
......
......@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Swedish (http://www.transifex.com/pwmt/girara/language/sv/)\n"
"Language: sv\n"
......
......@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: girara\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-13 09:01+0200\n"
"PO-Revision-Date: 2019-06-01 09:25+0000\n"
"POT-Creation-Date: 2022-01-06 14:42+0100\n"
"PO-Revision-Date: 2021-07-14 15:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Turkish (http://www.transifex.com/pwmt/girara/language/tr/)\n"
"Language: tr\n"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment