Skip to content

Commit

Permalink
Drop version.h, fix png path and use SINC as default
Browse files Browse the repository at this point in the history
  • Loading branch information
axkg committed Apr 7, 2024
1 parent c18e405 commit f401896
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 34 deletions.
3 changes: 1 addition & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ hdr = [
'src/tX_vttgui.h',
'src/tX_vtt.h',
'src/tX_widget.h',
'src/version.h',
'src/wav_file.h'
]

Expand Down Expand Up @@ -264,4 +263,4 @@ subdir('help')

# data

subdir('data')
subdir('data')
3 changes: 1 addition & 2 deletions src/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#include "tX_endian.h"
#include "tX_global.h"
#include "tX_types.h"
#include "version.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <string.h>
Expand Down Expand Up @@ -192,7 +191,7 @@ int main(int argc, char** argv) {

/* No suidroot below this comment. */

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

if (keep_caps_failed) {
Expand Down
3 changes: 1 addition & 2 deletions src/tX_dialog.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
#include "tX_engine.h"
#include "tX_maingui.h"
#include "tX_vtt.h"
#include "version.h"
#include <dirent.h>

extern "C" {
Expand Down Expand Up @@ -782,7 +781,7 @@ void tX_set_icon(GtkWidget* widget) {
tX_error("Error accessing tX_dialog resources: %s", error->message);
}
}
tX_window_icon = gdk_pixbuf_new_from_resource("/org/terminatorX/tX_dialog/../../icons/terminatorX.png", &error);
tX_window_icon = gdk_pixbuf_new_from_resource("/org/terminatorX/tX_dialog/../../data/icons/org.terminatorx.terminatorX.png", &error);
if (error) {
tX_error("Error rendering tX icon: %s", error->message);
}
Expand Down
2 changes: 1 addition & 1 deletion src/tX_global.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void set_global_defaults() {
#endif
#endif
#endif
globals.interpolator_type = LINEAR;
globals.interpolator_type = SINC;

globals.use_stdout_cmdline = 0;
strcpy(globals.current_path, "");
Expand Down
1 change: 0 additions & 1 deletion src/tX_maingui.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include "tX_ui_support.h"
#include "tX_vtt.h"
#include "tX_vttgui.h"
#include "version.h"
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
Expand Down
26 changes: 0 additions & 26 deletions src/version.h

This file was deleted.

0 comments on commit f401896

Please sign in to comment.