/soc/2013/ankitkv/gobjectification: 01aafc96f36e: Merged default...

[Ankit Vani]

Changeset: 01aafc96f36eedfd186ef4e58177400fa3895fd8
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-24 20:24 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/01aafc96f36e

Description:

Merged default branch

diffstat:

 pidgin/gtkplugin.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (18 lines):

diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
--- a/pidgin/gtkplugin.c
+++ b/pidgin/gtkplugin.c
@@ -190,8 +190,12 @@ pidgin_plugin_open_config(PurplePlugin *
 		return;
 
 	pinfo = plugin->info->prefs_info;
-	has_purple_frame = (pinfo->get_plugin_pref_frame != NULL);
-	has_purple_request = (pinfo->get_plugin_pref_request != NULL);
+	if (pinfo == NULL)
+		has_purple_frame = has_purple_request = FALSE;
+	else {
+		has_purple_frame = (pinfo->get_plugin_pref_frame != NULL);
+		has_purple_request = (pinfo->get_plugin_pref_request != NULL);
+	}
 	has_pidgin_frame = (PIDGIN_IS_PIDGIN_PLUGIN(plugin) &&
 		plugin->info->ui_info &&
 		PIDGIN_PLUGIN_UI_INFO(plugin)->get_config_frame);