/soc/2013/ankitkv/gobjectification: 61014b39bac3: Removed an unn...

[Ankit Vani]

Changeset: 61014b39bac3af01f48d9bb759b6a19d831416f7
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-02 17:33 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/61014b39bac3

Description:

Removed an unnecessary call to gplugin

diffstat:

 libpurple/plugins.c |  16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diffs (40 lines):

diff --git a/libpurple/plugins.c b/libpurple/plugins.c
--- a/libpurple/plugins.c
+++ b/libpurple/plugins.c
@@ -217,8 +217,10 @@ purple_plugin_get_info(const PurplePlugi
 	info = gplugin_plugin_get_info(plugin);
 	g_object_unref(info);
 
-	return PURPLE_PLUGIN_INFO(info);
-
+	if (PURPLE_IS_PLUGIN_INFO(info))
+		return PURPLE_PLUGIN_INFO(info);
+	else
+		return NULL;
 #else
 	return NULL;
 #endif
@@ -264,7 +266,6 @@ purple_plugin_add_interface(PurplePlugin
 gboolean
 purple_plugin_is_internal(const PurplePlugin *plugin)
 {
-#ifdef PURPLE_PLUGINS
 	PurplePluginInfo *info;
 
 	g_return_val_if_fail(plugin != NULL, FALSE);
@@ -273,13 +274,8 @@ purple_plugin_is_internal(const PurplePl
 	if (!info)
 		return TRUE;
 
-	return ((purple_plugin_info_get_flags(info) &
-	         PURPLE_PLUGIN_INFO_FLAGS_INTERNAL) ||
-	         (gplugin_plugin_info_get_flags(GPLUGIN_PLUGIN_INFO(info)) &
-	          GPLUGIN_PLUGIN_INFO_FLAGS_INTERNAL));
-#else
-	return FALSE;
-#endif
+	return (purple_plugin_info_get_flags(info) &
+	        PURPLE_PLUGIN_INFO_FLAGS_INTERNAL);
 }
 
 GSList *