Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-16 04:03:02 +01:00
Code Issues Projects Releases Wiki Activity

stderr redirect doesn't work as intended, add invalid command message when no sound

Browse Source
This commit is contained in:
Jfreegman 2014-08-03 01:31:33 -04:00
parent 53663a7832
commit 3fc7c90630
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/execute.c
View File

@ -168,7 +168,9 @@ void execute(WINDOW *w, ToxWindow *self, Tox *m, const char *input, int mode)
if (do_command(w, self, m, num_args, GLOBAL_NUM_COMMANDS, global_commands, args) == 0) if (do_command(w, self, m, num_args, GLOBAL_NUM_COMMANDS, global_commands, args) == 0)
return; return;
/* Just play sound instead */ #ifdef _SOUND_NOTIFY
/*line_info_add(self, NULL, NULL, NULL, "Invalid command.", SYS_MSG, 0, 0);*/
sound_notify(self, error, 0, NULL); sound_notify(self, error, 0, NULL);
#else
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid command.");
#endif
} }

2
src/settings.c
View File

@ -41,8 +41,6 @@
#define PACKAGE_DATADIR "." #define PACKAGE_DATADIR "."
#endif #endif
#define NO_SOUND "silent"
const struct _ui_strings { const struct _ui_strings {
const char* self; const char* self;
const char* timestamps; const char* timestamps;

2
src/settings.h
View File

@ -23,6 +23,8 @@
#ifndef _settings_h #ifndef _settings_h
#define _settings_h #define _settings_h
#define NO_SOUND "silent"
/* holds user setting values */ /* holds user setting values */
struct user_settings { struct user_settings {
int autolog; /* boolean */ int autolog; /* boolean */

6
src/toxic.c
View File

@ -705,12 +705,6 @@ int main(int argc, char *argv[])
useconds_t msleepval = 40000; useconds_t msleepval = 40000;
uint64_t loopcount = 0; uint64_t loopcount = 0;
/* Redirect stdout to /dev/null
* NOTE: Might not be best solution
*/
freopen("/dev/null", "w", stderr);
while (true) { while (true) {
update_unix_time(); update_unix_time();
do_toxic(m, prompt); do_toxic(m, prompt);