PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00
Code Releases Activity

Fixing SardemFF7 Feedback: boolean, g_getenv and clear_error

Browse source
This commit is contained in:
Dave Davenport 2016-01-14 21:06:03 +01:00
parent 98fdf04285
commit ec24e4426e
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/dialogs/run.c
View file

@ -239,14 +239,13 @@ static char ** get_apps ( unsigned int *length )
// Keep track of how many where loaded as favorite. // Keep track of how many where loaded as favorite.
num_favorites = ( *length ); num_favorites = ( *length );
path = g_strdup ( getenv ( "PATH" ) ); path = g_strdup ( g_getenv ( "PATH" ) );
gsize l = 0; gsize l = 0;
gchar *homedir = g_locale_to_utf8 ( g_get_home_dir (), -1, NULL, &l, &error ); gchar *homedir = g_locale_to_utf8 ( g_get_home_dir (), -1, NULL, &l, &error );
if ( error != NULL ) { if ( error != NULL ) {
fprintf ( stderr, "Failed to convert homedir to UTF-8: %s\n", error->message ); fprintf ( stderr, "Failed to convert homedir to UTF-8: %s\n", error->message );
g_error_free ( error ); g_clear_error ( &error );
error = NULL;
g_free ( homedir ); g_free ( homedir );
return NULL; return NULL;
} }
@ -257,14 +256,13 @@ static char ** get_apps ( unsigned int *length )
if ( dir != NULL ) { if ( dir != NULL ) {
struct dirent *dent; struct dirent *dent;
gsize dirn_len = 0; gsize dirn_len = 0;
gchar *dirn = g_filename_to_utf8 ( dirname, -1, NULL, &dirn_len, &error ); gchar *dirn = g_locale_to_utf8 ( dirname, -1, NULL, &dirn_len, &error );
if ( error != NULL ) { if ( error != NULL ) {
fprintf ( stderr, "Failed to convert directory name to UTF-8: %s\n", error->message ); fprintf ( stderr, "Failed to convert directory name to UTF-8: %s\n", error->message );
g_error_free ( error ); g_clear_error ( &error );
error = NULL;
continue; continue;
} }
int is_homedir = g_str_has_prefix ( dirn, homedir ); gboolean is_homedir = g_str_has_prefix ( dirn, homedir );
g_free ( dirn ); g_free ( dirn );
while ( ( dent = readdir ( dir ) ) != NULL ) { while ( ( dent = readdir ( dir ) ) != NULL ) {
@ -288,8 +286,7 @@ static char ** get_apps ( unsigned int *length )
gchar *name = g_filename_to_utf8 ( dent->d_name, -1, NULL, &name_len, &error ); gchar *name = g_filename_to_utf8 ( dent->d_name, -1, NULL, &name_len, &error );
if ( error != NULL ) { if ( error != NULL ) {
fprintf ( stderr, "Failed to convert filename to UTF-8: %s\n", error->message ); fprintf ( stderr, "Failed to convert filename to UTF-8: %s\n", error->message );
g_error_free ( error ); g_clear_error ( &error );
error = NULL;
g_free ( name ); g_free ( name );
continue; continue;
} }