zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 20:33:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replace deprecated g_basename with g_path_get_basename.

Browse source
This commit is contained in:
David Hill 2014-06-16 11:45:26 -04:00
commit 9d6cd87b0f
5 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/fe-common/core/completion.c
View file

@ -284,9 +284,9 @@ GList *filename_complete(const char *path, const char *default_path)
GList *list;
DIR *dirp;
struct dirent *dp;
const char *basename;
char *basename;
char *realpath, *dir, *name;
int len;
size_t len;
g_return_val_if_fail(path != NULL, NULL);
@ -319,7 +319,7 @@ GList *filename_complete(const char *path, const char *default_path)
g_free_and_null(dir);
}
basename = g_basename(path);
basename = g_path_get_basename(path);
len = strlen(basename);
/* add all files in directory to completion list */
@ -341,6 +341,7 @@ GList *filename_complete(const char *path, const char *default_path)
}
}
closedir(dirp);
g_free(basename);
g_free_not_null(dir);
return list;

6
src/fe-common/core/themes.c
View file

@ -1138,6 +1138,7 @@ static void theme_save(THEME_REC *theme, int save_all)
CONFIG_REC *config;
THEME_SAVE_REC data;
char *path;
char *basename;
int ok;
config = config_open(theme->path, -1);
@ -1160,10 +1161,11 @@ static void theme_save(THEME_REC *theme, int save_all)
data.save_all = save_all;
g_hash_table_foreach(theme->modules, (GHFunc) module_save, &data);
basename = g_path_get_basename(theme->path);
/* always save the theme to ~/.irssi/ */
path = g_strdup_printf("%s/%s", get_irssi_dir(),
g_basename(theme->path));
path = g_strdup_printf("%s/%s", get_irssi_dir(), basename);
ok = config_write(config, path, 0660) == 0;
g_free(basename);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
ok ? TXT_THEME_SAVED : TXT_THEME_SAVE_FAILED,