Merged in default (pull request #570)

Sat, 28 Sep 2019 09:17:34 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Sat, 28 Sep 2019 09:17:34 +0000
changeset 39876
2a98180f8b83
parent 39873
39f8ea1fd738 (current diff)
parent 39875
3046e8feccaa (diff)
child 39878
9836a62b586d

Merged in default (pull request #570)

use purple_data_dir as purple_user_dir is deprecated

Approved-by: Elliott Sales de Andrade

--- a/libpurple/theme-manager.c	Sat Sep 28 04:11:28 2019 -0500
+++ b/libpurple/theme-manager.c	Sat Sep 28 09:17:34 2019 +0000
@@ -159,7 +159,9 @@
 	                            &loaders);
 
 	/* Add themes from ~/.purple */
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 	path = g_build_filename(purple_user_dir(), "themes", NULL);
+	G_GNUC_END_IGNORE_DEPRECATIONS
 	purple_theme_manager_build_dir(loaders, path);
 	g_free(path);
 

mercurial