changeset
Merge default
Thu, 24 Oct 2013 17:32:35 +0200
- author
- Tomasz Wasilczyk <twasilczyk@pidgin.im>
- date
- Thu, 24 Oct 2013 17:32:35 +0200
- changeset 34499
- 3fa4b93cf8c7
- parent 34498
- ca86b49b6d84 (current diff)
- parent 34480
- 26e7a3057f0c (diff)
- child 34500
- e322f9c8f3e9
Merge default
--- a/pidgin/gtkplugin.c Thu Oct 24 15:55:59 2013 +0200 +++ b/pidgin/gtkplugin.c Thu Oct 24 17:32:35 2013 +0200 @@ -190,8 +190,12 @@ 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);
