# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1174467383 0
# Node ID 99b965aaf9bf826ab80aa7dec988aae06a3289ef
# Parent  0946d187d55ad28ca83030aa84d45de26aabadd5
Install pixmaps to the right directories and make them load properly.

diff -r 0946d187d55a -r 99b965aaf9bf pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Wed Mar 21 08:50:24 2007 +0000
+++ b/pidgin/pidginstock.c	Wed Mar 21 08:56:23 2007 +0000
@@ -1,10 +1,10 @@
 /**
- * @file purplestock.c GTK+ Stock resources
+ * @file pidginstock.c GTK+ Stock resources
  * @ingroup gtkui
  *
- * purple
+ * pidgin
  *
- * Purple is the legal property of its developers, whose names are too numerous
+ * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
@@ -81,7 +81,7 @@
 	{ PIDGIN_STOCK_OPEN_MAIL,       NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_SIGN_ON,         NULL,      GTK_STOCK_EXECUTE          },
 	{ PIDGIN_STOCK_SIGN_OFF,        NULL,      GTK_STOCK_CLOSE            },
-	{ PIDGIN_STOCK_TYPED,           "purple",    "typed.png"                },
+	{ PIDGIN_STOCK_TYPED,           "pidgin",  "typed.png"                },
 	{ PIDGIN_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
 };
 
@@ -183,11 +183,11 @@
 	if (base == NULL)
 		return NULL;
 
-	if (!strcmp(dir, "purple"))
-		filename = g_build_filename(DATADIR, "pixmaps", "purple", base, NULL);
+	if (!strcmp(dir, "pidgin"))
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", base, NULL);
 	else
 	{
-		filename = g_build_filename(DATADIR, "pixmaps", "purple", dir,
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir,
 									base, NULL);
 	}
 
diff -r 0946d187d55a -r 99b965aaf9bf pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Wed Mar 21 08:50:24 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Wed Mar 21 08:56:23 2007 +0000
@@ -50,14 +50,14 @@
 		gaim.ico			
 
 
-gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
-gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
+pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
+pidginbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
 
-gaimiconpixdir = $(datadir)/pixmaps/pidgin/icons
-gaimiconpix_DATA = window-icon.png
+pidginiconpixdir = $(datadir)/pixmaps/pidgin/icons
+pidginiconpix_DATA = window-icon.png
 
-gaimdistpixdir = $(datadir)/pixmaps/gaim
-gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png
+pidgindistpixdir = $(datadir)/pixmaps/pidgin
+pidgindistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png
 
 
 distpixmapdir = $(datadir)/pixmaps