r6888 - dumbhippo/trunk/client/common/ddm

[commits mugshot org]

Author: otaylor
Date: 2007-11-09 14:52:09 -0600 (Fri, 09 Nov 2007)
New Revision: 6888

Modified:
   dumbhippo/trunk/client/common/ddm/hippo-dbus-helper.c
Log:
Remove some left-over code fixing a uninitialized-variable warning

Modified: dumbhippo/trunk/client/common/ddm/hippo-dbus-helper.c
===================================================================
--- dumbhippo/trunk/client/common/ddm/hippo-dbus-helper.c	2007-11-08 23:48:09 UTC (rev 6887)
+++ dumbhippo/trunk/client/common/ddm/hippo-dbus-helper.c	2007-11-09 20:52:09 UTC (rev 6888)
@@ -1159,7 +1159,6 @@
 static void
 handle_name_owner_changed(DBusConnection *connection,
                           const char     *well_known_name,
-                          /* old and new may be NULL */
                           const char     *old_owner,
                           const char     *new_owner)
 {
@@ -1178,19 +1177,14 @@
          * the service on startup. */
         char *owner;
 
-        if (service->owner) {
-            g_hash_table_remove(helper->services_by_owner,
-                                service->owner);
-            owner = service->owner;
-            service->owner = NULL;
-            
-            g_debug("Service '%s' is now unavailable, old owner was '%s'",
-                    service->well_known_name,
-                    owner);
-        } else {
-            g_debug("Service '%s' not available on startup",
-                    service->well_known_name);
-        }
+        g_hash_table_remove(helper->services_by_owner,
+                            service->owner);
+        owner = service->owner;
+        service->owner = NULL;
+        
+        g_debug("Service '%s' is now unavailable, old owner was '%s'",
+                service->well_known_name,
+                owner ? owner : "");
 
         (* service->tracker->unavailable_handler) (connection,
                                                    service->well_known_name,