/dev/tomkiewicz/e2ee: 3fa4b93cf8c7: Merge default

[Tomasz Wasilczyk]

Changeset: 3fa4b93cf8c7863516f3084fed583da8aa92b4d2
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2013-10-24 17:32 +0200
Branch:	 default
URL: https://hg.pidgin.im/dev/tomkiewicz/e2ee/rev/3fa4b93cf8c7

Description:

Merge default

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);