Merge lp:~3v1n0/unity/call-valid-action-callbacks into lp:unity

[Marco Trevisan (Treviño)]

PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function

[Christopher Townsend (townsend)]

LGTM

review: Approve

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2014-04-02 21:42:12 +0000
+++ unity-shared/PluginAdapter.cpp	2014-04-30 16:10:57 +0000
@@ -248,7 +248,8 @@
     argument.push_back(arg);
 
   /* Initiate the selected action with the arguments */
-  action->initiate()(action, state, argument);
+  if (CompAction::CallBack const& initiate_cb = primary_action_->initiate())
+    initiate_cb(action, 0, argument);
 }
 
 void MultiActionList::InitiateAll(CompOption::Vector const& extra_args, int state) const
@@ -291,8 +292,11 @@
 
   if (primary_action_)
   {
-    primary_action_->terminate()(primary_action_, CompAction::StateCancel, argument);
-    return;
+    if (CompAction::CallBack const& terminate_cb = primary_action_->terminate())
+    {
+      terminate_cb(primary_action_, CompAction::StateCancel, argument);
+      return;
+    }
   }
 
   for (auto const& it : actions_)
@@ -304,7 +308,8 @@
                            CompAction::StateTermEdge |
                            CompAction::StateTermEdgeDnd))
     {
-      action->terminate()(action, 0, argument);
+      if (CompAction::CallBack const& terminate_cb = primary_action_->terminate())
+        terminate_cb(action, 0, argument);
     }
   }
 }