Commit e9d6d71aa731ceb4e83a033011b4883c0f866475
1 parent
2501405b
Exists in
master
and in
2 other branches
Changing version to 5.4
Adjustments in the about dialog.
Showing
3 changed files
with
14 additions
and
7 deletions
Show diff stats
configure.ac
@@ -32,7 +32,7 @@ AC_PREREQ(2.61) | @@ -32,7 +32,7 @@ AC_PREREQ(2.61) | ||
32 | 32 | ||
33 | dnl Initialise automake with the package name, version and | 33 | dnl Initialise automake with the package name, version and |
34 | dnl bug-reporting address. | 34 | dnl bug-reporting address. |
35 | -AC_INIT([pw3270], [5.3], [perry.werneck@gmail.com]) | 35 | +AC_INIT([pw3270], [5.4], [perry.werneck@gmail.com]) |
36 | 36 | ||
37 | dnl Place auxilliary scripts here. | 37 | dnl Place auxilliary scripts here. |
38 | AC_CONFIG_AUX_DIR([scripts]) | 38 | AC_CONFIG_AUX_DIR([scripts]) |
rpm/pw3270.spec
@@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
23 | #---[ Packaging ]----------------------------------------------------------------------------------------------------- | 23 | #---[ Packaging ]----------------------------------------------------------------------------------------------------- |
24 | 24 | ||
25 | Name: pw3270 | 25 | Name: pw3270 |
26 | -Version: 5.3 | 26 | +Version: 5.4 |
27 | Release: 0 | 27 | Release: 0 |
28 | Summary: IBM 3270 Terminal emulator for GTK | 28 | Summary: IBM 3270 Terminal emulator for GTK |
29 | License: GPL-2.0 | 29 | License: GPL-2.0 |
@@ -106,7 +106,6 @@ BuildRequires: gettext-tools | @@ -106,7 +106,6 @@ BuildRequires: gettext-tools | ||
106 | BuildRequires: m4 | 106 | BuildRequires: m4 |
107 | BuildRequires: pkgconfig | 107 | BuildRequires: pkgconfig |
108 | BuildRequires: sed | 108 | BuildRequires: sed |
109 | -BuildRequires: optipng | ||
110 | BuildRequires: fdupes | 109 | BuildRequires: fdupes |
111 | BuildRequires: ImageMagick | 110 | BuildRequires: ImageMagick |
112 | BuildRequires: autoconf-archive | 111 | BuildRequires: autoconf-archive |
@@ -186,8 +185,8 @@ make all -j1 | @@ -186,8 +185,8 @@ make all -j1 | ||
186 | # Configuration & Themes | 185 | # Configuration & Themes |
187 | %{_datadir}/glib-2.0/schemas/*.xml | 186 | %{_datadir}/glib-2.0/schemas/*.xml |
188 | %{_datadir}/%{_product}/icons/gtk-*.svg | 187 | %{_datadir}/%{_product}/icons/gtk-*.svg |
189 | - | ||
190 | -%{_datadir}/pixmaps/*.png | 188 | +%{_datadir}/%{_product}/icons/connect-*.svg |
189 | +%{_datadir}/%{_product}/icons/disconnect-*.svg | ||
191 | 190 | ||
192 | %{_datadir}/applications/*.desktop | 191 | %{_datadir}/applications/*.desktop |
193 | %{_datadir}/appdata/%{_product}.appdata.xml | 192 | %{_datadir}/appdata/%{_product}.appdata.xml |
@@ -198,7 +197,7 @@ make all -j1 | @@ -198,7 +197,7 @@ make all -j1 | ||
198 | %defattr(-,root,root) | 197 | %defattr(-,root,root) |
199 | 198 | ||
200 | %{_datadir}/%{_product}/ui/* | 199 | %{_datadir}/%{_product}/ui/* |
201 | -%{_datadir}/%{_product}/*.png | 200 | +%{_datadir}/%{_product}/*.svg |
202 | %{_datadir}/%{_product}/icons/%{_product}.svg | 201 | %{_datadir}/%{_product}/icons/%{_product}.svg |
203 | 202 | ||
204 | %files keypads | 203 | %files keypads |
src/objects/application/actions/about.c
@@ -31,10 +31,18 @@ | @@ -31,10 +31,18 @@ | ||
31 | #include <pw3270/actions.h> | 31 | #include <pw3270/actions.h> |
32 | #include <pw3270/application.h> | 32 | #include <pw3270/application.h> |
33 | 33 | ||
34 | - static GtkWidget * factory(PW3270Action G_GNUC_UNUSED(*action), GtkApplication G_GNUC_UNUSED(*application)) { | 34 | + static GtkWidget * factory(PW3270Action G_GNUC_UNUSED(*action), GtkApplication *application) { |
35 | 35 | ||
36 | GtkAboutDialog * dialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); | 36 | GtkAboutDialog * dialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); |
37 | 37 | ||
38 | + if(GTK_IS_APPLICATION(application)) { | ||
39 | + | ||
40 | + gtk_window_set_transient_for(GTK_WINDOW(dialog),gtk_application_get_active_window(GTK_APPLICATION(application))); | ||
41 | + gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog),TRUE); | ||
42 | + gtk_window_set_modal(GTK_WINDOW(dialog),TRUE); | ||
43 | + | ||
44 | + } | ||
45 | + | ||
38 | // Get application logo | 46 | // Get application logo |
39 | { | 47 | { |
40 | #ifdef DEBUG | 48 | #ifdef DEBUG |