Merge branch 'gresource'

22 files changed, 0 insertions, 193 deletions

diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
deleted file mode 100644
index 57ab72b5..00000000
--- a/src/pixmaps/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-LIST =		png_ulist_voice $(srcdir)/ulist_voice.png \
-			png_ulist_halfop $(srcdir)/ulist_halfop.png \
-			png_ulist_op $(srcdir)/ulist_op.png \
-			png_ulist_owner $(srcdir)/ulist_owner.png \
-			png_ulist_founder $(srcdir)/ulist_founder.png \
-			png_ulist_netop $(srcdir)/ulist_netop.png \
-			png_tray_fileoffer $(srcdir)/tray_fileoffer.png \
-			png_tray_highlight $(srcdir)/tray_highlight.png \
-			png_tray_message $(srcdir)/tray_message.png \
-			png_tree_channel $(srcdir)/tree_channel.png \
-			png_tree_dialog $(srcdir)/tree_dialog.png \
-			png_tree_server $(srcdir)/tree_server.png \
-			png_tree_util $(srcdir)/tree_util.png \
-			png_book $(srcdir)/book.png \
-			png_hexchat $(srcdir)/hexchat.png
-
-PNGS = ulist_voice.png ulist_halfop.png ulist_op.png ulist_owner.png ulist_founder.png ulist_netop.png tray_fileoffer.png tray_highlight.png tray_message.png tree_channel.png tree_dialog.png tree_server.png tree_util.png book.png
-noinst_HEADERS = inline_pngs.h
-CLEANFILES = $(noinst_HEADERS)
-EXTRA_DIST = $(PNGS)
-
-inline_pngs.h: $(PNGS)
-	@gdkpixbufcsourcepath@ --raw --build-list $(LIST) > $(srcdir)/inline_pngs.h
diff --git a/src/pixmaps/ban.png b/src/pixmaps/ban.png
deleted file mode 100644
index 84682bc7..00000000
--- a/src/pixmaps/ban.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/book.png b/src/pixmaps/book.png
deleted file mode 100644
index 1f1e4301..00000000
--- a/src/pixmaps/book.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/disconnect.png b/src/pixmaps/disconnect.png
deleted file mode 100644
index 0af58487..00000000
--- a/src/pixmaps/disconnect.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/hexchat.png b/src/pixmaps/hexchat.png
deleted file mode 100644
index 4d977c02..00000000
--- a/src/pixmaps/hexchat.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/kick.png b/src/pixmaps/kick.png
deleted file mode 100644
index 72ea9850..00000000
--- a/src/pixmaps/kick.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/notice.png b/src/pixmaps/notice.png
deleted file mode 100644
index 931497f8..00000000
--- a/src/pixmaps/notice.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj
deleted file mode 100644
index e5b71c53..00000000
--- a/src/pixmaps/pixmaps.vcxproj
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Label="Configuration">

-    <PlatformToolset>v120</PlatformToolset>

-  </PropertyGroup>

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-    <RootNamespace>pixmaps</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\..\win32\hexchat.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\..\win32\hexchat.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-    <OutDir>$(HexChatBin)</OutDir>

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LinkIncremental>false</LinkIncremental>

-    <OutDir>$(HexChatBin)</OutDir>

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-    <PostBuildEvent>

-      <Command>"$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) &gt; "$(SolutionDir)\..\src\pixmaps\inline_pngs.h"</Command>

-    </PostBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-    <PostBuildEvent>

-      <Command>"$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) &gt; "$(SolutionDir)\..\src\pixmaps\inline_pngs.h"</Command>

-    </PostBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <None Include="ulist_voice.png" />

-    <None Include="ulist_halfop.png" />

-    <None Include="ulist_op.png" />

-    <None Include="ulist_owner.png" />

-    <None Include="ulist_founder.png" />

-    <None Include="ulist_netop.png" />

-    <None Include="tray_fileoffer.png" />

-    <None Include="tray_highlight.png" />

-    <None Include="tray_message.png" />

-    <None Include="tree_channel.png" />

-    <None Include="tree_dialog.png" />

-    <None Include="tree_server.png" />

-    <None Include="tree_util.png" />

-    <None Include="book.png" />

-    <None Include="hexchat.png" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters
deleted file mode 100644
index 1351b32f..00000000
--- a/src/pixmaps/pixmaps.vcxproj.filters
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="ulist_voice.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="ulist_halfop.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="ulist_op.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="ulist_owner.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="ulist_founder.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="ulist_netop.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="tray_fileoffer.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="tray_highlight.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="tray_message.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="tree_channel.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="tree_dialog.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="tree_server.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="tree_util.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="book.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="hexchat.png">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-</Project>

diff --git a/src/pixmaps/tray_fileoffer.png b/src/pixmaps/tray_fileoffer.png
deleted file mode 100644
index f1afc029..00000000
--- a/src/pixmaps/tray_fileoffer.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/tray_highlight.png b/src/pixmaps/tray_highlight.png
deleted file mode 100644
index 1a2f4910..00000000
--- a/src/pixmaps/tray_highlight.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/tray_message.png b/src/pixmaps/tray_message.png
deleted file mode 100644
index 8beb9b56..00000000
--- a/src/pixmaps/tray_message.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/tree_channel.png b/src/pixmaps/tree_channel.png
deleted file mode 100644
index f6e83254..00000000
--- a/src/pixmaps/tree_channel.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/tree_dialog.png b/src/pixmaps/tree_dialog.png
deleted file mode 100644
index 9d2d5008..00000000
--- a/src/pixmaps/tree_dialog.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/tree_server.png b/src/pixmaps/tree_server.png
deleted file mode 100644
index acddccc9..00000000
--- a/src/pixmaps/tree_server.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/tree_util.png b/src/pixmaps/tree_util.png
deleted file mode 100644
index 9460dfc7..00000000
--- a/src/pixmaps/tree_util.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/ulist_founder.png b/src/pixmaps/ulist_founder.png
deleted file mode 100644
index 0e30f8d0..00000000
--- a/src/pixmaps/ulist_founder.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/ulist_halfop.png b/src/pixmaps/ulist_halfop.png
deleted file mode 100644
index ac5a5162..00000000
--- a/src/pixmaps/ulist_halfop.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/ulist_netop.png b/src/pixmaps/ulist_netop.png
deleted file mode 100644
index aba96858..00000000
--- a/src/pixmaps/ulist_netop.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/ulist_op.png b/src/pixmaps/ulist_op.png
deleted file mode 100644
index ef3c04cf..00000000
--- a/src/pixmaps/ulist_op.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/ulist_owner.png b/src/pixmaps/ulist_owner.png
deleted file mode 100644
index e0fe13a6..00000000
--- a/src/pixmaps/ulist_owner.png
+++ /dev/null
Binary files differdiff --git a/src/pixmaps/ulist_voice.png b/src/pixmaps/ulist_voice.png
deleted file mode 100644
index dbc13ad8..00000000
--- a/src/pixmaps/ulist_voice.png
+++ /dev/null
Binary files differ