[telepathy-mission-control/master] McdDispatcher: remove obsolete dispatch-failed signal
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Oct 19 08:10:26 PDT 2009
Nothing catches it.
---
.../tmpl/mcd-dispatcher.sgml | 9 ---------
src/mcd-dispatcher.c | 11 -----------
src/mcd-dispatcher.h | 4 +---
3 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
index 0c3e74b..0340b75 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
@@ -47,15 +47,6 @@ McdDispatcher
@mcddispatcher: the object which received the signal.
@arg1:
-<!-- ##### SIGNAL McdDispatcher::dispatch-failed ##### -->
-<para>
-
-</para>
-
- at mcddispatcher: the object which received the signal.
- at arg1:
- at arg2:
-
<!-- ##### SIGNAL McdDispatcher::dispatched ##### -->
<para>
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index bce0747..8933399 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -218,7 +218,6 @@ enum _McdDispatcherSignalType
CHANNEL_ADDED,
CHANNEL_REMOVED,
DISPATCHED,
- DISPATCH_FAILED,
DISPATCH_COMPLETED,
LAST_SIGNAL
};
@@ -936,7 +935,6 @@ mcd_dispatcher_run_handlers (McdDispatcherContext *context)
"Handler no longer available" };
mcd_channel_take_error (channel, g_error_copy (&e));
- g_signal_emit_by_name (self, "dispatch-failed", channel, &e);
_mcd_channel_undispatchable (channel);
}
@@ -1966,15 +1964,6 @@ mcd_dispatcher_class_init (McdDispatcherClass * klass)
dispatched_signal),
NULL, NULL, g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, MCD_TYPE_CHANNEL);
-
- signals[DISPATCH_FAILED] =
- g_signal_new ("dispatch-failed",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
- G_STRUCT_OFFSET (McdDispatcherClass,
- dispatch_failed_signal),
- NULL, NULL, _mcd_marshal_VOID__OBJECT_POINTER,
- G_TYPE_NONE, 2, MCD_TYPE_CHANNEL, G_TYPE_POINTER);
/**
* McdDispatcher::dispatch-completed:
diff --git a/src/mcd-dispatcher.h b/src/mcd-dispatcher.h
index 1c76940..5f47541 100644
--- a/src/mcd-dispatcher.h
+++ b/src/mcd-dispatcher.h
@@ -70,9 +70,7 @@ struct _McdDispatcherClass
McdChannel *channel);
void (*dispatched_signal) (McdDispatcher * dispatcher,
McdChannel * channel);
- void (*dispatch_failed_signal) (McdDispatcher * dispatcher,
- McdChannel * channel,
- GError *error);
+ void (*_former_dispatch_failed_signal) (void);
/* virtual methods */
TpDBusPropertiesMixinClass dbus_properties_class;
--
1.5.6.5
More information about the telepathy-commits
mailing list