Commit 90c03782aa98702ce2a7da35e7c71bf7600995f8
1 parent
57f87687
Exists in
master
and in
2 other branches
Using application id for .desktop file, adjustmente in appdata.
Showing
5 changed files
with
19 additions
and
7 deletions
Show diff stats
branding/Makefile.in
@@ -28,6 +28,7 @@ PACKAGE_NAME=@PACKAGE_NAME@ | @@ -28,6 +28,7 @@ PACKAGE_NAME=@PACKAGE_NAME@ | ||
28 | PACKAGE_VERSION=@PACKAGE_VERSION@ | 28 | PACKAGE_VERSION=@PACKAGE_VERSION@ |
29 | PACKAGE_TARNAME=@PACKAGE_TARNAME@ | 29 | PACKAGE_TARNAME=@PACKAGE_TARNAME@ |
30 | PRODUCT_NAME=@PRODUCT_NAME@ | 30 | PRODUCT_NAME=@PRODUCT_NAME@ |
31 | +APPLICATION_ID=@APPLICATION_ID@ | ||
31 | 32 | ||
32 | prefix=@prefix@ | 33 | prefix=@prefix@ |
33 | exec_prefix=@exec_prefix@ | 34 | exec_prefix=@exec_prefix@ |
@@ -113,13 +114,13 @@ install-linux: \ | @@ -113,13 +114,13 @@ install-linux: \ | ||
113 | 114 | ||
114 | @$(INSTALL_DATA) \ | 115 | @$(INSTALL_DATA) \ |
115 | launcher.desktop \ | 116 | launcher.desktop \ |
116 | - $(PRODUCT_NAME).desktop | 117 | + $(APPLICATION_ID).desktop |
117 | 118 | ||
118 | @$(DESKTOP_INSTALL) \ | 119 | @$(DESKTOP_INSTALL) \ |
119 | --mode 644 \ | 120 | --mode 644 \ |
120 | --delete-original \ | 121 | --delete-original \ |
121 | --dir $(DESTDIR)$(datarootdir)/applications \ | 122 | --dir $(DESTDIR)$(datarootdir)/applications \ |
122 | - $(PRODUCT_NAME).desktop | 123 | + $(APPLICATION_ID).desktop |
123 | 124 | ||
124 | @$(MKDIR) $(DESTDIR)$(datarootdir)/mime/packages | 125 | @$(MKDIR) $(DESTDIR)$(datarootdir)/mime/packages |
125 | 126 |
branding/appdata.xml.in
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | -<application> | 2 | +<component type="desktop"> |
3 | 3 | ||
4 | - <id type="desktop">@PRODUCT_NAME@.desktop</id> | 4 | + <id>@APPLICATION_ID@.desktop</id> |
5 | 5 | ||
6 | <metadata_license>CC0-1.0</metadata_license> | 6 | <metadata_license>CC0-1.0</metadata_license> |
7 | <project_license>LGPL-3.0</project_license> | 7 | <project_license>LGPL-3.0</project_license> |
8 | 8 | ||
9 | + <name>@PRODUCT_NAME@</name> | ||
10 | + <name xml:lang="pt_BR">@PRODUCT_NAME@</name> | ||
11 | + | ||
9 | <summary>IBM 3270 Terminal emulator</summary> | 12 | <summary>IBM 3270 Terminal emulator</summary> |
10 | <summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary> | 13 | <summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary> |
11 | 14 | ||
@@ -17,8 +20,8 @@ | @@ -17,8 +20,8 @@ | ||
17 | <p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p> | 20 | <p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p> |
18 | </description> | 21 | </description> |
19 | 22 | ||
20 | - <url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url> | ||
21 | <url type="homepage">https://github.com/PerryWerneck/pw3270</url> | 23 | <url type="homepage">https://github.com/PerryWerneck/pw3270</url> |
24 | + <url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url> | ||
22 | 25 | ||
23 | <screenshots> | 26 | <screenshots> |
24 | <screenshot type="default"> | 27 | <screenshot type="default"> |
@@ -29,9 +32,12 @@ | @@ -29,9 +32,12 @@ | ||
29 | 32 | ||
30 | <update_contact>perry.werneck@gmail.com</update_contact> | 33 | <update_contact>perry.werneck@gmail.com</update_contact> |
31 | 34 | ||
35 | + <project_group>GNOME</project_group> | ||
36 | + | ||
32 | <provides> | 37 | <provides> |
33 | <binary>@PRODUCT_NAME@</binary> | 38 | <binary>@PRODUCT_NAME@</binary> |
34 | </provides> | 39 | </provides> |
35 | 40 | ||
41 | + <translation type="gettext">@PRODUCT_NAME@</translation> | ||
36 | 42 | ||
37 | -</application> | 43 | +</component> |
configure.ac
@@ -194,6 +194,10 @@ AC_ARG_WITH([library-name], [AS_HELP_STRING([--with-library-name], [Set protocol | @@ -194,6 +194,10 @@ AC_ARG_WITH([library-name], [AS_HELP_STRING([--with-library-name], [Set protocol | ||
194 | AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library) | 194 | AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library) |
195 | AC_SUBST(LIBRARY_NAME,$app_cv_library) | 195 | AC_SUBST(LIBRARY_NAME,$app_cv_library) |
196 | 196 | ||
197 | +app_cv_application_id="br.com.bb.$app_cv_product" | ||
198 | +AC_DEFINE_UNQUOTED(APPLICATION_ID, $app_cv_application_id) | ||
199 | +AC_SUBST(APPLICATION_ID,$app_cv_application_id) | ||
200 | + | ||
197 | dnl --------------------------------------------------------------------------- | 201 | dnl --------------------------------------------------------------------------- |
198 | dnl Check for GTK | 202 | dnl Check for GTK |
199 | dnl --------------------------------------------------------------------------- | 203 | dnl --------------------------------------------------------------------------- |
src/include/config.h.in
@@ -35,6 +35,7 @@ | @@ -35,6 +35,7 @@ | ||
35 | #undef PACKAGE_VERSION | 35 | #undef PACKAGE_VERSION |
36 | #undef PACKAGE_RELEASE | 36 | #undef PACKAGE_RELEASE |
37 | #undef PRODUCT_NAME | 37 | #undef PRODUCT_NAME |
38 | + #undef APPLICATION_ID | ||
38 | 39 | ||
39 | #endif /* PW3270_CONFIG_H_INCLUDED */ | 40 | #endif /* PW3270_CONFIG_H_INCLUDED */ |
40 | 41 |
src/main/main.c
@@ -106,7 +106,7 @@ int main (int argc, char **argv) { | @@ -106,7 +106,7 @@ int main (int argc, char **argv) { | ||
106 | 106 | ||
107 | // Setup and start application. | 107 | // Setup and start application. |
108 | g_set_application_name(G_STRINGIFY(PRODUCT_NAME)); | 108 | g_set_application_name(G_STRINGIFY(PRODUCT_NAME)); |
109 | - app = pw3270_application_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME),G_APPLICATION_HANDLES_OPEN); | 109 | + app = pw3270_application_new(G_STRINGIFY(APPLICATION_ID),G_APPLICATION_HANDLES_OPEN); |
110 | 110 | ||
111 | #ifdef G_OS_UNIX | 111 | #ifdef G_OS_UNIX |
112 | g_unix_signal_add(SIGTERM, (GSourceFunc) quit_signal, app); | 112 | g_unix_signal_add(SIGTERM, (GSourceFunc) quit_signal, app); |