aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

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
parent c26a634fe6
commit 9d6cd87b0f
5 changed files with 16 additions and 15 deletions
Show Stats 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; GList *list;
DIR *dirp; DIR *dirp;
struct dirent *dp; struct dirent *dp;
const char *basename; char *basename;
char *realpath, *dir, *name; char *realpath, *dir, *name;
int len; size_t len;
g_return_val_if_fail(path != NULL, NULL); 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); g_free_and_null(dir);
} }
basename = g_basename(path); basename = g_path_get_basename(path);
len = strlen(basename); len = strlen(basename);
/* add all files in directory to completion list */ /* add all files in directory to completion list */
@ -341,6 +341,7 @@ GList *filename_complete(const char *path, const char *default_path)
} }
} }
closedir(dirp); closedir(dirp);
g_free(basename);
g_free_not_null(dir); g_free_not_null(dir);
return list; 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; CONFIG_REC *config;
THEME_SAVE_REC data; THEME_SAVE_REC data;
char *path; char *path;
char *basename;
int ok; int ok;
config = config_open(theme->path, -1); 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; data.save_all = save_all;
g_hash_table_foreach(theme->modules, (GHFunc) module_save, &data); g_hash_table_foreach(theme->modules, (GHFunc) module_save, &data);
basename = g_path_get_basename(theme->path);
/* always save the theme to ~/.irssi/ */ /* always save the theme to ~/.irssi/ */
path = g_strdup_printf("%s/%s", get_irssi_dir(), path = g_strdup_printf("%s/%s", get_irssi_dir(), basename);
g_basename(theme->path));
ok = config_write(config, path, 0660) == 0; ok = config_write(config, path, 0660) == 0;
g_free(basename);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
ok ? TXT_THEME_SAVED : TXT_THEME_SAVE_FAILED, ok ? TXT_THEME_SAVED : TXT_THEME_SAVE_FAILED,

5
src/irc/dcc/dcc-get.c
View File

@ -55,10 +55,13 @@ static void sig_dcc_destroyed(GET_DCC_REC *dcc)
char *dcc_get_download_path(const char *fname) char *dcc_get_download_path(const char *fname)
{ {
char *str, *downpath; char *str, *downpath;
char *base;
base = g_path_get_basename(fname);
downpath = convert_home(settings_get_str("dcc_download_path")); downpath = convert_home(settings_get_str("dcc_download_path"));
str = g_strconcat(downpath, G_DIR_SEPARATOR_S, g_basename(fname), NULL); str = g_strconcat(downpath, G_DIR_SEPARATOR_S, base, NULL);
g_free(downpath); g_free(downpath);
g_free(base);
return str; return str;
} }

11
src/irc/dcc/dcc-send.c
View File

@ -408,19 +408,14 @@ static int dcc_send_one_file(int queue, const char *target, const char *fname,
handle = NULL; handle = NULL;
} }
fname = g_basename(fname); str = g_path_get_basename(fname);
/* Replace all the spaces with underscore so that lesser /* Replace all the spaces with underscore so that lesser
intelligent clients can communicate.. */ intelligent clients can communicate.. */
if (!settings_get_bool("dcc_send_replace_space_with_underscore")) if (settings_get_bool("dcc_send_replace_space_with_underscore"))
str = NULL;
else {
str = g_strdup(fname);
g_strdelimit(str, " ", '_'); g_strdelimit(str, " ", '_');
fname = str;
}
dcc = dcc_send_create(server, chat, target, fname); dcc = dcc_send_create(server, chat, target, str);
g_free(str); g_free(str);
dcc->handle = handle; dcc->handle = handle;

2
src/perl/perl-core.c
View File

@ -190,7 +190,7 @@ static char *script_file_get_name(const char *path)
{ {
char *name; char *name;
name = g_strdup(g_basename(path)); name = g_path_get_basename(path);
script_fix_name(name); script_fix_name(name);
return name; return name;
} }