diff --git a/libnotify/notify.c b/libnotify/notify.c
index bff9d65..4f54159 100644
--- a/libnotify/notify.c
+++ b/libnotify/notify.c
@@ -94,7 +94,8 @@ print_error(char *message, ...)
 	vsnprintf(buf, sizeof(buf), message, args);
 	va_end(args);
 
-	fprintf(stderr, "%s(%d): libnotify: %s", getenv("_") ? getenv("_") : "", getpid(), buf);
+	fprintf(stderr, "%s(%d): libnotify: %s",
+			(getenv("_") ? getenv("_") : ""), getpid(), buf);
 }
 
 static NotifyHandle *
@@ -185,9 +186,7 @@ _notify_dbus_message_iter_get_string_or_nil(DBusMessageIter *iter)
 
 	return NULL;
 }
-#endif
 
-#if 0
 static void
 _notify_dbus_message_iter_append_app_info(DBusMessageIter *iter)
 {
@@ -282,7 +281,8 @@ _notify_connect(void)
 
 	dbus_connection_set_exit_on_disconnect(_dbus_conn, FALSE);
 
-	if (!dbus_bus_activate_service(_dbus_conn, NOTIFY_DBUS_SERVICE, 0, NULL, &error))
+	if (!dbus_bus_activate_service(_dbus_conn, NOTIFY_DBUS_SERVICE, 0, NULL,
+								   &error))
 	{
 		print_error("Error activating %s service: %s\n",
 					NOTIFY_DBUS_SERVICE, error.message);