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

diff --git a/src/Makefile.am b/src/Makefile.am
index 6813a04c69565039b5ae085d65a4002225a0d1a8..64c3b7404d8bbeaf1261c70cdc5e947e28698dcc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,8 @@ tint2_SOURCES = config.c \
                                taskbar/taskbar.h \
                                taskbar/task.h \
                                tooltip/tooltip.c \
-                               tooltip/tooltip.h
+                               tooltip/tooltip.h \
+                               version.h
 
 if ENABLE_BATTERY
 DEFS += -DENABLE_BATTERY

diff --git a/src/panel.c b/src/panel.c
index 77dcb2dd5eac3db002dfca808503a06a2ba43f24..eb839021d5740c1b04576ca6159ca98384e7cbeb 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -570,7 +570,6 @@ void set_panel_background(Panel *p)
                        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);
        }

diff --git a/src/tint.c b/src/tint.c
index a6065465754f380e28a1dbe83c2f7c712fe9d7d8..c95c3171a2e823063a2db8c674029dc7aa722283 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -31,6 +31,7 @@
 #include <Imlib2.h>
 #include <signal.h>
 
+#include "version.h"
 #include "server.h"
 #include "window.h"
 #include "config.h"
@@ -59,7 +60,7 @@ void init (int argc, char *argv[])
                        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")) {

diff --git a/src/tint2conf/Makefile.am b/src/tint2conf/Makefile.am
index 6e85d01bdb135b9bc03b5f97bbdc698aef8283c6..c76dc9203dc6ba12b1293fdff3508f7011b8feda 100644 (file)
--- a/src/tint2conf/Makefile.am
+++ b/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@

diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c
index 86a29681c41dcd78caa32b4ec779226b3b2f75ac..702610219b2b8551e658220a31d582c9e3b3859b 100644 (file)
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -28,12 +28,11 @@
 #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
 char *g_path_config = 0;
@@ -195,7 +194,7 @@ static void menuAbout(GtkWindow * parent)
 
        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

diff --git a/src/version.h b/src/version.h
new file mode 100644 (file)
index 0000000..a38524e
--- /dev/null
+++ b/src/version.h
@@ -0,0 +1,4 @@
+
+
+#define VERSION_STRING "0.9rc1"
+