Relocate hexchat.png and hexchat.ico and some more varname cleanup

src/fe-gtk/about.c

@@ -154,7 +154,7 @@ menu_about (GtkWidget * wid, gpointer sess)
 	gtk_box_pack_start (GTK_BOX (hbox_main), vbox_logo, 0, 0, 10);
 
 	/* the actual image */
-	wid = gtk_image_new_from_pixbuf (pix_xchat);
+	wid = gtk_image_new_from_pixbuf (pix_hexchat);
 	gtk_box_pack_start (GTK_BOX (vbox_logo), wid, 0, 0, 10);
 
 	/* our close button on the bottom right */

src/fe-gtk/fe-gtk-xp.vcxproj

@@ -169,7 +169,7 @@
     <ResourceCompile Include="hexchat.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\hexchat.ico" />
+    <None Include="..\..\share\icons\hexchat.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

src/fe-gtk/fe-gtk-xp.vcxproj.filters

@@ -212,7 +212,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\hexchat.ico">
+    <None Include="..\..\share\icons\hexchat.ico">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>

src/fe-gtk/fe-gtk.vcxproj

@@ -166,7 +166,7 @@
     <ResourceCompile Include="hexchat.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\hexchat.ico" />
+    <None Include="..\..\share\icons\hexchat.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

src/fe-gtk/fe-gtk.vcxproj.filters

@@ -212,7 +212,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\hexchat.ico">
+    <None Include="..\..\share\icons\hexchat.ico">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>

src/fe-gtk/gtkutil.c

@@ -820,7 +820,7 @@ show_and_unfocus (GtkWidget * wid)
 void
 gtkutil_set_icon (GtkWidget *win)
 {
-	gtk_window_set_icon (GTK_WINDOW (win), pix_xchat);
+	gtk_window_set_icon (GTK_WINDOW (win), pix_hexchat);
 }
 
 extern GtkWidget *parent_window;	/* maingui.c */

src/fe-gtk/hexchat.rc

@@ -2,7 +2,7 @@
 #include "../../config-win32.h"
 #include "../../resource.h"
 
-XC_ICON ICON "../../hexchat.ico"
+XC_ICON ICON "../../share/icons/hexchat.ico"
 
 VS_VERSION_INFO VERSIONINFO
 	FILEVERSION    COMMA_VERSION

src/fe-gtk/pixmaps.c

@@ -31,9 +31,6 @@
 
 #include "../pixmaps/inline_pngs.h"
 
-GdkPixbuf *pix_xchat;
-GdkPixbuf *pix_book;
-
 GdkPixbuf *pix_ulist_voice;
 GdkPixbuf *pix_ulist_halfop;
 GdkPixbuf *pix_ulist_op;
@@ -41,7 +38,6 @@ GdkPixbuf *pix_ulist_owner;
 GdkPixbuf *pix_ulist_founder;
 GdkPixbuf *pix_ulist_netop;
 
-
 GdkPixbuf *pix_tray_msg;
 GdkPixbuf *pix_tray_hilight;
 GdkPixbuf *pix_tray_file;
@@ -51,6 +47,8 @@ GdkPixbuf *pix_dialog;
 GdkPixbuf *pix_server;
 GdkPixbuf *pix_util;
 
+GdkPixbuf *pix_book;
+GdkPixbuf *pix_hexchat;
 
 static GdkPixmap *
 pixmap_load_from_file_real (char *file)
@@ -122,11 +120,6 @@ load_pixmap (const char *filename, const char *name, int has_inline)
 void
 pixmaps_init (void)
 {
-	pix_book = gdk_pixbuf_new_from_inline (-1, bookpng, FALSE, 0);
-
-	/* used in About window, tray icon and WindowManager icon. */
-	pix_xchat = load_pixmap ("hexchat", hexchatpng, 1);
-
 	/* userlist icons, with inlined defaults */
 	pix_ulist_voice = load_pixmap ("ulist_voice", png_ulist_voice, 1);
 	pix_ulist_halfop = load_pixmap ("ulist_halfop", png_ulist_halfop, 1);
@@ -152,4 +145,9 @@ pixmaps_init (void)
 	pix_dialog = load_pixmap ("dialog", dialogpng, 1);
 	pix_server = load_pixmap ("server", serverpng, 1);
 	pix_util = load_pixmap ("util", utilpng, 1);
+
+	/* non-replaceable book pixmap */
+	pix_book = gdk_pixbuf_new_from_inline (-1, png_book, FALSE, 0);
+	/* used in About window, tray icon and WindowManager icon. */
+	pix_hexchat = load_pixmap ("hexchat", png_hexchat, 1);
 }

src/fe-gtk/pixmaps.h

@@ -5,9 +5,6 @@ extern GdkPixbuf *pix_ulist_owner;
 extern GdkPixbuf *pix_ulist_founder;
 extern GdkPixbuf *pix_ulist_netop;
 
-extern GdkPixbuf *pix_book;
-extern GdkPixbuf *pix_xchat;
-
 extern GdkPixbuf *pix_tray_msg;
 extern GdkPixbuf *pix_tray_hilight;
 extern GdkPixbuf *pix_tray_file;
@@ -17,5 +14,8 @@ extern GdkPixbuf *pix_dialog;
 extern GdkPixbuf *pix_server;
 extern GdkPixbuf *pix_util;
 
+extern GdkPixbuf *pix_book;
+extern GdkPixbuf *pix_hexchat;
+
 extern GdkPixmap *pixmap_load_from_file (char *file);
 extern void pixmaps_init (void);

src/fe-gtk/plugin-tray.c

@@ -51,7 +51,7 @@ typedef GdkPixbuf* TrayIcon;
 #define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL)
 #define tray_icon_free(i) g_object_unref(i)
 
-#define ICON_NORMAL pix_xchat
+#define ICON_NORMAL pix_hexchat
 #define ICON_MSG pix_tray_msg
 #define ICON_HILIGHT pix_tray_hilight
 #define ICON_FILE pix_tray_file