Skip to content

Commit f401896

Browse files
committed
Drop version.h, fix png path and use SINC as default
1 parent c18e405 commit f401896

File tree

6 files changed

+4
-34
lines changed

6 files changed

+4
-34
lines changed

meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ hdr = [
8383
'src/tX_vttgui.h',
8484
'src/tX_vtt.h',
8585
'src/tX_widget.h',
86-
'src/version.h',
8786
'src/wav_file.h'
8887
]
8988

@@ -264,4 +263,4 @@ subdir('help')
264263

265264
# data
266265

267-
subdir('data')
266+
subdir('data')

src/main.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "tX_endian.h"
4141
#include "tX_global.h"
4242
#include "tX_types.h"
43-
#include "version.h"
4443
#include <glib.h>
4544
#include <gtk/gtk.h>
4645
#include <string.h>
@@ -192,7 +191,7 @@ int main(int argc, char** argv) {
192191

193192
/* No suidroot below this comment. */
194193

195-
fprintf(stderr, "%s - Copyright (C) 1999-2022 by Alexander König\n", VERSIONSTRING);
194+
fprintf(stderr, "%s - Copyright (C) 1999-2022 by Alexander König\n", PACKAGE " release " VERSION);
196195
fprintf(stderr, "terminatorX comes with ABSOLUTELY NO WARRANTY - for details read the license.\n");
197196

198197
if (keep_caps_failed) {

src/tX_dialog.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include "tX_engine.h"
4040
#include "tX_maingui.h"
4141
#include "tX_vtt.h"
42-
#include "version.h"
4342
#include <dirent.h>
4443

4544
extern "C" {
@@ -782,7 +781,7 @@ void tX_set_icon(GtkWidget* widget) {
782781
tX_error("Error accessing tX_dialog resources: %s", error->message);
783782
}
784783
}
785-
tX_window_icon = gdk_pixbuf_new_from_resource("/org/terminatorX/tX_dialog/../../icons/terminatorX.png", &error);
784+
tX_window_icon = gdk_pixbuf_new_from_resource("/org/terminatorX/tX_dialog/../../data/icons/org.terminatorx.terminatorX.png", &error);
786785
if (error) {
787786
tX_error("Error rendering tX icon: %s", error->message);
788787
}

src/tX_global.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void set_global_defaults() {
124124
#endif
125125
#endif
126126
#endif
127-
globals.interpolator_type = LINEAR;
127+
globals.interpolator_type = SINC;
128128

129129
globals.use_stdout_cmdline = 0;
130130
strcpy(globals.current_path, "");

src/tX_maingui.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "tX_ui_support.h"
3838
#include "tX_vtt.h"
3939
#include "tX_vttgui.h"
40-
#include "version.h"
4140
#include <gdk/gdkkeysyms.h>
4241
#include <gdk/gdkx.h>
4342
#include <gtk/gtk.h>

src/version.h

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)