pidgin.win32.autotools: 4111a9a7: s/DATADIR/PURPLE_DATADIR/g in some new f

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 4111a9a7f37cdf4e40ea3c4b31ee7bdf4234a1e5
Parent:   c85cbe7d1d3c34aa06aec0c3b52722e4765db041
Author:   qulogic at pidgin.im
Date:     12/21/11 20:24:51
Branch:   im.pidgin.pidgin.win32.autotools
URL: http://d.pidgin.im/viewmtn/revision/info/4111a9a7f37cdf4e40ea3c4b31ee7bdf4234a1e5

Changelog: 

s/DATADIR/PURPLE_DATADIR/g in some new files.

Changes against parent c85cbe7d1d3c34aa06aec0c3b52722e4765db041

  patched  pidgin/gtkconv-theme.c
  patched  pidgin/gtkdocklet.c

-------------- next part --------------
============================================================
--- pidgin/gtkdocklet.c	955acba569d4ade062eea3e27a1306a26cd89d9e
+++ pidgin/gtkdocklet.c	32a57b81dbfa81edf6bddabd76e0d65926657ecf
@@ -1058,7 +1058,7 @@ pidgin_docklet_init()
 		purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", FALSE);
 	}
 
-	tmp = g_build_path(G_DIR_SEPARATOR_S, DATADIR, "pixmaps", "pidgin", "tray", NULL);
+	tmp = g_build_path(G_DIR_SEPARATOR_S, PURPLE_DATADIR, "pixmaps", "pidgin", "tray", NULL);
 	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), tmp);
 	g_free(tmp);
 
============================================================
--- pidgin/gtkconv-theme.c	7edc929135fd2fb191b23e0d6219f168e4a67502
+++ pidgin/gtkconv-theme.c	1cbefb8a53bcb4663e34cd7506e4dafbabd48c38
@@ -122,7 +122,7 @@ get_template_path(const char *dir)
 
 	if (!g_file_test(file, G_FILE_TEST_EXISTS)) {
 		g_free(file);
-		file = g_build_filename(DATADIR, "pidgin", "theme", "conversation", "Template.html", NULL);
+		file = g_build_filename(PURPLE_DATADIR, "pidgin", "theme", "conversation", "Template.html", NULL);
 	}
 
 	return file;