From 90c03782aa98702ce2a7da35e7c71bf7600995f8 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 20 Nov 2020 17:35:31 -0300
Subject: [PATCH] Using application id for .desktop file, adjustmente in appdata.

---
 branding/Makefile.in    |  5 +++--
 branding/appdata.xml.in | 14 ++++++++++----
 configure.ac            |  4 ++++
 src/include/config.h.in |  1 +
 src/main/main.c         |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/branding/Makefile.in b/branding/Makefile.in
index 004b448..93ccbdf 100644
--- a/branding/Makefile.in
+++ b/branding/Makefile.in
@@ -28,6 +28,7 @@ PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PRODUCT_NAME=@PRODUCT_NAME@
+APPLICATION_ID=@APPLICATION_ID@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -113,13 +114,13 @@ install-linux: \
 
 	@$(INSTALL_DATA) \
 		launcher.desktop \
-		$(PRODUCT_NAME).desktop
+		$(APPLICATION_ID).desktop
 
 	@$(DESKTOP_INSTALL) \
 		--mode 644 \
 		--delete-original \
 		--dir $(DESTDIR)$(datarootdir)/applications \
-		$(PRODUCT_NAME).desktop
+		$(APPLICATION_ID).desktop
 
 	@$(MKDIR) $(DESTDIR)$(datarootdir)/mime/packages
 
diff --git a/branding/appdata.xml.in b/branding/appdata.xml.in
index a6f776a..b10cc9d 100644
--- a/branding/appdata.xml.in
+++ b/branding/appdata.xml.in
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
+<component type="desktop">
 
-	<id type="desktop">@PRODUCT_NAME@.desktop</id>
+	<id>@APPLICATION_ID@.desktop</id>
 
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>LGPL-3.0</project_license>
 
+	<name>@PRODUCT_NAME@</name>
+	<name xml:lang="pt_BR">@PRODUCT_NAME@</name>
+
 	<summary>IBM 3270 Terminal emulator</summary>
 	<summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary>
 
@@ -17,8 +20,8 @@
 		<p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p>
 	</description>
 
-	<url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
 	<url type="homepage">https://github.com/PerryWerneck/pw3270</url>
+	<url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
 
 	<screenshots>
 		<screenshot type="default">
@@ -29,9 +32,12 @@
 
 	<update_contact>perry.werneck@gmail.com</update_contact>
 
+	<project_group>GNOME</project_group>
+
 	<provides>
 		<binary>@PRODUCT_NAME@</binary>
 	</provides>
 
+	<translation type="gettext">@PRODUCT_NAME@</translation>
 
-</application>
+</component>
diff --git a/configure.ac b/configure.ac
index f3f3839..cd957e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,10 @@ AC_ARG_WITH([library-name], [AS_HELP_STRING([--with-library-name], [Set protocol
 AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library)
 AC_SUBST(LIBRARY_NAME,$app_cv_library)
 
+app_cv_application_id="br.com.bb.$app_cv_product"
+AC_DEFINE_UNQUOTED(APPLICATION_ID, $app_cv_application_id)
+AC_SUBST(APPLICATION_ID,$app_cv_application_id)
+
 dnl ---------------------------------------------------------------------------
 dnl Check for GTK
 dnl ---------------------------------------------------------------------------
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 39fdcb9..31a994b 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -35,6 +35,7 @@
 	#undef PACKAGE_VERSION
 	#undef PACKAGE_RELEASE
 	#undef PRODUCT_NAME
+	#undef APPLICATION_ID
 
 #endif /* PW3270_CONFIG_H_INCLUDED */
 
diff --git a/src/main/main.c b/src/main/main.c
index 8b649a4..5072498 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -106,7 +106,7 @@ int main (int argc, char **argv) {
 
 	// Setup and start application.
 	g_set_application_name(G_STRINGIFY(PRODUCT_NAME));
-	app = pw3270_application_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME),G_APPLICATION_HANDLES_OPEN);
+	app = pw3270_application_new(G_STRINGIFY(APPLICATION_ID),G_APPLICATION_HANDLES_OPEN);
 
 #ifdef G_OS_UNIX
 	g_unix_signal_add(SIGTERM, (GSourceFunc) quit_signal, app);
--
libgit2 0.21.2