SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1 from XhmikosR/master 

Minor changes, merge as a whole for convenience, update it slightly later
This commit is contained in:
bviktor 2012-07-14 11:03:38 -07:00
parent 016ebd8899 34bae3ef6d
commit 87074105be
47 changed files with 34 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
# git ignore file # git ignore file
*.user
plugins/wmpa/wmpa_h.h plugins/wmpa/wmpa_h.h
plugins/wmpa/wmpa_i.c plugins/wmpa/wmpa_i.c
src/pixmaps/inline_pngs.h src/pixmaps/inline_pngs.h

16
HACKING
View File

@ -1,4 +1,4 @@
Just some tips if you're going to help with xchat code (patches etc): Just some tips if you're going to help with HexChat code (patches etc):
* Use tabs, not spaces, to indent code. * Use tabs, not spaces, to indent code.
@ -32,20 +32,20 @@ routine (void)
* Please provide unified format diffs (run diff -u). * Please provide unified format diffs (run diff -u).
* Call your patch something more meaningfull than xchat.diff (I get a * Call your patch something more meaningfull than hexchat.diff (I get a
million of these files!). million of these files!).
* To make a really nice and clean patch, do something like this: * To make a really nice and clean patch, do something like this:
Have two directories, unpacked from the original archive: Have two directories, unpacked from the original archive:
xchat-2.0.0/ hexchat-2.0.0/
xchat-2.0.0p1/ hexchat-2.0.0p1/
Then edit/compile the xchat-2.0.0p1 directory. When you're done, make Then edit/compile the hexchat-2.0.0p1 directory. When you're done, make
a patch with: a patch with:
cd xchat-2.0.0p1 cd hexchat-2.0.0p1
make distclean make distclean
cd .. cd ..
diff -urN xchat-2.0.0 xchat-2.0.0p1 > xchat-something.diff diff -urN hexchat-2.0.0 hexchat-2.0.0p1 > hexchat-something.diff
If using nmake (Windows) replace "make distclean" with "nmake -f makefile.msc clean" If using nmake (Windows) replace "make distclean" with "nmake -f makefile.msc clean"

4
INSTALL
View File

@ -1,4 +1,4 @@
X-Chat Requirements: HexChat Requirements:
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
- GTK 2.6+ (it comes with your Linux) - GTK 2.6+ (it comes with your Linux)
@ -12,7 +12,7 @@ X-Chat Requirements:
X-Chat Compiling and Installation: HexChat Compiling and Installation:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Type this: Type this:

12
INSTALL.w32
View File

@ -80,26 +80,26 @@ MS Visual C
(you only need Core SDK) - ~200 MB Download (Be warned). (you only need Core SDK) - ~200 MB Download (Be warned).
4) Open the build enviroment. 4) Open the build enviroment.
a) If your planning on developing modifications to the xchat code go: a) If your planning on developing modifications to the HexChat code go:
Start->Programs->Microsoft Platform SDK...->Open Build Enviroment...->(Choose OS)->... (Debug) Start->Programs->Microsoft Platform SDK...->Open Build Enviroment...->(Choose OS)->... (Debug)
b) If your compiling just to use xchat and wish to no recieve debug messages: b) If your compiling just to use HexChat and wish to no recieve debug messages:
Start->Programs->Microsoft Platform SDK...->Open Build Enviroment...->(Choose OS)->... (Retail) Start->Programs->Microsoft Platform SDK...->Open Build Enviroment...->(Choose OS)->... (Retail)
5) Change directory into where you have download the xchat source to and type this: 5) Change directory into where you have download the HexChat source to and type this:
cd src cd src
nmake -f makefile.msc clean nmake -f makefile.msc clean
nmake -f makefile.msc nmake -f makefile.msc
6) Copy fe-gtk\xchat.exe to another place. 6) Copy fe-gtk\hexchat.exe to another place.
MS VC++ 7 (.NET) MS VC++ 7 (.NET)
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
3) Open the Visual Studio .NET Command Prompt 3) Open the Visual Studio .NET Command Prompt
4) Change directory into where you have download the xchat source to and type this: 4) Change directory into where you have download the HexChat source to and type this:
cd src cd src
nmake -f makefile.msc clean nmake -f makefile.msc clean
nmake -f makefile.msc nmake -f makefile.msc
5) Copy fe-gtk\xchat.exe to another place. 5) Copy fe-gtk\hexchat.exe to another place.
Common problems: Common problems:

12
README
View File

