PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

rofi: Fix g_file_test calls 

G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR will return TRUE even for
directory.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2016-04-01 09:33:57 +02:00
parent 0c7d1a6b17
commit 13601fb892
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/rofi.c
View File

@ -434,7 +434,7 @@ static inline void load_configuration ( )
char *config_path = NULL;
// Load distro default settings
gchar *etc = g_build_filename ( G_DIR_SEPARATOR_S, "etc", "rofi.conf", NULL );
if ( g_file_test ( etc, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR ) ) {
if ( g_file_test ( etc, G_FILE_TEST_IS_REGULAR ) ) {
config_parse_xresource_options_file ( etc );
config_parse_xresource_options_dynamic_file ( etc );
}
@ -455,7 +455,7 @@ static inline void load_configuration ( )
config_path = rofi_expand_path ( c );
}
if ( config_path != NULL ) {
if ( g_file_test ( config_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR ) ) {
if ( g_file_test ( config_path, G_FILE_TEST_IS_REGULAR ) ) {
// Load config from config file.
config_parse_xresource_options_file ( config_path );
config_parse_xresource_options_dynamic_file ( config_path );
@ -466,7 +466,7 @@ static inline void load_configuration ( )
// Load theme file
if ( cpath ) {
char *theme_path = g_build_filename ( cpath, "rofi", "theme", NULL );
if ( g_file_test ( theme_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR ) ) {
if ( g_file_test ( theme_path, G_FILE_TEST_IS_REGULAR ) ) {
config_parse_xresource_options_file ( theme_path );
config_parse_xresource_options_dynamic_file ( theme_path );
}