central version.h. the build system could overwrite it...

git-svn-id: http://tint2.googlecode.com/svn/trunk@353 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-01-15 20:09:35 +00:00
parent 221f2875b3
commit c7d1551dc2
6 changed files with 11 additions and 7 deletions

View File

@@ -31,7 +31,8 @@ tint2_SOURCES = config.c \
taskbar/taskbar.h \ taskbar/taskbar.h \
taskbar/task.h \ taskbar/task.h \
tooltip/tooltip.c \ tooltip/tooltip.c \
tooltip/tooltip.h tooltip/tooltip.h \
version.h
if ENABLE_BATTERY if ENABLE_BATTERY
DEFS += -DENABLE_BATTERY DEFS += -DENABLE_BATTERY

View File

@@ -570,7 +570,6 @@ void set_panel_background(Panel *p)
x -= xoff; x -= xoff;
y -= yoff; y -= yoff;
} }
//printf("x %d, y %d\n", x, y);
XSetTSOrigin(server.dsp, server.gc, -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); XFillRectangle(server.dsp, p->area.pix, server.gc, 0, 0, p->area.width, p->area.height);
} }

View File

@@ -31,6 +31,7 @@
#include <Imlib2.h> #include <Imlib2.h>
#include <signal.h> #include <signal.h>
#include "version.h"
#include "server.h" #include "server.h"
#include "window.h" #include "window.h"
#include "config.h" #include "config.h"
@@ -59,7 +60,7 @@ void init (int argc, char *argv[])
exit(0); exit(0);
} }
if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) { if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) {
printf("tint2 version 0.8\n"); printf("tint2 version %s\n", VERSION_STRING);
exit(0); exit(0);
} }
if (!strcmp(argv[i], "-c")) { if (!strcmp(argv[i], "-c")) {

View File

@@ -1,7 +1,7 @@
if ENABLE_TINT2CONF if ENABLE_TINT2CONF
bin_PROGRAMS = tint2conf bin_PROGRAMS = tint2conf
dist_bin_SCRIPTS = tintwizard.py 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 INCLUDES = -I../util
AM_CFLAGS += @TINT2CONF_CFLAGS@ AM_CFLAGS += @TINT2CONF_CFLAGS@

View File

@@ -28,12 +28,11 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include "version.h"
#include "common.h" #include "common.h"
#include "theme_view.h" #include "theme_view.h"
#define LONG_VERSION_STRING "0.7"
// default config file and directory // default config file and directory
char *g_path_config = 0; char *g_path_config = 0;
@@ -195,7 +194,7 @@ static void menuAbout(GtkWindow * parent)
gtk_show_about_dialog( parent, "name", g_get_application_name( ), gtk_show_about_dialog( parent, "name", g_get_application_name( ),
"comments", _("Theming tool for tint2 panel"), "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"), "copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"),
"logo-icon-name", NULL, "authors", authors, "logo-icon-name", NULL, "authors", authors,
/* Translators: translate "translator-credits" as /* Translators: translate "translator-credits" as

4
src/version.h Normal file
View File

@@ -0,0 +1,4 @@
#define VERSION_STRING "0.9rc1"