-LRN: fix license display, more about windows

4 files changed, 35 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 7e9a52b6..80dffb87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,10 +358,26 @@ AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing read-
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [source dir])
 
-AC_SUBST(GNUNET_FS_GTK_NAME, $PACKAGE_NAME, [name of the program])
+AC_SUBST(GNUNET_FS_GTK_NAME, "GNUnet-FS-GTK", [name of the program])
+AC_SUBST(GNUNET_PEERINFO_GTK_NAME, "GNUnet-Peerinfo-GTK", [name of the program])
+AC_SUBST(GNUNET_STATISTICS_GTK_NAME, "GNUnet-Statistics-GTK", [name of the program])
+AC_SUBST(GNUNET_SETUP_GTK_NAME, "GNUnet-Setup", [name of the program])
+
 AC_SUBST(GNUNET_FS_GTK_VERSION3, $PACKAGE_VERSION, [version of the program])
+AC_SUBST(GNUNET_PEERINFO_GTK_VERSION3, $PACKAGE_VERSION, [version of the program])
+AC_SUBST(GNUNET_STATISTICS_GTK_VERSION3, $PACKAGE_VERSION, [version of the program])
+AC_SUBST(GNUNET_SETUP_GTK_VERSION3, $PACKAGE_VERSION, [version of the program])
+
 AC_SUBST(GNUNET_FS_GTK_YEARFROM, [2010], [year of the first release])
-AC_SUBST(GNUNET_FS_GTK_YEARTO, [$(date | sed -e 's/.* \([[[:digit:]]]\+\)$/\1/')], [year of the most current release])
+AC_SUBST(GNUNET_PEERINFO_GTK_YEARFROM, [2010], [year of the first release])
+AC_SUBST(GNUNET_STATISTICS_GTK_YEARFROM, [2010], [year of the first release])
+AC_SUBST(GNUNET_SETUP_GTK_YEARFROM, [2010], [year of the first release])
+
+thisyear=$(date | sed -e 's/.* \([[[:digit:]]]\+\)$/\1/')
+AC_SUBST(GNUNET_FS_GTK_YEARTO, ${thisyear}, [year of the most current release])
+AC_SUBST(GNUNET_PEERINFO_GTK_YEARTO, ${thisyear}, [year of the most current release])
+AC_SUBST(GNUNET_STATISTICS_GTK_YEARTO, ${thisyear}, [year of the most current release])
+AC_SUBST(GNUNET_SETUP_GTK_YEARTO, ${thisyear}, [year of the most current release])
 
 AC_OUTPUT([
 Makefile
@@ -380,4 +396,7 @@ po/Makefile
 gnunet-fs-gtk.desktop
 gnunet-setup.desktop
 contrib/gnunet_fs_gtk_about_window.glade
+contrib/gnunet_peerinfo_gtk_about_window.glade
+contrib/gnunet_statistics_gtk_about_window.glade
+contrib/gnunet_setup_about_window.glade
 ])
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 0d40e9b8..e5b4ae86 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = \
   $(IMAGES)
 
 pkgdata_DATA = \
-  gnunet_fs_gtk_about_dialog.glade \
+  gnunet_fs_gtk_about_window.glade \
   gnunet_fs_gtk_advertise_pseudonym_dialog.glade \
   gnunet_fs_gtk_create_namespace_dialog.glade \
   gnunet_fs_gtk_download_as_dialog.glade \
@@ -29,12 +29,11 @@ pkgdata_DATA = \
   gnunet_fs_gtk_search_tab.glade \
   gnunet_fs_gtk_select_pseudonym_dialog.glade \
   gnunet_gtk_status_bar_menu.glade \
-  gnunet_peerinfo_gtk_about_dialog.glade \
+  gnunet_peerinfo_gtk_about_window.glade \
   gnunet_peerinfo_gtk_main_window.glade \
-  gnunet_statistics_gtk_about_dialog.glade \
+  gnunet_statistics_gtk_about_window.glade \
   gnunet_statistics_gtk_main_window.glade \
-  gnunet_setup_gtk_main_window.glade \
-  gnunet_fs_gtk_about_window.glade
+  gnunet_setup_gtk_main_window.glade
 
 install-data-local:
         $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)
diff --git a/src/lib/about.c b/src/lib/about.c
index 6e2b80f1..2d643033 100644
--- a/src/lib/about.c
+++ b/src/lib/about.c
@@ -65,12 +65,20 @@ GNUNET_GTK_about_window_realized (GtkWidget *widget, gpointer user_data)
   GtkBuilder *builder = GTK_BUILDER (user_data);
   GtkTextBuffer *license_contents;
   gchar *license = NULL;
+  const char *path;
+  char *license_path = NULL;
   license_contents = GTK_TEXT_BUFFER (gtk_builder_get_object (builder, "license_contents"));
-  if (g_file_get_contents ("COPYING", &license, NULL, NULL) && license != NULL)
+  path = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DOCDIR);
+  if (path != NULL)
+    GNUNET_asprintf (&license_path, "%s%s", path, "COPYING");
+  else
+    license_path = GNUNET_strdup ("COPYING");
+  if (g_file_get_contents (license_path, &license, NULL, NULL) && license != NULL)
   {
     gtk_text_buffer_set_text (license_contents, license, -1);
     g_free (license);
   }
+  GNUNET_free_non_null (license_path);
 }
 
 G_MODULE_EXPORT void
diff --git a/src/statistics/gnunet-statistics-gtk-about.c b/src/statistics/gnunet-statistics-gtk-about.c
index 453306c5..ea4591b1 100644
--- a/src/statistics/gnunet-statistics-gtk-about.c
+++ b/src/statistics/gnunet-statistics-gtk-about.c
@@ -35,7 +35,7 @@ void
 GNUNET_STATISTICS_GTK_main_menu_help_about_activate_cb (GtkWidget * dummy,
                                                         gpointer data)
 {
-  GNUNET_GTK_display_about ("gnunet_statistics_gtk_about_dialog.glade");
+  GNUNET_GTK_display_about ("gnunet_statistics_gtk_about_window.glade");
 }