[telepathy-mission-control/master] McdDispatcher: remove channel-added, channel-removed signals

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Oct 19 08:10:26 PDT 2009


Not only did nothing catch them, nothing emitted them either.
---
 .../tmpl/mcd-dispatcher.sgml                       |   16 ----------------
 src/mcd-dispatcher.c                               |   20 --------------------
 src/mcd-dispatcher.h                               |    6 ++----
 3 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
index 396a78f..e16669a 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
@@ -23,22 +23,6 @@ McdDispatcher
 </para>
 
 
-<!-- ##### SIGNAL McdDispatcher::channel-added ##### -->
-<para>
-
-</para>
-
- at mcddispatcher: the object which received the signal.
- at arg1: 
-
-<!-- ##### SIGNAL McdDispatcher::channel-removed ##### -->
-<para>
-
-</para>
-
- at mcddispatcher: the object which received the signal.
- at arg1: 
-
 <!-- ##### SIGNAL McdDispatcher::dispatched ##### -->
 <para>
 
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 70d69af..0e2d13b 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -215,8 +215,6 @@ enum
 
 enum _McdDispatcherSignalType
 {
-    CHANNEL_ADDED,
-    CHANNEL_REMOVED,
     DISPATCHED,
     LAST_SIGNAL
 };
@@ -1934,24 +1932,6 @@ mcd_dispatcher_class_init (McdDispatcherClass * klass)
     object_class->finalize = _mcd_dispatcher_finalize;
     object_class->dispose = _mcd_dispatcher_dispose;
 
-    signals[CHANNEL_ADDED] =
-	g_signal_new ("channel_added",
-		      G_OBJECT_CLASS_TYPE (klass),
-		      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-		      G_STRUCT_OFFSET (McdDispatcherClass,
-				       channel_added_signal),
-		      NULL, NULL, g_cclosure_marshal_VOID__OBJECT,
-		      G_TYPE_NONE, 1, MCD_TYPE_CHANNEL);
-    
-    signals[CHANNEL_REMOVED] =
-	g_signal_new ("channel_removed",
-		      G_OBJECT_CLASS_TYPE (klass),
-		      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-		      G_STRUCT_OFFSET (McdDispatcherClass,
-				       channel_removed_signal),
-		      NULL, NULL, g_cclosure_marshal_VOID__OBJECT,
-		      G_TYPE_NONE, 1, MCD_TYPE_CHANNEL);
-    
     signals[DISPATCHED] =
 	g_signal_new ("dispatched",
 		      G_OBJECT_CLASS_TYPE (klass),
diff --git a/src/mcd-dispatcher.h b/src/mcd-dispatcher.h
index 5f47541..ed3659c 100644
--- a/src/mcd-dispatcher.h
+++ b/src/mcd-dispatcher.h
@@ -64,10 +64,8 @@ struct _McdDispatcherClass
     McdMissionClass parent_class;
 
     /* signals */
-    void (*channel_added_signal) (McdDispatcher *dispatcher,
-				  McdChannel *channel);
-    void (*channel_removed_signal) (McdDispatcher *dispatcher,
-				    McdChannel *channel);
+    void (*_former_channel_added_signal) (void);
+    void (*_former_channel_removed_signal) (void);
     void (*dispatched_signal) (McdDispatcher * dispatcher,
 			       McdChannel * channel);
     void (*_former_dispatch_failed_signal) (void);
-- 
1.5.6.5




More information about the telepathy-commits mailing list