Reorganize files and migrate images to gresource

.gitignore

@@ -13,6 +13,7 @@ conftest.c
 conftest.err
 config.guess
 config.h.in
+config.h.in~
 config.h
 config.log
 config.status
@@ -34,7 +35,7 @@ po/Makefile.in.in
 po/POTFILES
 po/remove-potcdate.sed
 po/stamp-po
-share/pkgconfig/hexchat-plugin.pc
+data/pkgconfig/hexchat-plugin.pc
 src/common/dbus/example
 src/common/dbus/marshallers.h
 src/common/dbus/org.hexchat.service.service
@@ -61,7 +62,7 @@ stamp-h1
 # Win32 generated files
 plugins/wmpa/wmpa_h.h
 plugins/wmpa/wmpa_i.c
-src/pixmaps/inline_pngs.h
+src/fe-gtk/resources.c
 src/htm/obj/*
 win32/ipch/*
 win32/ext/perl/perl-x86-cache

Makefile.am

@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = po intl src plugins man share
+SUBDIRS = po intl src plugins data
 
 EXTRA_DIST = autogen.sh
 

configure.ac

@@ -731,12 +731,6 @@ AC_TRY_COMPILE(
 	],
 	AC_MSG_RESULT(no))
 
-AC_PATH_PROG(gdkpixbufcsourcepath, gdk-pixbuf-csource)
-AC_SUBST(gdkpixbufcsourcepath)
-if test "$gtkfe" != no -a "_$gdkpixbufcsourcepath" = _; then
-	AC_MSG_ERROR(Cannot find gdk-pixbuf-csource: Install GTK+ 2.0!)
-fi
-
 dnl if we don\'t have this, use g_snprintf instead
 AC_CHECK_FUNCS(snprintf vsnprintf memrchr strtoull)
 
@@ -811,19 +805,19 @@ AC_SUBST(hexchatlibdir)
 
 AC_CONFIG_FILES([
 Makefile
-share/Makefile
-share/icons/Makefile
-share/misc/Makefile
-share/pkgconfig/Makefile
-share/pkgconfig/hexchat-plugin.pc
+data/Makefile
+data/icons/Makefile
+data/misc/Makefile
+data/man/Makefile
+data/pkgconfig/Makefile
+data/pkgconfig/hexchat-plugin.pc
 src/Makefile
 src/common/Makefile
 src/common/dbus/Makefile
 src/fe-text/Makefile
 src/fe-gtk/Makefile
 src/htm/Makefile
 src/htm/thememan
-src/pixmaps/Makefile
 plugins/Makefile
 plugins/python/Makefile
 plugins/perl/Makefile
@@ -833,7 +827,6 @@ plugins/fishlim/Makefile
 plugins/sysinfo/Makefile
 intl/Makefile
 po/Makefile.in
-man/Makefile
 ])
 
 AC_OUTPUT

share/Makefile.am → data/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = pkgconfig
+SUBDIRS = pkgconfig man
 
 if DO_GTK
 SUBDIRS += icons misc

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" compressed="true">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>

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

share/doc/readme.md → readme.md

@@ -1,6 +1,6 @@
 # HexChat ReadMe
 
-X-Chat ("xchat") Copyright (c) 1998-2010 By Peter Zelezny.  
+X-Chat ("xchat") Copyright (c) 1998-2010 By Peter Zelezny.
 HexChat ("hexchat") Copyright (c) 2009-2013 By Berke Viktor.
 
 This program is released under the GPL v2 with the additional exemption