672 changes: 0 additions & 672 deletions config.rpath

This file was deleted.

412 changes: 133 additions & 279 deletions configure.ac

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion share/Makefile.am → data/Makefile.am
@@ -1,4 +1,4 @@
SUBDIRS = pkgconfig
SUBDIRS = pkgconfig man

if DO_GTK
SUBDIRS += icons misc
Expand Down
23 changes: 23 additions & 0 deletions data/hexchat.gresource.xml
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/icons">
<file alias="hexchat.png" preprocess="to-pixdata" compressed="true">icons/hexchat.png</file>
<file alias="book.png" preprocess="to-pixdata" compressed="true">icons/book.png</file>

<file alias="ulist_voice.png" preprocess="to-pixdata" compressed="true">icons/ulist_voice.png</file>
<file alias="ulist_halfop.png" preprocess="to-pixdata" compressed="true">icons/ulist_halfop.png</file>
<file alias="ulist_op.png" preprocess="to-pixdata" compressed="true">icons/ulist_op.png</file>
<file alias="ulist_owner.png" preprocess="to-pixdata" compressed="true">icons/ulist_owner.png</file>
<file alias="ulist_founder.png" preprocess="to-pixdata" compressed="true">icons/ulist_founder.png</file>
<file alias="ulist_netop.png" preprocess="to-pixdata" compressed="true">icons/ulist_netop.png</file>

<file alias="tray_fileoffer.png" preprocess="to-pixdata" compressed="true">icons/tray_fileoffer.png</file>
<file alias="tray_highlight.png" preprocess="to-pixdata" compressed="true">icons/tray_highlight.png</file>
<file alias="tray_message.png" preprocess="to-pixdata" compressed="true">icons/tray_message.png</file>

<file alias="tree_channel.png" preprocess="to-pixdata">icons/tree_channel.png</file>
<file alias="tree_dialog.png" preprocess="to-pixdata" compressed="true">icons/tree_dialog.png</file>
<file alias="tree_server.png" preprocess="to-pixdata" compressed="true">icons/tree_server.png</file>
<file alias="tree_util.png" preprocess="to-pixdata" compressed="true">icons/tree_util.png</file>
</gresource>
</gresources>
2 changes: 1 addition & 1 deletion share/icons/Makefile.am → data/icons/Makefile.am
@@ -1,4 +1,4 @@
icon_DATA = ../../src/pixmaps/hexchat.png
icon_DATA = hexchat.png
icondir = $(datadir)/icons/hicolor/48x48/apps

hicolor_DATA = hexchat.svg
Expand Down
File renamed without changes
File renamed without changes
272 changes: 235 additions & 37 deletions share/icons/hexchat.svg → data/icons/hexchat-shadowless.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes
746 changes: 746 additions & 0 deletions data/icons/hexchat.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
3 changes: 3 additions & 0 deletions data/man/Makefile.am
@@ -0,0 +1,3 @@
man_MANS = hexchat.1

EXTRA_DIST = hexchat.1.in
2 changes: 1 addition & 1 deletion man/hexchat.1 → data/man/hexchat.1.in
@@ -1,4 +1,4 @@
.TH HEXCHAT "1" "April 2013" "HexChat 2.9.6" "User Commands"
.TH HEXCHAT "1" "April 2013" "HexChat @VERSION@" "User Commands"
.SH NAME
HexChat \- IRC Client
.SH DESCRIPTION
Expand Down
18 changes: 12 additions & 6 deletions share/misc/Makefile.am → data/misc/Makefile.am
@@ -1,14 +1,19 @@
util_DATA = hexchat.desktop
utildir = $(datadir)/applications

appdata_DATA = hexchat.appdata.xml
appdata_in_files = hexchat.appdata.xml.in
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdatadir = $(datadir)/appdata
@INTLTOOL_XML_RULE@

data_desktopdir = $(datadir)/applications
data_desktop_in_files = hexchat.desktop.in

if WITH_TM
util_DATA += htm.desktop
data_desktop_in_files += htm.desktop.in
mime_DATA = htm-mime.xml
mimedir = $(datadir)/mime/packages
endif

