[telepathy-mission-control/master] McdService: don't handle presence-requested (it can no longer be emitted)

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Apr 13 04:44:56 PDT 2009


---
 src/mcd-service.c |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/src/mcd-service.c b/src/mcd-service.c
index 6e6ad15..ca862dd 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -111,21 +111,6 @@ mcd_service_obtain_bus_name (McdService * obj)
 }
 
 static void
-_on_presence_requested (McdPresenceFrame * presence_frame,
-			TpConnectionPresenceType presence,
-			gchar * presence_message, McdService * obj)
-{
-    /* Begin shutdown if it is offline request */
-    if (presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE ||
-	presence == TP_CONNECTION_PRESENCE_TYPE_UNSET)
-	mcd_controller_shutdown (MCD_CONTROLLER (obj),
-				 "Offline presence requested");
-    else
-	/* If there is a presence request, make sure shutdown is canceled */
-	mcd_controller_cancel_shutdown (MCD_CONTROLLER (obj));
-}
-
-static void
 mcd_service_disconnect (McdMission *mission)
 {
     MCD_MISSION_CLASS (mcd_service_parent_class)->disconnect (mission);
@@ -149,8 +134,6 @@ mcd_dispose (GObject * obj)
 
     if (priv->presence_frame)
     {
-	g_signal_handlers_disconnect_by_func (priv->presence_frame,
-					      _on_presence_requested, self);
 	g_object_unref (priv->presence_frame);
     }
 
@@ -177,10 +160,6 @@ mcd_service_constructed (GObject *obj)
                   "presence-frame", &priv->presence_frame,
 		  NULL);
 
-    /* Setup presence signals */
-    g_signal_connect (priv->presence_frame, "presence-requested",
-		      G_CALLBACK (_on_presence_requested), obj);
-
     mcd_service_obtain_bus_name (MCD_OBJECT (obj));
     mcd_debug_print_tree (obj);
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list