/pidgin/main: 00e8c06ec0f8: Merging

[Gary Kramlich]

Changeset: 00e8c06ec0f8a86ac615b676656aa8202c9fec21
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-01-14 14:59 -0600
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/00e8c06ec0f8

Description:

Merging

diffstat:

 libpurple/media.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (14 lines):

diff --git a/libpurple/media.c b/libpurple/media.c
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -195,8 +195,9 @@ purple_media_class_init (PurpleMediaClas
 			G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property(gobject_class, PROP_ACCOUNT,
-			g_param_spec_pointer("account", "PurpleAccount",
+			g_param_spec_object("account", "PurpleAccount",
 			"The account this media session is on.",
+			PURPLE_TYPE_ACCOUNT,
 			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
 			G_PARAM_STATIC_STRINGS));