Rebrand get_info(xchatdir) but remain compatible for Perl and Python

6 files changed, 10 insertions, 12 deletions

diff --git a/plugins/perl/lib/IRC.pm b/plugins/perl/lib/IRC.pm
index 5cc419d0..20498e69 100644
--- a/plugins/perl/lib/IRC.pm
+++ b/plugins/perl/lib/IRC.pm
@@ -127,7 +127,7 @@ sub IRC::channel_list {
 
 sub IRC::get_info {
   my $id = shift;
-  my @ids = qw(version nick channel server xchatdir away network host topic);
+  my @ids = qw(version nick channel server hexchatdir xchatdir away network host topic);
   
   if( $id >= 0 && $id <= 8 && $id != 5 ) {
     my $info = Xchat::get_info($ids[$id]);
diff --git a/plugins/perl/lib/Xchat.pm b/plugins/perl/lib/Xchat.pm
index 504f3c5c..fe99f37c 100644
--- a/plugins/perl/lib/Xchat.pm
+++ b/plugins/perl/lib/Xchat.pm
@@ -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(xchatdir xchatdirfs state_cursor),
+		qw(hexchatdir hexchatdirfs xchatdir xchatdirfs state_cursor),
 	);
 
 	if( Xchat::set_context( $ctx ) ) {
diff --git a/plugins/perl/lib/Xchat.pod b/plugins/perl/lib/Xchat.pod
index 76618658..9f4b19b8 100644
--- a/plugins/perl/lib/Xchat.pod
+++ b/plugins/perl/lib/Xchat.pod
@@ -683,16 +683,16 @@ C<$id>   -  one of the following case sensitive values
   <td></td>
 </tr>
 <tr>
-   <td>xchatdir</td> <td>xchat config directory encoded in UTF-8<br />
+   <td>hexchatdir</td> <td>HexChat config directory encoded in UTF-8<br />
                      examples:<br />
-                     /home/user/.xchat2<br />
-                     C:\Documents and Settings\user\Application Data\X-Chat 2
+                     /home/user/.config/hexchat<br />
+                     C:\Users\user\Appdata\Roaming\HexChat
                      </td>
    <td></td>
 </tr>
 
 <tr>
-   <td>xchatdirfs</td>  <td>same as xchatdir except encoded in the locale file system encoding</td>
+   <td>hexchatdirfs</td>  <td>same as hexchatdir except encoded in the locale file system encoding</td>
    <td></td>
 </tr>
 </table>
diff --git a/plugins/perl/lib/Xchat/Embed.pm b/plugins/perl/lib/Xchat/Embed.pm
index f7dd70f1..d9d3e92a 100644
--- a/plugins/perl/lib/Xchat/Embed.pm
+++ b/plugins/perl/lib/Xchat/Embed.pm
@@ -207,7 +207,7 @@ sub reload {
 }
 
 sub reload_all {
-	my @dirs = Xchat::get_info( "xchatdirfs" ) || Xchat::get_info( "xchatdir" );
+	my @dirs = Xchat::get_info( "hexchatdirfs" ) || Xchat::get_info( "hexchatdir" );
 	push @dirs, File::Spec->catdir( $dirs[0], "plugins" );
 	for my $dir ( @dirs ) {
 		my $auto_load_glob = File::Spec->catfile( $dir, "*.pl" );
diff --git a/plugins/perl/lib/Xchat/List/Network.pm b/plugins/perl/lib/Xchat/List/Network.pm
index 5755ede9..7ce1c435 100644
--- a/plugins/perl/lib/Xchat/List/Network.pm
+++ b/plugins/perl/lib/Xchat/List/Network.pm
@@ -6,7 +6,7 @@ my $last_modified;
 my @servers;
 
 sub get {
-	my $server_file = Xchat::get_info( "xchatdirfs" ) . "/servlist_.conf";
+	my $server_file = Xchat::get_info( "hexchatdirfs" ) . "/servlist_.conf";
 
 	# recreate the list only if the server list file has changed
 	if( -f $server_file && 
diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c
index 5427c62f..0d3674b9 100644
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@@ -144,9 +144,7 @@ perl_auto_load (void *unused)
 #endif
 
 	/* get the dir in local filesystem encoding (what opendir() expects!) */
-	xdir = hexchat_get_info (ph, "xchatdirfs");
-	if (!xdir)			/* xchatdirfs is new for 2.0.9, will fail on older */
-		xdir = hexchat_get_info (ph, "xchatdir");
+	xdir = hexchat_get_info (ph, "hexchatdirfs");
 
 	/* don't pollute the filesystem with script files, this only causes misuse of the folders
 	 * only use ~/.config/hexchat/addons/ and %APPDATA%\HexChat\addons */
@@ -796,7 +794,7 @@ XS (XS_Xchat_get_info)
 			
 			if (
 				!strncmp ("libdirfs", SvPV_nolen (id), 8) ||
-				!strncmp ("xchatdirfs", SvPV_nolen (id), 10)
+				!strncmp ("hexchatdirfs", SvPV_nolen (id), 10)
 			) {
 				XSRETURN_PV (RETVAL);
 			} else {