[telepathy-glib/master] TpDBusDaemon: remove redundant check

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Aug 17 09:36:19 PDT 2009


tp_dbus_check_valid_bus_name criticals and returns FALSE if name is NULL,
so we don't need to check that separately (also, this was done in the
wrong order).
---
 telepathy-glib/dbus-daemon.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c
index 928a3a2..6621123 100644
--- a/telepathy-glib/dbus-daemon.c
+++ b/telepathy-glib/dbus-daemon.c
@@ -474,7 +474,6 @@ tp_dbus_daemon_watch_name_owner (TpDBusDaemon *self,
   g_return_if_fail (TP_IS_DBUS_DAEMON (self));
   g_return_if_fail (tp_dbus_check_valid_bus_name (name,
         TP_DBUS_NAME_TYPE_ANY, NULL));
-  g_return_if_fail (name != NULL);
   g_return_if_fail (callback != NULL);
 
   if (watch == NULL)
-- 
1.5.6.5




More information about the telepathy-commits mailing list