[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18806 - in gnunet-gtk: . contrib src/lib src/statistics
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18806 - in gnunet-gtk: . contrib src/lib src/statistics |
Date: |
Sun, 25 Dec 2011 15:46:50 +0100 |
Author: grothoff
Date: 2011-12-25 15:46:50 +0100 (Sun, 25 Dec 2011)
New Revision: 18806
Modified:
gnunet-gtk/configure.ac
gnunet-gtk/contrib/Makefile.am
gnunet-gtk/src/lib/about.c
gnunet-gtk/src/statistics/gnunet-statistics-gtk-about.c
Log:
-LRN: fix license display, more about windows
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2011-12-25 14:46:04 UTC (rev 18805)
+++ gnunet-gtk/configure.ac 2011-12-25 14:46:50 UTC (rev 18806)
@@ -358,11 +358,27 @@
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
contrib/Makefile
@@ -380,4 +396,7 @@
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
])
Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am 2011-12-25 14:46:04 UTC (rev 18805)
+++ gnunet-gtk/contrib/Makefile.am 2011-12-25 14:46:50 UTC (rev 18806)
@@ -13,7 +13,7 @@
$(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 @@
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)
Modified: gnunet-gtk/src/lib/about.c
===================================================================
--- gnunet-gtk/src/lib/about.c 2011-12-25 14:46:04 UTC (rev 18805)
+++ gnunet-gtk/src/lib/about.c 2011-12-25 14:46:50 UTC (rev 18806)
@@ -65,12 +65,20 @@
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
Modified: gnunet-gtk/src/statistics/gnunet-statistics-gtk-about.c
===================================================================
--- gnunet-gtk/src/statistics/gnunet-statistics-gtk-about.c 2011-12-25
14:46:04 UTC (rev 18805)
+++ gnunet-gtk/src/statistics/gnunet-statistics-gtk-about.c 2011-12-25
14:46:50 UTC (rev 18806)
@@ -35,7 +35,7 @@
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");
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18806 - in gnunet-gtk: . contrib src/lib src/statistics,
gnunet <=