diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/cfgfiles.c | 10 | ||||
| -rw-r--r-- | src/common/dbus/dbus-client.c | 1 | ||||
| -rw-r--r-- | src/common/hexchat.c | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 76ed564f..a7949d3f 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -752,15 +752,19 @@ load_config (void) snprintf (prefs.hex_dcc_dir, sizeof (prefs.hex_dcc_dir), "%s\\Downloads", out); } #else - if (g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD)) - strcpy (prefs.hex_dcc_dir, g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD)); + if (g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD)) + { + strcpy (prefs.hex_dcc_dir, g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD)); + } else + { strcpy (prefs.hex_dcc_dir, g_build_filename (g_get_home_dir (), "Downloads", NULL)); + } #endif strcpy (prefs.hex_dnsprogram, "host"); strcpy (prefs.hex_gui_ulist_doubleclick, "QUERY %s"); strcpy (prefs.hex_input_command_char, "/"); - strcpy (prefs.hex_irc_logmask, "%n-%c.log"); + strcpy (prefs.hex_irc_logmask, g_build_filename ("%n", "%c.log", NULL)); strcpy (prefs.hex_irc_nick1, username); strcpy (prefs.hex_irc_nick2, username); strcat (prefs.hex_irc_nick2, "_"); diff --git a/src/common/dbus/dbus-client.c b/src/common/dbus/dbus-client.c index cc2fd087..a30a75bd 100644 --- a/src/common/dbus/dbus-client.c +++ b/src/common/dbus/dbus-client.c @@ -19,6 +19,7 @@ * xclaesse@gmail.com */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS #include <dbus/dbus-glib.h> #include "dbus-client.h" #include "../hexchat.h" diff --git a/src/common/hexchat.c b/src/common/hexchat.c index cef391d2..72b97e3a 100644 --- a/src/common/hexchat.c +++ b/src/common/hexchat.c @@ -304,7 +304,7 @@ away_check (void) GSList *list; int full, sent, loop = 0; - if (!prefs.hex_away_track || prefs.hex_away_size_max < 1) + if (!prefs.hex_away_track) return 1; doover: @@ -319,7 +319,7 @@ doover: if (sess->server->connected && sess->type == SESS_CHANNEL && sess->channel[0] && - sess->total <= prefs.hex_away_size_max) + (sess->total <= prefs.hex_away_size_max || !prefs.hex_away_size_max)) { if (!sess->done_away_check) { |