SoniEx2/c.sexchat
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove sound_dir, it's pointless

Browse source
This commit is contained in:
Berke Viktor 2013-04-14 10:47:37 +02:00
parent 059e4ec9c8
commit db582a4e5c
4 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/cfgfiles.c
View file

@ -558,7 +558,6 @@ const struct prefs vars[] =
{"perl_warnings", P_OFFINT (hex_perl_warnings), TYPE_BOOL}, {"perl_warnings", P_OFFINT (hex_perl_warnings), TYPE_BOOL},
{"sound_command", P_OFFSET (hex_sound_command), TYPE_STR}, {"sound_command", P_OFFSET (hex_sound_command), TYPE_STR},
{"sound_dir", P_OFFSET (hex_sound_dir), TYPE_STR},
{"stamp_log", P_OFFINT (hex_stamp_log), TYPE_BOOL}, {"stamp_log", P_OFFINT (hex_stamp_log), TYPE_BOOL},
{"stamp_log_format", P_OFFSET (hex_stamp_log_format), TYPE_STR}, {"stamp_log_format", P_OFFSET (hex_stamp_log_format), TYPE_STR},
@ -779,7 +778,6 @@ load_config (void)
strcpy (prefs.hex_irc_quit_reason, prefs.hex_irc_part_reason); strcpy (prefs.hex_irc_quit_reason, prefs.hex_irc_part_reason);
strcpy (prefs.hex_irc_real_name, realname); strcpy (prefs.hex_irc_real_name, realname);
strcpy (prefs.hex_irc_user_name, username); strcpy (prefs.hex_irc_user_name, username);
snprintf (prefs.hex_sound_dir, sizeof (prefs.hex_sound_dir), "%s" G_DIR_SEPARATOR_S "sounds", get_xdir ());
strcpy (prefs.hex_stamp_log_format, "%b %d %H:%M:%S "); strcpy (prefs.hex_stamp_log_format, "%b %d %H:%M:%S ");
strcpy (prefs.hex_stamp_text_format, "[%H:%M:%S] "); strcpy (prefs.hex_stamp_text_format, "[%H:%M:%S] ");
#ifdef WIN32 #ifdef WIN32

1
src/common/hexchat.h
View file

@ -337,7 +337,6 @@ struct hexchatprefs
char hex_net_proxy_pass[32]; char hex_net_proxy_pass[32];
char hex_net_proxy_user[32]; char hex_net_proxy_user[32];
char hex_sound_command[PATHLEN + 1]; char hex_sound_command[PATHLEN + 1];
char hex_sound_dir[PATHLEN + 1];
char hex_stamp_log_format[64]; char hex_stamp_log_format[64];
char hex_stamp_text_format[64]; char hex_stamp_text_format[64];
char hex_text_background[PATHLEN + 1]; char hex_text_background[PATHLEN + 1];

2
src/common/text.c
View file

@ -2243,7 +2243,7 @@ sound_play (const char *file, gboolean quiet)
} }
else else
{ {
wavfile = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s", prefs.hex_sound_dir, file); wavfile = g_build_filename (get_xdir (), "sounds", file, NULL);
} }
if (g_access (wavfile, R_OK) == 0) if (g_access (wavfile, R_OK) == 0)

11
src/fe-gtk/setup.c
View file

@ -1520,7 +1520,6 @@ setup_create_color_page (void)
static GtkWidget *sndprog_entry; static GtkWidget *sndprog_entry;
static GtkWidget *sndfile_entry; static GtkWidget *sndfile_entry;
static GtkWidget *snddir_entry;
static int ignore_changed = FALSE; static int ignore_changed = FALSE;
extern struct text_event te[]; /* text.c */ extern struct text_event te[]; /* text.c */
@ -1529,7 +1528,6 @@ extern char *sound_files[];
static void static void
setup_snd_apply (void) setup_snd_apply (void)
{ {
strcpy (setup_prefs.hex_sound_dir, GTK_ENTRY (snddir_entry)->text);
strcpy (setup_prefs.hex_sound_command, GTK_ENTRY (sndprog_entry)->text); strcpy (setup_prefs.hex_sound_command, GTK_ENTRY (sndprog_entry)->text);
} }
@ -1697,7 +1695,6 @@ setup_create_sound_page (void)
GSList *radio_group = NULL; GSList *radio_group = NULL;
GtkWidget *radio_auto; GtkWidget *radio_auto;
GtkWidget *label4; GtkWidget *label4;
GtkWidget *entry3;
GtkWidget *scrolledwindow1; GtkWidget *scrolledwindow1;
GtkWidget *sound_tree; GtkWidget *sound_tree;
GtkWidget *table1; GtkWidget *table1;
@ -1776,13 +1773,6 @@ setup_create_sound_page (void)
(GtkAttachOptions) (0), 0, 0); (GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
snddir_entry = entry3 = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry3), setup_prefs.hex_sound_dir);
gtk_widget_show (entry3);
gtk_table_attach (GTK_TABLE (table2), entry3, 1, 3, 3, 4,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (scrolledwindow1); gtk_widget_show (scrolledwindow1);
gtk_container_add (GTK_CONTAINER (vbox2), scrolledwindow1); gtk_container_add (GTK_CONTAINER (vbox2), scrolledwindow1);
@ -1844,7 +1834,6 @@ setup_create_sound_page (void)
(GtkAttachOptions) (0), 0, 0); (GtkAttachOptions) (0), 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label3), sndprog_entry); gtk_label_set_mnemonic_widget (GTK_LABEL (label3), sndprog_entry);
gtk_label_set_mnemonic_widget (GTK_LABEL (label4), entry3);
setup_snd_row_cb (sel, NULL); setup_snd_row_cb (sel, NULL);
return vbox1; return vbox1;