telepathy-mission-control: mcd_operation_take_mission, _remove_mission: do not be virtual

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 7c598edf86939a630c9fb51c030bf4d1436e56a6
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=7c598edf86939a630c9fb51c030bf4d1436e56a6

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Aug 28 16:52:04 2013 +0100

mcd_operation_take_mission, _remove_mission: do not be virtual

Nothing overrides them, they're no longer API, and one day I'd like to
get rid of McdOperation entirely.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68712
Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 src/mcd-operation.c |   39 ++++++++++++++-------------------------
 1 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/mcd-operation.c b/src/mcd-operation.c
index 7ddba66..7f01156 100644
--- a/src/mcd-operation.c
+++ b/src/mcd-operation.c
@@ -166,10 +166,14 @@ _mcd_operation_disconnect (McdMission * mission)
     MCD_MISSION_CLASS (mcd_operation_parent_class)->disconnect (mission);
 }
 
-static void
-_mcd_operation_take_mission (McdOperation * operation, McdMission * mission)
+void
+mcd_operation_take_mission (McdOperation * operation, McdMission * mission)
 {
-    McdOperationPrivate *priv = MCD_OPERATION_PRIV (operation);
+    McdOperationPrivate *priv;
+
+    g_return_if_fail (MCD_IS_OPERATION (operation));
+    g_return_if_fail (MCD_IS_MISSION (mission));
+    priv = MCD_OPERATION_PRIV (operation);
 
     priv->missions = g_list_prepend (priv->missions, mission);
     _mcd_mission_set_parent (mission, MCD_MISSION (operation));
@@ -182,10 +186,14 @@ _mcd_operation_take_mission (McdOperation * operation, McdMission * mission)
     g_signal_emit_by_name (G_OBJECT (operation), "mission-taken", mission);
 }
 
-static void
-_mcd_operation_remove_mission (McdOperation * operation, McdMission * mission)
+void
+mcd_operation_remove_mission (McdOperation * operation, McdMission * mission)
 {
-    McdOperationPrivate *priv = MCD_OPERATION_PRIV (operation);
+    McdOperationPrivate *priv;
+
+    g_return_if_fail (MCD_IS_OPERATION (operation));
+    g_return_if_fail (MCD_IS_MISSION (mission));
+    priv = MCD_OPERATION_PRIV (operation);
 
     g_return_if_fail (g_list_find (priv->missions, mission) != NULL);
     
@@ -214,9 +222,6 @@ mcd_operation_class_init (McdOperationClass * klass)
     mission_class->connect = _mcd_operation_connect;
     mission_class->disconnect = _mcd_operation_disconnect;
 
-    klass->take_mission = _mcd_operation_take_mission;
-    klass->remove_mission = _mcd_operation_remove_mission;
-
     mcd_operation_signals[MISSION_TAKEN] =
 	g_signal_new ("mission-taken",
 		      G_OBJECT_CLASS_TYPE (klass),
@@ -260,22 +265,6 @@ mcd_operation_new (void)
     return obj;
 }
 
-void
-mcd_operation_take_mission (McdOperation * operation, McdMission * mission)
-{
-    g_return_if_fail (MCD_IS_OPERATION (operation));
-    g_return_if_fail (MCD_IS_MISSION (mission));
-    MCD_OPERATION_GET_CLASS (operation)->take_mission (operation, mission);
-}
-
-void
-mcd_operation_remove_mission (McdOperation * operation, McdMission * mission)
-{
-    g_return_if_fail (MCD_IS_OPERATION (operation));
-    g_return_if_fail (MCD_IS_MISSION (mission));
-    MCD_OPERATION_GET_CLASS (operation)->remove_mission (operation, mission);
-}
-
 const GList *
 mcd_operation_get_missions (McdOperation * operation)
 {