/soc/2015/nakulgulati/main: 681c3640c833: Minor changes.

[hg at rock.pidgin.im]

Changeset: 681c3640c833ff15c4b0aa4624d2200265848b76
Author:	 hg
Date:	 2015-06-14 02:13 +0800
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/nakulgulati/main/rev/681c3640c833

Description:

Minor changes.

diffstat:

 configure.ac                            |   3 ++-
 libpurple/protocols/hangouts/hangouts.c |  10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (45 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1456,6 +1456,7 @@ for i in $STATIC_PRPLS ; do
 
 	case $i in
 		bonjour)	static_bonjour=yes ;;
+		hangouts)	static_hangouts=yes ;;
 		gg)			static_gg=yes ;;
 		irc)		static_irc=yes ;;
 		jabber)		static_jabber=yes ;;
@@ -1495,7 +1496,7 @@ AC_DEFINE_UNQUOTED(STATIC_PROTO_UNLOAD, 
 
 AC_ARG_WITH(dynamic_prpls, [AS_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
 if test "x$DYNAMIC_PRPLS" = "xall" ; then
-	DYNAMIC_PRPLS="bonjour gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr"
+	DYNAMIC_PRPLS="bonjour hangouts gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr"
 fi
 if test "x$have_meanwhile" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
diff --git a/libpurple/protocols/hangouts/hangouts.c b/libpurple/protocols/hangouts/hangouts.c
--- a/libpurple/protocols/hangouts/hangouts.c
+++ b/libpurple/protocols/hangouts/hangouts.c
@@ -67,10 +67,10 @@ hangouts_protocol_init(PurpleProtocol *p
 static void
 hangouts_protocol_class_init(PurpleProtocolClass *klass)
 {
- klass->login        = fb_login;
- klass->close        = fb_close;
- klass->status_types = fb_status_types;
- klass->list_icon    = fb_list_icon;
+ klass->login        = hangouts_login;
+ klass->close        = hangouts_close;
+ klass->status_types = hangouts_status_types;
+ klass->list_icon    = hangouts_list_icon;
 }
 
 static void
@@ -158,4 +158,4 @@ plugin_unload(PurplePlugin *plugin, GErr
  return purple_protocols_remove(my_protocol, error);
 }
 
-PURPLE_PLUGIN_INIT(hangouts, plugin_query, plugin_load, plugin_unload);
\ No newline at end of file
+PURPLE_PLUGIN_INIT(hangouts, plugin_query, plugin_load, plugin_unload);