changeset 15858:e4805a4be652

Fix smileys
author Sean Egan <seanegan@gmail.com>
date Tue, 20 Mar 2007 19:17:42 +0000
parents 3d83556f45bf
children 1fb241af8792
files pidgin/gtkthemes.c pidgin/pixmaps/emotes/default/22/Makefile.am pidgin/pixmaps/emotes/none/Makefile.am
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkthemes.c	Tue Mar 20 15:28:29 2007 +0000
+++ b/pidgin/gtkthemes.c	Tue Mar 20 19:17:42 2007 +0000
@@ -1,7 +1,7 @@
 /*
- * Themes for Purple
+ * Themes for 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.
  *
@@ -264,7 +264,7 @@
 	int l;
 
 	char* probedirs[3];
-	probedirs[0] = g_build_filename(DATADIR, "pixmaps", "purple", "smileys", NULL);
+	probedirs[0] = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", NULL);
 	probedirs[1] = g_build_filename(purple_user_dir(), "smileys", NULL);
 	probedirs[2] = 0;
 	for (l=0; probedirs[l]; l++) {
--- a/pidgin/pixmaps/emotes/default/22/Makefile.am	Tue Mar 20 15:28:29 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/Makefile.am	Tue Mar 20 19:17:42 2007 +0000
@@ -163,7 +163,7 @@
 		yawn.png \
 		yin-yang.png
 
-pidginsmileypixdir = $(datadir)/pixmaps/gaim/smileys/default
+pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/default
 pidginsmileypix_DATA = \
         $(SMILEYS) \
         theme
--- a/pidgin/pixmaps/emotes/none/Makefile.am	Tue Mar 20 15:28:29 2007 +0000
+++ b/pidgin/pixmaps/emotes/none/Makefile.am	Tue Mar 20 19:17:42 2007 +0000
@@ -1,4 +1,4 @@
-gaimsmileypixdir = $(datadir)/pixmaps/gaim/smileys/none
+gaimsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/none
 gaimsmileypix_DATA = theme 
 
 EXTRA_DIST = $(gaimsmileypix_DATA) \