summaryrefslogtreecommitdiff
path: root/src/compositor/meta-plugin-manager.c
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2017-10-20 03:23:28 -0500
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2017-10-20 03:23:28 -0500
commit6f54bab0a8a4f2b183acbb956778416fe0d6810a (patch)
tree19cc693b89efdfd9f26e78f49ce06652406a9250 /src/compositor/meta-plugin-manager.c
parent5d7deab6da9740377082ea053b9769c697c12b3f (diff)
downloadmutter-6f54bab0a8a4f2b183acbb956778416fe0d6810a.tar.gz
Revert "MetaPluginManager: don't try to deference a NULL pointer when processing events"
This reverts commit 74565380aa1c342dc2fe3ac4de0fcf72c1698ceb.
Diffstat (limited to 'src/compositor/meta-plugin-manager.c')
-rw-r--r--src/compositor/meta-plugin-manager.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c
index 9f6e67273..834f678dd 100644
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.c
@@ -153,17 +153,10 @@ meta_plugin_manager_event_simple (MetaPluginManager *plugin_mgr,
MetaWindowActor *actor,
MetaPluginEffect event)
{
- MetaPlugin *plugin;
- MetaPluginClass *klass;
- MetaDisplay *display;
- gboolean retval;
-
- g_return_val_if_fail (plugin_mgr, FALSE);
-
- plugin = plugin_mgr->plugin;
- klass = META_PLUGIN_GET_CLASS (plugin);
- display = plugin_mgr->compositor->display;
- retval = FALSE;
+ MetaPlugin *plugin = plugin_mgr->plugin;
+ MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+ MetaDisplay *display = plugin_mgr->compositor->display;
+ gboolean retval = FALSE;
if (display->display_opening)
return FALSE;