Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GCC 10.1+ fixes made by @vp1981 for #770 #772

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
language: c

before_install:
- sudo apt-get install intltool libgtk2.0-dev libudev-dev libstartup-notification0-dev ffmpeg libffmpegthumbnailer-dev

script:
- ./configure && make && make check
Binary file modified data/faenza/spacefm-find.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/faenza/spacefm-root.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/faenza/spacefm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/spacefm-128-cube-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/spacefm-128-pyramid-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/spacefm-128-pyramid-green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/spacefm-128-pyramid-red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/spacefm-48-faenza-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/spacefm-48-faenza-find.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/spacefm-48-faenza-red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions src/settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,25 @@
/* Dirty hack: check whether we are under LXDE or not */
#define is_under_LXDE() (g_getenv( "_LXSESSION_PID" ) != NULL)

/* GCC 10.1+ */
char* settings_terminal_su = NULL;
char* settings_graphical_su = NULL;
GList* xset_cmd_history = NULL;
XSet* evt_win_focus = NULL;
XSet* evt_win_move = NULL;
XSet* evt_win_click = NULL;
XSet* evt_win_key = NULL;
XSet* evt_win_close = NULL;
XSet* evt_pnl_show = NULL;
XSet* evt_pnl_focus = NULL;
XSet* evt_pnl_sel = NULL;
XSet* evt_tab_new = NULL;
XSet* evt_tab_chdir = NULL;
XSet* evt_tab_focus = NULL;
XSet* evt_tab_close = NULL;
XSet* evt_device = NULL;


AppSettings app_settings = {0};
/* const gboolean singleInstance_default = TRUE; */
const gboolean show_hidden_files_default = FALSE;
Expand Down
34 changes: 17 additions & 17 deletions src/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const char* xset_get_user_tmp_dir();
///////////////////////////////////////////////////////////////////////////////
//MOD extra settings below

GList* xsets;
extern GList* xsets;

enum {
XSET_B_UNSET,
Expand Down Expand Up @@ -311,22 +311,22 @@ typedef struct
} XMenuItem;

// cache these for speed in event handlers
XSet* evt_win_focus;
XSet* evt_win_move;
XSet* evt_win_click;
XSet* evt_win_key;
XSet* evt_win_close;
XSet* evt_pnl_show;
XSet* evt_pnl_focus;
XSet* evt_pnl_sel;
XSet* evt_tab_new;
XSet* evt_tab_chdir;
XSet* evt_tab_focus;
XSet* evt_tab_close;
XSet* evt_device;
extern XSet* evt_win_focus;
extern XSet* evt_win_move;
extern XSet* evt_win_click;
extern XSet* evt_win_key;
extern XSet* evt_win_close;
extern XSet* evt_pnl_show;
extern XSet* evt_pnl_focus;
extern XSet* evt_pnl_sel;
extern XSet* evt_tab_new;
extern XSet* evt_tab_chdir;
extern XSet* evt_tab_focus;
extern XSet* evt_tab_close;
extern XSet* evt_device;

// instance-wide command history
GList* xset_cmd_history;
extern GList* xset_cmd_history;

static const char* terminal_programs[] = //for pref-dialog.c
{
Expand Down Expand Up @@ -374,8 +374,8 @@ static const char* gsu_commands[] = // order and contents must match prefdlg.ui
};

// These will contain the su and gsu settings from /etc/spacefm/spacefm.conf
char* settings_terminal_su;
char* settings_graphical_su;
extern char* settings_terminal_su;
extern char* settings_graphical_su;

typedef struct
{
Expand Down