[telepathy-mission-control/master] McdPresenceFrame: remove presence-requested signal (never emitted now)

[Simon McVittie]

---
 .../tmpl/mcd-presence-frame.sgml                   |    9 ---
 src/mcd-presence-frame.c                           |   65 --------------------
 src/mcd-presence-frame.h                           |    5 --
 3 files changed, 0 insertions(+), 79 deletions(-)

diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-presence-frame.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-presence-frame.sgml
index 4821a68..6f22063 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-presence-frame.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-presence-frame.sgml
@@ -23,15 +23,6 @@ McdPresenceFrame
 </para>
 
 
-<!-- ##### SIGNAL McdPresenceFrame::presence-requested ##### -->
-<para>
-
-</para>
-
- at mcdpresenceframe: the object which received the signal.
- at arg1: 
- at arg2: 
-
 <!-- ##### FUNCTION mcd_presence_frame_new ##### -->
 <para>
 
diff --git a/src/mcd-presence-frame.c b/src/mcd-presence-frame.c
index 70e7b1c..fd40f65 100644
--- a/src/mcd-presence-frame.c
+++ b/src/mcd-presence-frame.c
@@ -70,27 +70,6 @@ typedef struct _McdActualPresenceInfo {
     gboolean found;
 } McdActualPresenceInfo;
 
-enum _McdPresenceFrameSignalType
-{
-    /* Request */
-    PRESENCE_REQUESTED,
-    
-    LAST_SIGNAL
-};
-
-static const gchar *presence_statuses[] = {
-    NULL,
-    "offline",
-    "available",
-    "away",
-    "xa",
-    "hidden",
-    "dnd",
-    NULL
-};
-
-static guint mcd_presence_frame_signals[LAST_SIGNAL] = { 0 };
-
 static gboolean
 mcd_presence_frame_remove_account (McdPresenceFrame *presence_frame,
 				   McdAccount *account);
@@ -177,35 +156,6 @@ mcd_presence_frame_disconnect (McdMission *mission)
 }
 
 static void
-request_presence (gpointer key, gpointer value, gpointer userdata)
-{
-    McdAccount *account = value;
-    McdPresence *p = userdata;
-
-    if (!mcd_account_is_valid (account)) return;
-    mcd_account_request_presence (account,
-				  (TpConnectionPresenceType)p->presence,
-				  presence_statuses[p->presence],
-				  p->message);
-}
-
-static void
-presence_requested_signal (McdPresenceFrame *presence_frame,
-			   TpConnectionPresenceType presence, const gchar *presence_message)
-{
-    McdPresenceFramePrivate *priv = MCD_PRESENCE_FRAME_PRIV (presence_frame);
-    GHashTable *accounts;
-    McdPresence p;
-
-    if (!priv->account_manager) return;
-
-    accounts = mcd_account_manager_get_accounts (priv->account_manager);
-    p.presence = presence;
-    p.message = (gchar *)presence_message;
-    g_hash_table_foreach (accounts, request_presence, &p);
-}
-
-static void
 mcd_presence_frame_class_init (McdPresenceFrameClass * klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -216,21 +166,6 @@ mcd_presence_frame_class_init (McdPresenceFrameClass * klass)
     object_class->dispose = _mcd_presence_frame_dispose;
     object_class->finalize = _mcd_presence_frame_finalize;
     mission_class->disconnect = mcd_presence_frame_disconnect;
-
-    klass->presence_requested_signal = presence_requested_signal;
-
-    /* FIXME: Telepathy doesn't currently registers it's enums to glib so we are compelled to register the 
-     * signal handler's arguments as INTs below */
-    /* signals */
-    mcd_presence_frame_signals[PRESENCE_REQUESTED] =
-	g_signal_new ("presence-requested",
-		      G_OBJECT_CLASS_TYPE (klass),
-		      G_SIGNAL_RUN_FIRST,
-		      G_STRUCT_OFFSET (McdPresenceFrameClass,
-				       presence_requested_signal),
-		      NULL, NULL,
-		      _mcd_marshal_VOID__INT_STRING,
-		      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING);
 }
 
 static void
diff --git a/src/mcd-presence-frame.h b/src/mcd-presence-frame.h
index 52e5bd6..1e054e0 100644
--- a/src/mcd-presence-frame.h
+++ b/src/mcd-presence-frame.h
@@ -52,11 +52,6 @@ struct _McdPresenceFrame
 struct _McdPresenceFrameClass
 {
     McdMissionClass parent_class;
-
-    /* Signals */
-    void (*presence_requested_signal) (McdPresenceFrame * presence_frame,
-				       TpConnectionPresenceType presence,
-				       const gchar * presence_message);
 };
 
 GType mcd_presence_frame_get_type (void);
-- 
1.5.6.5