@ -1,26 +1,26 @@
X-Chat README HexChat README
~~~~~~~~~~~~~ ~~~~~~~~~~~~~
X-Chat ("xchat") Copyright (c) 1998-2010 By Peter Zelezny. X-Chat ("xchat") Copyright (c) 1998-2010 By Peter Zelezny.
This program is released under the GPL v2 with the additional exemption This program is released under the GPL v2 with the additional exemption
that compiling, linking, and/or using OpenSSL is allowed. You may that compiling, linking, and/or using OpenSSL is allowed. You may
provide binary packages linked to the OpenSSL libraries, provided that provide binary packages linked to the OpenSSL libraries, provided that
all other requirements of the GPL are met. all other requirements of the GPL are met.
See file COPYING for details. See file COPYING for details.
What is it? What is it?
~~~~~~~~~~~ ~~~~~~~~~~~
X-Chat is an IRC client for UNIX operating systems. I.R.C. is Internet HexChat is an IRC client for UNIX operating systems. I.R.C. is Internet
Relay Chat, see http://irchelp.org for more information about IRC in Relay Chat, see http://irchelp.org for more information about IRC in
general. Xchat runs on most BSD and POSIX compliant operating systems. general. HexChat runs on most BSD and POSIX compliant operating systems.
Requirements: Requirements:
~~~~~~~~~~~~~ ~~~~~~~~~~~~~
* GTK+ 2.10 (this is available at http://www.gtk.org). * GTK+ 2.10 (this is available at http://www.gtk.org).
X-Chat is known to work on, at least: HexChat is known to work on, at least:
* Linux * Linux
* FreeBSD * FreeBSD
@ -78,7 +78,7 @@ Perl Scripts:
Autoloading Perl Scripts and Plugins Autoloading Perl Scripts and Plugins
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* X-Chat automatically loads, at startup: * HexChat automatically loads, at startup:
~/.xchat2/*.pl Perl scripts ~/.xchat2/*.pl Perl scripts
~/.xchat2/*.py Python scripts ~/.xchat2/*.py Python scripts
~/.xchat2/*.so Plugins ~/.xchat2/*.so Plugins

8
faq.html
View File

@ -1,8 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head> <html><head>
<title>HexChat FAQ</title> <title>HexChat FAQ</title>
<style type="text/css">
<!-- <!--
<style type="text/css">
body { body {
font-family: sans-serif; font-family: sans-serif;
background-color: #FFFBF0; background-color: #FFFBF0;
@ -15,8 +15,8 @@ background-color: #F0EAE1;
} }
a:link { color: blue; } a:link { color: blue; }
p { margin: 3% } p { margin: 3% }
-->
</style> </style>
-->
</head> </head>
<body> <body>
@ -134,7 +134,7 @@ language support and all menus and GUI will be in English only.</li>
<p> <p>
<u>UNIX:</u><br> <u>UNIX:</u><br>
Identd isn't actually apart of HexChat. You will need to download and install Identd isn't actually apart of HexChat. You will need to download and install
your own ident server. Most distributions, including Fedora, come with an your own ident server. Most distributions, including Fedora, come with an
ident server program called oidentd. Make sure it is enabled in ident server program called oidentd. Make sure it is enabled in
/etc/xinetd.conf or read you distribution's documentation. /etc/xinetd.conf or read you distribution's documentation.
@ -147,7 +147,7 @@ language support and all menus and GUI will be in English only.</li>
<br><h3><a name="q22">2. How do I auto join more than one channel with keys?</a></h3> <br><h3><a name="q22">2. How do I auto join more than one channel with keys?</a></h3>
<p> <p>
In the Server list's channel column enter multiple channels and separate In the Server list's channel column enter multiple channels and separate
them by commas, eg: "#linux,#warez,#chat". Do not put spaces between the them by commas, eg: "#linux,#warez,#chat". Do not put spaces between the
channels. If the channels also have keys (passwords), then the syntax is: channels. If the channels also have keys (passwords), then the syntax is:
"#channel1,#channel2,#channel3 key1,key2,key3" "#channel1,#channel2,#channel3 key1,key2,key3"

2
hexchat.desktop
View File

@ -14,7 +14,7 @@ Comment[pt_BR]=Cliente de IRC
Comment[sl]=Odjemalec IRC Comment[sl]=Odjemalec IRC
Comment[sv]=IRC-klient Comment[sv]=IRC-klient
Comment[ro]=Client de IRC Comment[ro]=Client de IRC
Comment[zh_TW]=X-Chat 聊天程式 Comment[zh_TW]=HexChat 聊天程式
Comment=Chat with other people using Internet Relay Chat Comment=Chat with other people using Internet Relay Chat
Exec=hexchat Exec=hexchat
Icon=hexchat Icon=hexchat

6
hexchat.spec
View File

@ -35,7 +35,7 @@ Provides: hexchat-python = %{epoch}:%{version}-%{release}
Obsoletes: hexchat-python < %{epoch}:%{version}-%{release} Obsoletes: hexchat-python < %{epoch}:%{version}-%{release}
%description %description
X-Chat is an easy to use graphical IRC chat client for the X Window System. HexChat is an easy to use graphical IRC chat client for the X Window System.
It allows you to join multiple IRC channels (chat rooms) at the same time, It allows you to join multiple IRC channels (chat rooms) at the same time,
talk publicly, private one-on-one conversations etc. Even file transfers talk publicly, private one-on-one conversations etc. Even file transfers
are possible. are possible.
@ -43,11 +43,11 @@ are possible.
This includes the plugins to run the Perl and Python scripts. This includes the plugins to run the Perl and Python scripts.
%package tcl %package tcl
Summary: Tcl script plugin for X-Chat Summary: Tcl script plugin for HexChat
Group: Applications/Internet Group: Applications/Internet
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
%description tcl %description tcl
This package contains the X-Chat plugin providing the Tcl scripting interface. This package contains the HexChat plugin providing the Tcl scripting interface.
%prep %prep
%setup -q %setup -q

3
plugins/checksum/checksum.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/dns/dns.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/doat/doat.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/exec/exec.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/fishlim/fishlim.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/hextray/hextray.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/lua/lua.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/mpcinfo/mpcinfo.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/perl/perl-512.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/perl/perl-514.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/perl/perl-516.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/python/python.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/sasl/sasl.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/tcl/tcl.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/upd/upd.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/winamp/winamp.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/winsys/winsys.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
plugins/wmpa/wmpa.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
src/common/common.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
src/dirent/dirent.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
src/fe-gtk/fe-gtk.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
src/fe-text/fe-text.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

13
src/htm/htm.csproj.user
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />
<ErrorReportUrlHistory />
<FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
</Project>

3
src/pixmaps/pixmaps.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
src/version/version.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
win32/copy/copy.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
win32/ext/zlib-wdk/install.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
win32/ext/zlib-wdk/miniunz.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
win32/ext/zlib-wdk/minizip.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
win32/ext/zlib-wdk/testzlib.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
win32/ext/zlib-wdk/testzlibdll.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
win32/ext/zlib-wdk/zlibstat.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

3
win32/ext/zlib-wdk/zlibvc.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

2
win32/hexchat.props
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" /> <ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">

1
win32/installer/hexchat-x64.skel.iss
View File

@ -10,6 +10,7 @@ UninstallDisplayName=HexChat (x64)
DefaultDirName={pf}\HexChat DefaultDirName={pf}\HexChat
DefaultGroupName=HexChat DefaultGroupName=HexChat
DisableProgramGroupPage=yes DisableProgramGroupPage=yes
Compression=lzma2/ultra
SolidCompression=yes SolidCompression=yes
SourceDir=..\rel SourceDir=..\rel
OutputDir=.. OutputDir=..

1
win32/installer/hexchat-x86.skel.iss
View File

@ -10,6 +10,7 @@ UninstallDisplayName=HexChat (x86)
DefaultDirName={pf}\HexChat DefaultDirName={pf}\HexChat
DefaultGroupName=HexChat DefaultGroupName=HexChat
DisableProgramGroupPage=yes DisableProgramGroupPage=yes
Compression=lzma2/ultra
SolidCompression=yes SolidCompression=yes
SourceDir=..\rel SourceDir=..\rel
OutputDir=.. OutputDir=..

3
win32/installer/installer.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

8
win32/nls/nls.vcxproj
View File

@ -61,10 +61,6 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command>cd ..\..\po <Command>cd ..\..\po
rmdir /q /s "$(OutDir)\locale" rmdir /q /s "$(OutDir)\locale"
@ -87,10 +83,6 @@ mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES"
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command>cd ..\..\po <Command>cd ..\..\po
rmdir /q /s "$(OutDir)\locale" rmdir /q /s "$(OutDir)\locale"

3
win32/nls/nls.vcxproj.user
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>