central version.h. the build system could overwrite it... git-svn-id: http://tint2.googlecode.com/svn/trunk@353 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
6 files changed,
11 insertions(+),
7 deletions(-)
M
src/Makefile.am
→
src/Makefile.am
@@ -31,7 +31,8 @@ taskbar/task.c \
taskbar/taskbar.h \ taskbar/task.h \ tooltip/tooltip.c \ - tooltip/tooltip.h + tooltip/tooltip.h \ + version.h if ENABLE_BATTERY DEFS += -DENABLE_BATTERY
M
src/panel.c
→
src/panel.c
@@ -570,7 +570,6 @@ if (panel_autohide && p->is_hidden) {
x -= xoff; y -= yoff; } - //printf("x %d, y %d\n", x, y); XSetTSOrigin(server.dsp, server.gc, -x, -y); XFillRectangle(server.dsp, p->area.pix, server.gc, 0, 0, p->area.width, p->area.height); }
M
src/tint.c
→
src/tint.c
@@ -31,6 +31,7 @@ #include <X11/extensions/Xdamage.h>
#include <Imlib2.h> #include <signal.h> +#include "version.h" #include "server.h" #include "window.h" #include "config.h"@@ -59,7 +60,7 @@ printf("Usage: tint2 [-c] <config_file>\n");
exit(0); } if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) { - printf("tint2 version 0.8\n"); + printf("tint2 version %s\n", VERSION_STRING); exit(0); } if (!strcmp(argv[i], "-c")) {
M
src/tint2conf/Makefile.am
→
src/tint2conf/Makefile.am
@@ -1,7 +1,7 @@
if ENABLE_TINT2CONF bin_PROGRAMS = tint2conf dist_bin_SCRIPTS = tintwizard.py -tint2conf_SOURCES = main.c theme_view.c theme_view.h ../util/common.c +tint2conf_SOURCES = main.c theme_view.c theme_view.h ../util/common.c ../version.h INCLUDES = -I../util AM_CFLAGS += @TINT2CONF_CFLAGS@
M
src/tint2conf/main.c
→
src/tint2conf/main.c
@@ -28,11 +28,10 @@ #include <glib.h>
#include <glib/gstdio.h> #include <glib/gi18n.h> +#include "version.h" #include "common.h" #include "theme_view.h" - -#define LONG_VERSION_STRING "0.7" // default config file and directory@@ -195,7 +194,7 @@ const char *authors[] = { "Thierry Lorthiois <lorthiois@bbsoft.fr>", "Andreas Fink <andreas.fink85@googlemail.com>", "Christian Ruppert <Spooky85@gmail.com> (Build system)", "Euan Freeman <euan04@gmail.com> (tintwizard)\n See http://code.google.com/p/tintwizard/", NULL };
gtk_show_about_dialog( parent, "name", g_get_application_name( ), "comments", _("Theming tool for tint2 panel"), - "version", LONG_VERSION_STRING, + "version", VERSION_STRING, "copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"), "logo-icon-name", NULL, "authors", authors, /* Translators: translate "translator-credits" as