Mercurial > pidgin3 / file diff

--- a/finch/gntplugin.c	Fri Aug 02 15:45:31 2013 +0530
+++ b/finch/gntplugin.c	Fri Aug 02 16:22:42 2013 +0530
@@ -101,11 +101,12 @@
 	GPluginPluginInfo *info = gplugin_plugin_get_info(plugin);
 
 	if (purple_plugin_is_loaded(plugin)) {
-		if (FINCH_IS_PLUGIN_INFO(info)) {
-			FinchPluginInfoPrivate *priv = FINCH_PLUGIN_INFO_GET_PRIVATE(info);
-			if (priv->get_pref_frame)
-				visible = TRUE;
-		} else if (purple_plugin_info_get_pref_frame_callback(PURPLE_PLUGIN_INFO(info))) {
+		FinchPluginInfoPrivate *priv = NULL;
+		if (FINCH_IS_PLUGIN_INFO(info))
+			priv = FINCH_PLUGIN_INFO_GET_PRIVATE(info);
+
+		if ((priv && priv->get_pref_frame) ||
+			(purple_plugin_info_get_pref_frame_callback(PURPLE_PLUGIN_INFO(info)))) {
 			visible = TRUE;
 		}
 	}