68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001
|
|
From: Rico Tzschichholz <ricotz@ubuntu.com>
|
|
Date: Tue, 30 Nov 2021 15:09:17 +0100
|
|
Subject: [PATCH] Fix accessibility issues with initializer of constants
|
|
|
|
---
|
|
src/International.vala | 2 --
|
|
src/Resources.vala | 7 -------
|
|
vapi/version.vapi | 17 ++++++++++++++---
|
|
3 files changed, 14 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/International.vala b/src/International.vala
|
|
index 555a91f8..73f07639 100644
|
|
--- a/src/International.vala
|
|
+++ b/src/International.vala
|
|
@@ -4,8 +4,6 @@
|
|
* See the COPYING file in this distribution.
|
|
*/
|
|
|
|
-extern const string _LANG_SUPPORT_DIR;
|
|
-
|
|
public const string TRANSLATABLE = "translatable";
|
|
|
|
namespace InternationalSupport {
|
|
diff --git a/src/Resources.vala b/src/Resources.vala
|
|
index 6d2b8851..86f0eb65 100644
|
|
--- a/src/Resources.vala
|
|
+++ b/src/Resources.vala
|
|
@@ -4,13 +4,6 @@
|
|
* See the COPYING file in this distribution.
|
|
*/
|
|
|
|
-// defined by ./configure or Makefile and included by gcc -D
|
|
-extern const string _PREFIX;
|
|
-extern const string _VERSION;
|
|
-extern const string GETTEXT_PACKAGE;
|
|
-extern const string _LIB;
|
|
-extern const string _LIBEXECDIR;
|
|
-
|
|
namespace Resources {
|
|
public const string APP_TITLE = "Shotwell";
|
|
public const string APP_LIBRARY_ROLE = _("Photo Manager");
|
|
diff --git a/vapi/version.vapi b/vapi/version.vapi
|
|
index 06974c84..e191f2f7 100644
|
|
--- a/vapi/version.vapi
|
|
+++ b/vapi/version.vapi
|
|
@@ -1,3 +1,14 @@
|
|
-[CCode (cheader_filename="version.h")]
|
|
-extern const string? _GIT_VERSION;
|
|
-
|
|
+[CCode (cheader_filename = "version.h")]
|
|
+public const string? _GIT_VERSION;
|
|
+[CCode (cheader_filename = "config.h")]
|
|
+public const string _PREFIX;
|
|
+[CCode (cheader_filename = "config.h")]
|
|
+public const string _VERSION;
|
|
+[CCode (cheader_filename = "config.h")]
|
|
+public const string GETTEXT_PACKAGE;
|
|
+[CCode (cheader_filename = "config.h")]
|
|
+public const string _LIB;
|
|
+[CCode (cheader_filename = "config.h")]
|
|
+public const string _LIBEXECDIR;
|
|
+[CCode (cheader_filename = "config.h")]
|
|
+public const string _LANG_SUPPORT_DIR;
|
|
--
|
|
GitLab
|
|
|