data_desktop_DATA = $(data_desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@

UPDATE_MIME_DATABASE = update-mime-database "$(datadir)/mime" || :
UPDATE_DESKTOP_DATABASE = update-desktop-database -q "$(datadir)/applications" || :
Expand All @@ -20,4 +25,5 @@ install-data-hook:
uninstall-hook:
$(UPDATE_MIME_DATABASE);
$(UPDATE_DESKTOP_DATABASE);
endif

CLEANFILES = $(appdata_DATA) $(data_desktop_DATA)
15 changes: 15 additions & 0 deletions data/misc/hexchat.appdata.xml.in
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">hexchat.desktop</id>
<licence>CC0</licence>
<description>
<_p>HexChat is an easy to use yet extensible IRC Client. It allows you to securely join multiple networks and talk to users privately or in channels using a customizable interface. You can even transfer files.</_p>
<_p>HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, logging, custom themes, and Python/Perl scripts.</_p>
</description>
<url type="homepage">http://hexchat.github.io</url>
<screenshots>
<screenshot type="default">http://i.imgur.com/XBbQKXf.png</screenshot>
</screenshots>
<updatecontact>tingping_at_fedoraproject.org</updatecontact>
</application>

18 changes: 18 additions & 0 deletions data/misc/hexchat.desktop.in
@@ -0,0 +1,18 @@
[Desktop Entry]
_Name=HexChat
_GenericName=IRC Client
_Comment=Chat with other people online
_Keywords=IM;Chat;
Exec=hexchat %U
Icon=hexchat
Terminal=false
Type=Application
Categories=GTK;Network;IRCClient;
StartupNotify=true
X-GNOME-UsesNotifications=true
MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
Actions=SafeMode;

[Desktop Action SafeMode]
_Name=Open Safe Mode
Exec=hexchat --no-auto --no-plugins
File renamed without changes.
2 changes: 1 addition & 1 deletion share/misc/htm.desktop → data/misc/htm.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
Name=HexChat Theme Manager
_Name=HexChat Theme Manager
Exec=thememan %f
Icon=hexchat
Terminal=false
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion man/Makefile.am

This file was deleted.

30 changes: 30 additions & 0 deletions osx/Info.plist.in
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>HexChat</string>
<key>CFBundleGetInfoString</key>
<string>@VERSION@</string>
<key>CFBundleIconFile</key>
<string>hexchat.icns</string>
<key>CFBundleIdentifier</key>
<string>org.hexchat</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>@VERSION@</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>@VERSION@</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>LSMinimumSystemVersion</key>
<string>10.4</string>
</dict>
</plist>
435 changes: 435 additions & 0 deletions osx/gtkrc

Large diffs are not rendered by default.

83 changes: 83 additions & 0 deletions osx/hexchat.bundle
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<app-bundle>

<meta>
<prefix name="default">${env:JHBUILD_PREFIX}</prefix>
<destination overwrite="yes">${project}</destination>

<run-install-name-tool/>
<launcher-script>${project}/launcher.sh</launcher-script >
<gtk>gtk+-2.0</gtk>
</meta>

<plist>${project}/Info.plist</plist>

<main-binary>
${prefix}/bin/hexchat
</main-binary>

<binary>
${prefix}/lib/hexchat/plugins/*.so
</binary>

<binary>
${prefix}/lib/libenchant.dylib
</binary>
<binary>
${prefix}/lib/enchant/libenchant_applespell.so
</binary>

<binary dest="${bundle}/Contents/MacOS">
${prefix}/bin/python
</binary>
<binary>
${prefix}/lib/libpython2.7.dylib
</binary>
<data>
${prefix}/lib/python2.7/
</data>
<data>
${prefix}/include/python2.7/pyconfig.h
</data>

<binary>
${prefix}/lib/${gtkdir}/modules/*.so
</binary>
<binary>
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/libquartz.so
</binary>
<binary>
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/libxamarin.so
</binary>
<binary>
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
</binary>
<binary>
${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so
</binary>
<binary>
${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
</binary>
<data>
${prefix}/share/themes/Mac/
</data>

<translations name="gtk20">
${prefix}/share/locale
</translations>
<translations name="hexchat">
${prefix}/share/locale
</translations>

<data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">
${project}/gtkrc
</data>

<data dest="${bundle}/Contents/Resources">
${project}/hexchat.icns
</data>

<!-- icon-theme icons="none">
</icon-theme -->

</app-bundle>
Binary file added osx/hexchat.icns
Binary file not shown.
178 changes: 178 additions & 0 deletions osx/launcher.sh
@@ -0,0 +1,178 @@
#!/bin/sh

if test "x$GTK_DEBUG_LAUNCHER" != x; then
set -x
fi

if test "x$GTK_DEBUG_GDB" != x; then
EXEC="gdb --args"
else
EXEC=exec
fi

name=`basename "$0"`
tmp="$0"
tmp=`dirname "$tmp"`
tmp=`dirname "$tmp"`
bundle=`dirname "$tmp"`
bundle_contents="$bundle"/Contents
bundle_res="$bundle_contents"/Resources
bundle_lib="$bundle_res"/lib
bundle_bin="$bundle_res"/bin
bundle_data="$bundle_res"/share
bundle_etc="$bundle_res"/etc

export PREFIX="$bundle_res"
export DYLD_LIBRARY_PATH="$bundle_lib"
export XDG_CONFIG_DIRS="$bundle_etc"/xdg
export XDG_DATA_DIRS="$bundle_data"
export GTK_DATA_PREFIX="$bundle_res"
export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"

export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_LIBDIR="$bundle_lib"
export PANGO_SYSCONFDIR="$bundle_etc"

export PYTHON="$bundle_contents/MacOS/python"
export PYTHONHOME="$bundle_res"
export PYTHONPATH="$bundle_lib/python2.7:$bundle_lib/python2.7/site-packages"

export OPENSSL_CONF="/System/Library/OpenSSL/openssl.cnf"

export HEXCHAT_LIBDIR="$bundle_lib/hexchat/plugins"

APP=name
I18NDIR="$bundle_data/locale"
# Set the locale-related variables appropriately:
unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE

# Has a language ordering been set?
# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it.
# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW.
APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' `
if test "$APPLELANGUAGES"; then
# A language ordering exists.
# Test, item per item, to see whether there is an corresponding locale.
for L in $APPLELANGUAGES; do
#test for exact matches:
if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then
export LANG=$L
break
fi
#This is a special case, because often the original strings are in US
#English and there is no translation file.
if test "x$L" == "xen_US"; then
export LANG=$L
break
fi
#OK, now test for just the first two letters:
if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then
export LANG=${L:0:2}
break
fi
#Same thing, but checking for any english variant.
if test "x${L:0:2}" == "xen"; then
export LANG=$L
break
fi;
done
fi
unset APPLELANGUAGES L

# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists.
APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
if test -z ${LANG} -a -n $APPLECOLLATION; then
if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then
export LANG=${APPLECOLLATION:0:2}
fi
fi
if test ! -z $APPLECOLLATION; then
export LC_COLLATE=$APPLECOLLATION
fi
unset APPLECOLLATION

# Continue by attempting to find the Locale preference.
APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`

if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then
if test -z $LANG; then
export LANG="${APPLELOCALE:0:5}"
fi

elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then
export LANG="${APPLELOCALE:0:2}"
fi

#Next we need to set LC_MESSAGES. If at all possilbe, we want a full
#5-character locale to avoid the "Locale not supported by C library"
#warning from Gtk -- even though Gtk will translate with a
#two-character code.
if test -n $LANG; then
#If the language code matches the applelocale, then that's the message
#locale; otherwise, if it's longer than two characters, then it's
#probably a good message locale and we'll go with it.
if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then
export LC_MESSAGES=$LANG
#Next try if the Applelocale is longer than 2 chars and the language
#bit matches $LANG
elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then
export LC_MESSAGES=${APPLELOCALE:0:5}
#Fail. Get a list of the locales in $PREFIX/share/locale that match
#our two letter language code and pick the first one, special casing
#english to set en_US
elif test $LANG == "en"; then
export LC_MESSAGES="en_US"
else
LOC=`find $PREFIX/share/locale -name $LANG???`
for L in $LOC; do
export LC_MESSAGES=$L
done
fi
else
#All efforts have failed, so default to US english
export LANG="en_US"
export LC_MESSAGES="en_US"
fi
CURRENCY=`echo $APPLELOCALE | sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'`
if test "x$CURRENCY" != "x"; then
#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to.
if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then
if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then
export LC_MONETARY=$LC_MESSAGES
fi
fi
if test -z "$LC_MONETARY"; then
FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;`
if test -n "$FILES"; then
export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'`
fi
fi
fi
#No currency value means that the AppleLocale governs:
if test -z "$LC_MONETARY"; then
LC_MONETARY=${APPLELOCALE:0:5}
fi
#For Gtk, which only looks at LC_ALL:
export LC_ALL=$LC_MESSAGES

unset APPLELOCALE FILES LOC

if test -f "$bundle_lib/charset.alias"; then
export CHARSETALIASDIR="$bundle_lib"
fi

# Extra arguments can be added in environment.sh.
EXTRA_ARGS=
if test -f "$bundle_res/environment.sh"; then
source "$bundle_res/environment.sh"
fi

# Strip out the argument added by the OS.
if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
shift 1
fi

$EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS
26 changes: 26 additions & 0 deletions osx/makebundle.sh
@@ -0,0 +1,26 @@
#!/bin/sh

if [ -z "$JHBUILD_PREFIX" ]; then
echo "You must run this within a jhbuild shell."
exit 1
fi

if [ ! -f $JHBUILD_PREFIX/bin/python ]; then
echo "You must install python with jhbuild."
exit 1
fi

rm -rf HexChat.app
rm -f *.app.zip

$JHBUILD_PREFIX/bin/python $HOME/.local/bin/gtk-mac-bundler hexchat.bundle

# These take up a lot of space in the bundle
echo "Cleaning up python files"
find ./HexChat.app/Contents/Resources/lib/python2.7 -name "*.pyc" -delete
find ./HexChat.app/Contents/Resources/lib/python2.7 -name "*.pyo" -delete

echo "Compressing bundle"
#hdiutil create -format UDBZ -srcdir HexChat.app -quiet HexChat-2.9.6.1-$(git rev-parse --short master).dmg
zip -9rXq ./HexChat-$(git describe --tags).app.zip ./HexChat.app

8 changes: 1 addition & 7 deletions plugins/Makefile.am
@@ -1,8 +1,3 @@
# temp. solution while mailcheck & xdcc arn't in SUBDIRS
EXTRA_DIST = Make.plugin plugin-conf.in xdcc/xdcc.c xdcc/Makefile.am

# noinst_HEADERS = hexchat-plugin.h

if DO_PYTHON
pythondir = python
endif
Expand All @@ -27,5 +22,4 @@ if DO_SYSINFO
sysinfodir = sysinfo
endif

#SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc
SUBDIRS = . $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir)
SUBDIRS = $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir)
5 changes: 5 additions & 0 deletions plugins/checksum/checksum.c
Expand Up @@ -20,6 +20,11 @@
* THE SOFTWARE.
*/

#ifdef __APPLE__
#define __AVAILABILITYMACROS__
#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
#endif

#include <stdio.h>
#include <string.h>
#include <stdlib.h>
Expand Down
4 changes: 2 additions & 2 deletions plugins/checksum/checksum.vcxproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration">
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
Expand Down
332 changes: 0 additions & 332 deletions plugins/dns/dns.c

This file was deleted.

3 changes: 0 additions & 3 deletions plugins/dns/dns.def

This file was deleted.

111 changes: 0 additions & 111 deletions plugins/dns/dns.vcxproj

This file was deleted.

35 changes: 0 additions & 35 deletions plugins/dns/dns.vcxproj.filters

This file was deleted.

34 changes: 0 additions & 34 deletions plugins/dns/thread.c

This file was deleted.

11 changes: 0 additions & 11 deletions plugins/dns/thread.h

This file was deleted.

4 changes: 2 additions & 2 deletions plugins/doat/doat.vcxproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration">
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
Expand Down
502 changes: 0 additions & 502 deletions plugins/ewc/COPYING

This file was deleted.

231 changes: 0 additions & 231 deletions plugins/ewc/ewc.c

This file was deleted.

18 changes: 0 additions & 18 deletions plugins/ewc/makefile.mak

This file was deleted.

4 changes: 2 additions & 2 deletions plugins/exec/exec.vcxproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration">
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
Expand Down
2 changes: 1 addition & 1 deletion plugins/fishlim/Makefile.am
@@ -1,4 +1,4 @@
EXTRA_DIST = INSTALL LICENSE README
EXTRA_DIST = INSTALL LICENSE

libdir = $(hexchatlibdir)

Expand Down
5 changes: 0 additions & 5 deletions plugins/fishlim/bool.h

This file was deleted.

5 changes: 5 additions & 0 deletions plugins/fishlim/fish.c
Expand Up @@ -22,6 +22,11 @@
*/

#ifdef __APPLE__
#define __AVAILABILITYMACROS__
#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
#endif

#include <stdlib.h>
#include <string.h>
#include <openssl/blowfish.h>
Expand Down
4 changes: 0 additions & 4 deletions plugins/fishlim/fish.h
Expand Up @@ -25,11 +25,7 @@
#ifndef FISH_H
#define FISH_H

#ifdef _MSC_VER
#include "bool.h"
#else
#include <stdbool.h>
#endif
#include <stddef.h>

char *fish_encrypt(const char *key, size_t keylen, const char *message);
Expand Down
4 changes: 2 additions & 2 deletions plugins/fishlim/fishlim.vcxproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration">
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
Expand Down
4 changes: 0 additions & 4 deletions plugins/fishlim/irc.h
Expand Up @@ -25,11 +25,7 @@
#ifndef IRC_H
#define IRC_H

#ifdef _MSC_VER
#include "bool.h"
#else
#include <stdbool.h>
#endif
#include <stddef.h>

bool irc_parse_message(const char *words[],
Expand Down
4 changes: 0 additions & 4 deletions plugins/fishlim/keystore.h
Expand Up @@ -25,11 +25,7 @@
#ifndef KEYSTORE_H
#define KEYSTORE_H

#ifdef _MSC_VER
#include "bool.h"
#else
#include <stdbool.h>
#endif
#include <stddef.h>

char *keystore_get_key(const char *nick);
Expand Down
69 changes: 0 additions & 69 deletions plugins/gtkpref/gtkpref.c

This file was deleted.

18 changes: 0 additions & 18 deletions plugins/gtkpref/makefile.mak

This file was deleted.

Binary file removed plugins/hextray/bitmaps/sd.bmp
Binary file not shown.
734 changes: 0 additions & 734 deletions plugins/hextray/callbacks.cpp

This file was deleted.

37 changes: 0 additions & 37 deletions plugins/hextray/callbacks.h

This file was deleted.

320 changes: 0 additions & 320 deletions plugins/hextray/hexchat.cpp

This file was deleted.

32 changes: 0 additions & 32 deletions plugins/hextray/hexchat.h

This file was deleted.

246 changes: 0 additions & 246 deletions plugins/hextray/hextray.cpp

This file was deleted.

3 changes: 0 additions & 3 deletions plugins/hextray/hextray.def

This file was deleted.

83 changes: 0 additions & 83 deletions plugins/hextray/hextray.h

This file was deleted.

129 changes: 0 additions & 129 deletions plugins/hextray/hextray.vcxproj

This file was deleted.

103 changes: 0 additions & 103 deletions plugins/hextray/hextray.vcxproj.filters

This file was deleted.

Binary file removed plugins/hextray/icons/ban.ico
Binary file not shown.
Binary file removed plugins/hextray/icons/disconnect.ico
Binary file not shown.
Binary file removed plugins/hextray/icons/highlight.ico
Binary file not shown.
Binary file removed plugins/hextray/icons/kick.ico
Binary file not shown.
Binary file removed plugins/hextray/icons/message.ico
Binary file not shown.
Binary file removed plugins/hextray/icons/notice.ico
Binary file not shown.
Binary file removed plugins/hextray/icons/sd.ico
Binary file not shown.
47 changes: 0 additions & 47 deletions plugins/hextray/resource.h

This file was deleted.

309 changes: 0 additions & 309 deletions plugins/hextray/resource.rc

This file was deleted.

109 changes: 0 additions & 109 deletions plugins/hextray/sdAlerts.cpp

This file was deleted.

26 changes: 0 additions & 26 deletions plugins/hextray/sdAlerts.h

This file was deleted.