iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use configdir instead of *xchatdir*

Browse Source
This commit is contained in:
Berke Viktor
2012-11-04 23:55:36 +01:00
parent ad16ed3933
commit db218817fd
17 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/perl/lib/IRC.pm
View File

@ -127,7 +127,7 @@ sub IRC::channel_list {
sub IRC::get_info {
my $id = shift;
my @ids = qw(version nick channel server hexchatdir xchatdir away network host topic);
my @ids = qw(version nick channel server configdir xchatdir away network host topic);
if( $id >= 0 && $id <= 8 && $id != 5 ) {
my $info = Xchat::get_info($ids[$id]);

2
plugins/perl/lib/Xchat.pm
View File

@ -471,7 +471,7 @@ sub context_info {
my @fields = (
qw(away channel charset host id inputbox libdirfs modes network),
qw(nick nickserv server topic version win_ptr win_status),
qw(hexchatdir hexchatdirfs xchatdir xchatdirfs state_cursor),
qw(configdir xchatdir xchatdirfs state_cursor),
);
if( Xchat::set_context( $ctx ) ) {

7
plugins/perl/lib/Xchat.pod
View File

@ -683,18 +683,13 @@ C<$id> - one of the following case sensitive values
<td></td>
</tr>
<tr>
<td>hexchatdir</td> <td>HexChat config directory encoded in UTF-8<br />
<td>configdir</td> <td>HexChat config directory encoded in UTF-8<br />
examples:<br />
/home/user/.config/hexchat<br />
C:\Users\user\Appdata\Roaming\HexChat
</td>
<td></td>
</tr>
<tr>
<td>hexchatdirfs</td> <td>same as hexchatdir except encoded in the locale file system encoding</td>
<td></td>
</tr>
</table>
<p>This function is used to retrieve certain information about the current

2
plugins/perl/lib/Xchat/Embed.pm
View File

@ -207,7 +207,7 @@ sub reload {
}
sub reload_all {
my @dirs = Xchat::get_info( "hexchatdirfs" ) || Xchat::get_info( "hexchatdir" );
my @dirs = Xchat::get_info( "configdir" );
push @dirs, File::Spec->catdir( $dirs[0], "plugins" );
for my $dir ( @dirs ) {
my $auto_load_glob = File::Spec->catfile( $dir, "*.pl" );

2
plugins/perl/lib/Xchat/List/Network.pm
View File

@ -6,7 +6,7 @@ my $last_modified;
my @servers;
sub get {
my $server_file = Xchat::get_info( "hexchatdirfs" ) . "/servlist_.conf";
my $server_file = Xchat::get_info( "configdir" ) . "/servlist_.conf";
# recreate the list only if the server list file has changed
if( -f $server_file &&

5
plugins/perl/perl.c
View File

@ -144,7 +144,7 @@ perl_auto_load (void *unused)
#endif
/* get the dir in local filesystem encoding (what opendir() expects!) */
xdir = hexchat_get_info (ph, "hexchatdirfs");
xdir = hexchat_get_info (ph, "configdir");
/* don't pollute the filesystem with script files, this only causes misuse of the folders
* only use ~/.config/hexchat/addons/ and %APPDATA%\HexChat\addons */
@ -794,7 +794,8 @@ XS (XS_Xchat_get_info)
if (
!strncmp ("libdirfs", SvPV_nolen (id), 8) ||
!strncmp ("hexchatdirfs", SvPV_nolen (id), 10)
!strncmp ("xchatdirfs", SvPV_nolen (id), 10) ||
!strncmp ("configdir", SvPV_nolen (id), 9)
) {
XSRETURN_PV (RETVAL);
} else {